From 149c93ced7fdfa7af2192d4999837a74c268cc25 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 25 Feb 2014 12:01:21 +0200 Subject: Fix Valgrind found issues MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Iccacab527abf745e7ccd1e562ff9ea5dea4c8005 Reviewed-by: Tomi Korpipää --- src/datavisualization/engine/surface3drenderer.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/datavisualization/engine/surface3drenderer.cpp') diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp index 47978170..ffcdeb7a 100644 --- a/src/datavisualization/engine/surface3drenderer.cpp +++ b/src/datavisualization/engine/surface3drenderer.cpp @@ -119,10 +119,6 @@ Surface3DRenderer::~Surface3DRenderer() m_textureHelper->deleteTexture(&m_depthTexture); m_textureHelper->deleteTexture(&m_depthModelTexture); m_textureHelper->deleteTexture(&m_selectionResultTexture); - foreach (SurfaceSeriesRenderCache *cache, m_renderCacheList) { - GLuint texture = cache->selectionTexture(); - m_textureHelper->deleteTexture(&texture); - } } delete m_depthShader; delete m_backgroundShader; @@ -136,8 +132,10 @@ Surface3DRenderer::~Surface3DRenderer() delete m_gridLineObj; delete m_labelObj; - foreach (SurfaceSeriesRenderCache *cache, m_renderCacheList) + foreach (SurfaceSeriesRenderCache *cache, m_renderCacheList) { + cache->cleanup(m_textureHelper); delete cache; + } m_renderCacheList.clear(); } @@ -272,6 +270,7 @@ void Surface3DRenderer::updateSeries(const QList &seriesLis updateSelectedPoint(Surface3DController::invalidSelectionPosition(), 0); m_renderCacheList.remove(cache->series()); + cache->cleanup(m_textureHelper); delete cache; m_selectionTexturesDirty = true; -- cgit v1.2.3