summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@theqtcompany.com>2015-10-29 13:23:03 +0200
committerMiikka Heikkinen <miikka.heikkinen@theqtcompany.com>2015-10-29 11:28:03 +0000
commit105faffbcba19e90545afcf6d9292c5dd2c7ac94 (patch)
treee33a2f35decab875ad35a40e58d54a667ed29baf
parent66dd11ebeeb3452f6e41f25ccb16e0125d93f324 (diff)
Fix the leaking framebuffer on graph resize
Change-Id: I97e32b56a81afe22aa237055ff6d7db2399b70d3 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
-rw-r--r--dist/changes-1.2.21
-rw-r--r--src/datavisualization/engine/abstract3drenderer.cpp2
2 files changed, 3 insertions, 0 deletions
diff --git a/dist/changes-1.2.2 b/dist/changes-1.2.2
index b815f1e8..1df684bd 100644
--- a/dist/changes-1.2.2
+++ b/dist/changes-1.2.2
@@ -6,3 +6,4 @@ Fixed issues
- Compilation fixes for Qt 5.6
- Fixed OpenGL 3.x crash
- Fixed renderer access synchronization in QML
+- Fixed a framebuffer leak on graph resize
diff --git a/src/datavisualization/engine/abstract3drenderer.cpp b/src/datavisualization/engine/abstract3drenderer.cpp
index 687a303f..3ee435bc 100644
--- a/src/datavisualization/engine/abstract3drenderer.cpp
+++ b/src/datavisualization/engine/abstract3drenderer.cpp
@@ -327,6 +327,8 @@ void Abstract3DRenderer::initCursorPositionShaders(const QString &vertexShader,
void Abstract3DRenderer::initCursorPositionBuffer()
{
m_textureHelper->deleteTexture(&m_cursorPositionTexture);
+ m_textureHelper->glDeleteFramebuffers(1, &m_cursorPositionFrameBuffer);
+ m_cursorPositionFrameBuffer = 0;
if (m_primarySubViewport.size().isEmpty())
return;