From f0743e25718d812517b041834bc55826c268d8e7 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 16 Aug 2014 23:00:57 -0400 Subject: [PATCH] OGL: Removed some unnecessary preprocessor directives from Render.cpp. scrshotThread was also unused so that is removed as well. Also added the algorithm header, since we use min and max here. --- Source/Core/VideoBackends/OGL/Render.cpp | 20 +------------------- 1 file changed, 1 insertion(+), 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 #include #include #include @@ -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 -#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()