all repos — mgba @ 1868ccaadd9e50ad929a72666956f6b01e2e219c

mGBA Game Boy Advance Emulator

Qt: Only close GL context on thread when shutting down
Vicki Pfau vi@endrift.com
Mon, 20 May 2019 17:28:34 -0700
commit

1868ccaadd9e50ad929a72666956f6b01e2e219c

parent

3056655060b3be0eabd35742ea2b8e1cb18ccb09

1 files changed, 0 insertions(+), 28 deletions(-)

jump to
M src/platform/qt/DisplayGL.cpp → src/platform/qt/DisplayGL.cpp 
@@ -315,18 +315,8 @@ if (!m_context) {
 		return;
 	}
 
-	if (!m_active) {
-		m_gl->makeCurrent(m_surface);
-#if defined(_WIN32) && defined(USE_EPOXY)
-		epoxy_handle_external_wglMakeCurrent();
-#endif
-	}
-
 	QSize size = m_context->screenDimensions();
 	m_backend->setDimensions(m_backend, size.width(), size.height());
-	if (!m_active) {
-		m_gl->doneCurrent();
-	}
 }
 
 void PainterGL::setMessagePainter(MessagePainter* messagePainter) {

@@ -493,12 +483,6 @@ if (!supportsShaders()) {
 		return;
 	}
 #ifdef BUILD_GLES2
-	if (!m_active) {
-		m_gl->makeCurrent(m_surface);
-#if defined(_WIN32) && defined(USE_EPOXY)
-		epoxy_handle_external_wglMakeCurrent();
-#endif
-	}
 	if (m_shader.passes) {
 		mGLES2ShaderDetach(reinterpret_cast<mGLES2Context*>(m_backend));
 		mGLES2ShaderFree(&m_shader);

@@ -506,9 +490,6 @@ }
 	mGLES2ShaderLoad(&m_shader, dir);
 	if (m_started) {
 		mGLES2ShaderAttach(reinterpret_cast<mGLES2Context*>(m_backend), static_cast<mGLES2Shader*>(m_shader.passes), m_shader.nPasses);
-	}
-	if (!m_active) {
-		m_gl->doneCurrent();
 	}
 #endif
 }

@@ -518,18 +499,9 @@ if (!supportsShaders()) {
 		return;
 	}
 #ifdef BUILD_GLES2
-	if (!m_active) {
-		m_gl->makeCurrent(m_surface);
-#if defined(_WIN32) && defined(USE_EPOXY)
-		epoxy_handle_external_wglMakeCurrent();
-#endif
-	}
 	if (m_shader.passes) {
 		mGLES2ShaderDetach(reinterpret_cast<mGLES2Context*>(m_backend));
 		mGLES2ShaderFree(&m_shader);
-	}
-	if (!m_active) {
-		m_gl->doneCurrent();
 	}
 #endif
 }