ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #819 from lioncash/preproc 

OGL: Removed some unnecessary preprocessor directives from Render.cpp.
This commit is contained in:
Lioncash 2014-08-17 00:00:36 -04:00
parent ac0ac18655 f0743e2571
commit 6bfe3714c4
1 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Core/VideoBackends/OGL/Render.cpp
View File

@ -2,6 +2,7 @@
// Licensed under GPLv2 // Licensed under GPLv2
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <algorithm>
#include <cinttypes> #include <cinttypes>
#include <cmath> #include <cmath>
#include <cstdio> #include <cstdio>
@ -48,16 +49,6 @@
#include "VideoCommon/VertexShaderManager.h" #include "VideoCommon/VertexShaderManager.h"
#include "VideoCommon/VideoConfig.h" #include "VideoCommon/VideoConfig.h"
#if defined(HAVE_WX) && HAVE_WX
#include "DolphinWX/WxUtils.h"
#endif
#ifdef _WIN32
#include <mmsystem.h>
#endif
#ifdef _WIN32
#endif
#if defined _WIN32 || defined HAVE_LIBAV #if defined _WIN32 || defined HAVE_LIBAV
#include "VideoCommon/AVIDump.h" #include "VideoCommon/AVIDump.h"
#endif #endif
@ -100,10 +91,6 @@ static u32 s_blendMode;
static bool s_vsync; static bool s_vsync;
#if defined(HAVE_WX) && HAVE_WX
static std::thread scrshotThread;
#endif
// EFB cache related // EFB cache related
static const u32 EFB_CACHE_RECT_SIZE = 64; // Cache 64x64 blocks. static const u32 EFB_CACHE_RECT_SIZE = 64; // Cache 64x64 blocks.
static const u32 EFB_CACHE_WIDTH = (EFB_WIDTH + EFB_CACHE_RECT_SIZE - 1) / EFB_CACHE_RECT_SIZE; // round up static const u32 EFB_CACHE_WIDTH = (EFB_WIDTH + EFB_CACHE_RECT_SIZE - 1) / EFB_CACHE_RECT_SIZE; // round up
@ -620,11 +607,6 @@ Renderer::Renderer()
Renderer::~Renderer() Renderer::~Renderer()
{ {
#if defined(HAVE_WX) && HAVE_WX
if (scrshotThread.joinable())
scrshotThread.join();
#endif
} }
void Renderer::Shutdown() void Renderer::Shutdown()