diff options
| author | Lioncash <mathew1800@gmail.com> | 2014-08-17 00:00:36 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2014-08-17 00:00:36 -0400 |
| commit | 6bfe3714c42ea9912a361555e052d4791c64f4c8 (patch) | |
| tree | 098889dcbfee51b198af1e9a2e9ce8eb99a5a51d | |
| parent | ac0ac1865570e06a07749f8d6962f8b92891d3cc (diff) | |
| parent | f0743e25718d812517b041834bc55826c268d8e7 (diff) | |
Merge pull request #819 from lioncash/preproc
OGL: Removed some unnecessary preprocessor directives from Render.cpp.
| -rw-r--r-- | Source/Core/VideoBackends/OGL/Render.cpp | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp index d6881171e7..61429d41e8 100644 --- a/Source/Core/VideoBackends/OGL/Render.cpp +++ b/Source/Core/VideoBackends/OGL/Render.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include <algorithm> #include <cinttypes> #include <cmath> #include <cstdio> @@ -48,16 +49,6 @@ #include "VideoCommon/VertexShaderManager.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 #include "VideoCommon/AVIDump.h" #endif @@ -100,10 +91,6 @@ static u32 s_blendMode; static bool s_vsync; -#if defined(HAVE_WX) && HAVE_WX -static std::thread scrshotThread; -#endif - // EFB cache related 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 @@ -620,11 +607,6 @@ Renderer::Renderer() Renderer::~Renderer() { - -#if defined(HAVE_WX) && HAVE_WX - if (scrshotThread.joinable()) - scrshotThread.join(); -#endif } void Renderer::Shutdown() |