From 6cd776b87fa64527429d7dafe48beb2a13868232 Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Wed, 23 Sep 2020 08:47:04 +0100 Subject: Only release context if we own it Otherwise we release the context that is owned by the QtQuick rendering engine which leads to assert failures and crashes in the single threaded case. Change-Id: I5f5e03bbe43a0990a29d41b2fc96e714668d85fc Reviewed-by: Paul Lemire (cherry picked from commit 2e627f8ce77e5c184742234416da88e6393fd2c1) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/renderers/opengl/renderer/renderer.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/renderers/opengl/renderer/renderer.cpp b/src/plugins/renderers/opengl/renderer/renderer.cpp index 27c3a61ca..25e56102b 100644 --- a/src/plugins/renderers/opengl/renderer/renderer.cpp +++ b/src/plugins/renderers/opengl/renderer/renderer.cpp @@ -627,7 +627,8 @@ void Renderer::releaseGraphicsResources() m_submissionContext->releaseRenderTargets(); m_frameProfiler.reset(); - context->doneCurrent(); + if (m_ownedContext) + context->doneCurrent(); } else { qWarning() << "Failed to make context current: OpenGL resources will not be destroyed"; } -- cgit v1.2.3