diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2015-09-22 15:32:48 +0200 |
|---|---|---|
| committer | Markus Wick <degasus@users.noreply.github.com> | 2015-09-22 15:32:48 +0200 |
| commit | 3930c929cbd6d286c104333337f513ec0c91902c (patch) | |
| tree | 4fe7068fbf8b3c22cdafebd16b3a1ff573f4144b /Source/Core/VideoBackends/OGL/Render.cpp | |
| parent | a537ca7543bb3b147a9fbb1c6f44083902848d2d (diff) | |
| parent | c9836ff59292855093ba5f7bdc47755ea74123a5 (diff) | |
Merge pull request #3062 from phire/moveGL
Move GL interface code out of the OpenGL video backend.
Diffstat (limited to 'Source/Core/VideoBackends/OGL/Render.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/Render.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp index 44f6163141..6481480a3b 100644 --- a/Source/Core/VideoBackends/OGL/Render.cpp +++ b/Source/Core/VideoBackends/OGL/Render.cpp @@ -17,6 +17,8 @@ #include "Common/StringUtil.h" #include "Common/Thread.h" #include "Common/Timer.h" +#include "Common/GL/GLInterfaceBase.h" +#include "Common/GL/GLUtil.h" #include "Common/Logging/LogManager.h" #include "Core/ConfigManager.h" @@ -24,8 +26,6 @@ #include "VideoBackends/OGL/BoundingBox.h" #include "VideoBackends/OGL/FramebufferManager.h" -#include "VideoBackends/OGL/GLInterfaceBase.h" -#include "VideoBackends/OGL/GLUtil.h" #include "VideoBackends/OGL/main.h" #include "VideoBackends/OGL/PostProcessing.h" #include "VideoBackends/OGL/ProgramShaderCache.h" @@ -639,7 +639,8 @@ Renderer::Renderer() // Handle VSync on/off s_vsync = g_ActiveConfig.IsVSync(); - GLInterface->SwapInterval(s_vsync); + if (!DriverDetails::HasBug(DriverDetails::BUG_BROKENVSYNC)) + GLInterface->SwapInterval(s_vsync); // TODO: Move these somewhere else? FramebufferManagerBase::SetLastXfbWidth(MAX_XFB_WIDTH); @@ -1730,7 +1731,8 @@ void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, co if (s_vsync != g_ActiveConfig.IsVSync()) { s_vsync = g_ActiveConfig.IsVSync(); - GLInterface->SwapInterval(s_vsync); + if (!DriverDetails::HasBug(DriverDetails::BUG_BROKENVSYNC)) + GLInterface->SwapInterval(s_vsync); } // Clean out old stuff from caches. It's not worth it to clean out the shader caches. |