diff options
author | Mike Krus <mike.krus@kdab.com> | 2020-09-23 08:47:04 +0100 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-09-23 19:43:30 +0000 |
commit | 6cd776b87fa64527429d7dafe48beb2a13868232 (patch) | |
tree | 3c59ae1d1dc44b3068451b5043b105e898807fbd | |
parent | 22a594d46567d3589605d5fee3a31faa8dc10438 (diff) |
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 <paul.lemire@kdab.com>
(cherry picked from commit 2e627f8ce77e5c184742234416da88e6393fd2c1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | src/plugins/renderers/opengl/renderer/renderer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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"; } |