diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-30 03:00:58 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-30 03:00:59 +0200 |
commit | 215833472171b17db506d49646c639b4fff926ab (patch) | |
tree | 96615c2a513ec847893a0524f9a918acaa1066ba /src/datavisualization/engine/surface3drenderer.cpp | |
parent | 1860c49b37d2235b632304f2a0c69d75c18101f2 (diff) | |
parent | e4cd15e388f675a80a9c257655a580b1b53c240a (diff) |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ie398d7814f964598d57fba37744dedf78951c773
Diffstat (limited to 'src/datavisualization/engine/surface3drenderer.cpp')
-rw-r--r-- | src/datavisualization/engine/surface3drenderer.cpp | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp index b6125719..be7ccf66 100644 --- a/src/datavisualization/engine/surface3drenderer.cpp +++ b/src/datavisualization/engine/surface3drenderer.cpp @@ -95,17 +95,7 @@ Surface3DRenderer::Surface3DRenderer(Surface3DController *controller) Surface3DRenderer::~Surface3DRenderer() { - fixContextBeforeDelete(); - - if (QOpenGLContext::currentContext()) { - m_textureHelper->glDeleteFramebuffers(1, &m_depthFrameBuffer); - m_textureHelper->glDeleteRenderbuffers(1, &m_selectionDepthBuffer); - m_textureHelper->glDeleteFramebuffers(1, &m_selectionFrameBuffer); - - m_textureHelper->deleteTexture(&m_noShadowTexture); - m_textureHelper->deleteTexture(&m_depthTexture); - m_textureHelper->deleteTexture(&m_selectionResultTexture); - } + contextCleanup(); delete m_depthShader; delete m_backgroundShader; delete m_selectionShader; @@ -118,6 +108,19 @@ Surface3DRenderer::~Surface3DRenderer() delete m_surfaceSliceSmoothShader; } +void Surface3DRenderer::contextCleanup() +{ + if (QOpenGLContext::currentContext()) { + m_textureHelper->glDeleteFramebuffers(1, &m_depthFrameBuffer); + m_textureHelper->glDeleteRenderbuffers(1, &m_selectionDepthBuffer); + m_textureHelper->glDeleteFramebuffers(1, &m_selectionFrameBuffer); + + m_textureHelper->deleteTexture(&m_noShadowTexture); + m_textureHelper->deleteTexture(&m_depthTexture); + m_textureHelper->deleteTexture(&m_selectionResultTexture); + } +} + void Surface3DRenderer::initializeOpenGL() { Abstract3DRenderer::initializeOpenGL(); |