Skip to content
Browse files

Merge pull request #4276 from koying/fixvsyncdriver

FIX: [gles] do not force vsync off if VSYNC_DRIVER
  • Loading branch information...
2 parents d5fa138 + d30bd26 commit f2646d961f413251cd5e5a112fe676e643798bf3 @jmarshallnz jmarshallnz committed Feb 28, 2014
Showing with 6 additions and 2 deletions.
  1. +6 −2 xbmc/windowing/egl/WinSystemEGL.cpp
View
8 xbmc/windowing/egl/WinSystemEGL.cpp
@@ -306,15 +306,19 @@ bool CWinSystemEGL::DestroyWindow()
bool CWinSystemEGL::ResizeWindow(int newWidth, int newHeight, int newLeft, int newTop)
{
CRenderSystemGLES::ResetRenderSystem(newWidth, newHeight, true, 0);
- SetVSyncImpl(m_iVSyncMode);
+ int vsync_mode = CSettings::Get().GetInt("videoscreen.vsync");
+ if (vsync_mode != VSYNC_DRIVER)
+ SetVSyncImpl(m_iVSyncMode);
return true;
}
bool CWinSystemEGL::SetFullScreen(bool fullScreen, RESOLUTION_INFO& res, bool blankOtherDisplays)
{
CreateNewWindow("", fullScreen, res, NULL);
CRenderSystemGLES::ResetRenderSystem(res.iWidth, res.iHeight, fullScreen, res.fRefreshRate);
- SetVSyncImpl(m_iVSyncMode);
+ int vsync_mode = CSettings::Get().GetInt("videoscreen.vsync");
+ if (vsync_mode != VSYNC_DRIVER)
+ SetVSyncImpl(m_iVSyncMode);
return true;
}

0 comments on commit f2646d9

Please sign in to comment.
Something went wrong with that request. Please try again.