diff options
| author | jmarshallnz <jcmarsha@gmail.com> | 2014-02-28 07:49:11 +1300 |
|---|---|---|
| committer | jmarshallnz <jcmarsha@gmail.com> | 2014-02-28 07:49:11 +1300 |
| commit | f2646d961f413251cd5e5a112fe676e643798bf3 (patch) | |
| tree | 8fb682cb9a0a0ca4e9db335df13a8ebe3ee40e93 | |
| parent | d5fa13898cc5060a5d0adf1e7fa6ad42032b573c (diff) | |
| parent | d30bd26e964bdb3023a6100cc22f0ece0179f24a (diff) | |
Merge pull request #4276 from koying/fixvsyncdriver
FIX: [gles] do not force vsync off if VSYNC_DRIVER
| -rw-r--r-- | xbmc/windowing/egl/WinSystemEGL.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/xbmc/windowing/egl/WinSystemEGL.cpp b/xbmc/windowing/egl/WinSystemEGL.cpp index 2f063e6807..dfc4672e67 100644 --- a/xbmc/windowing/egl/WinSystemEGL.cpp +++ b/xbmc/windowing/egl/WinSystemEGL.cpp @@ -306,7 +306,9 @@ 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; } @@ -314,7 +316,9 @@ bool CWinSystemEGL::SetFullScreen(bool fullScreen, RESOLUTION_INFO& res, bool bl { 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; } |