Kaydet (Commit) e004786f authored tarafından Jan Holesovsky's avatar Jan Holesovsky Kaydeden (comit) Andras Timar

windows opengl: Avoid an unnecessary wglMakeCurrent() call.

Change-Id: I1c1287a29067c053565c49c0ce96918a2d27d87f
Reviewed-on: https://gerrit.libreoffice.org/18260Reviewed-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
Tested-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
üst d261edf4
...@@ -1278,7 +1278,6 @@ void OpenGLContext::reset() ...@@ -1278,7 +1278,6 @@ void OpenGLContext::reset()
// destroy all programs // destroy all programs
if( !maPrograms.empty() ) if( !maPrograms.empty() )
{ {
makeCurrent(); makeCurrent();
maPrograms.clear(); maPrograms.clear();
} }
...@@ -1296,7 +1295,8 @@ void OpenGLContext::reset() ...@@ -1296,7 +1295,8 @@ void OpenGLContext::reset()
if (itr != g_vShareList.end()) if (itr != g_vShareList.end())
g_vShareList.erase(itr); g_vShareList.erase(itr);
wglMakeCurrent(NULL, NULL); if (wglGetCurrentContext() != NULL)
wglMakeCurrent(NULL, NULL);
wglDeleteContext( m_aGLWin.hRC ); wglDeleteContext( m_aGLWin.hRC );
ReleaseDC( m_aGLWin.hWnd, m_aGLWin.hDC ); ReleaseDC( m_aGLWin.hWnd, m_aGLWin.hDC );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment