summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/engine/surfaceseriesrendercache.cpp
diff options
context:
space:
mode:
authorMika Salmela <mika.salmela@digia.com>2014-07-04 09:58:12 +0300
committerMika Salmela <mika.salmela@digia.com>2014-07-04 10:03:13 +0300
commit6e4fb232702fa128b5efa3eef5dfaff4870a9fd0 (patch)
tree315abbc95d09a558e3eb47c757c06fe66ce3c236 /src/datavisualization/engine/surfaceseriesrendercache.cpp
parent6264a2ff1518d374e6150bf584f2ad3d133457dd (diff)
Texture to surface
API for setting a texture to surface. Task-number: QTRD-3232 Change-Id: Icd9de61882b54b9c1fc84a742e49980926ca681d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/engine/surfaceseriesrendercache.cpp')
-rw-r--r--src/datavisualization/engine/surfaceseriesrendercache.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/datavisualization/engine/surfaceseriesrendercache.cpp b/src/datavisualization/engine/surfaceseriesrendercache.cpp
index 1cce5288..f1ad752a 100644
--- a/src/datavisualization/engine/surfaceseriesrendercache.cpp
+++ b/src/datavisualization/engine/surfaceseriesrendercache.cpp
@@ -39,7 +39,8 @@ SurfaceSeriesRenderCache::SurfaceSeriesRenderCache(QAbstract3DSeries *series,
m_sliceSelectionPointer(0),
m_mainSelectionPointer(0),
m_slicePointerActive(false),
- m_mainPointerActive(false)
+ m_mainPointerActive(false),
+ m_surfaceTexture(0)
{
}
@@ -62,8 +63,10 @@ void SurfaceSeriesRenderCache::populate(bool newSeries)
void SurfaceSeriesRenderCache::cleanup(TextureHelper *texHelper)
{
- if (QOpenGLContext::currentContext())
+ if (QOpenGLContext::currentContext()) {
texHelper->deleteTexture(&m_selectionTexture);
+ texHelper->deleteTexture(&m_surfaceTexture);
+ }
delete m_surfaceObj;
delete m_sliceSurfaceObj;