Full update for static buffers when data updated

Task-number: QTRD-3322
Change-Id: I6ac9e0506ed7355e06d2174d8f8f551cb82b8a86
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

3 files changed, 12 insertions, 1 deletions

diff --git a/src/datavisualization/engine/scatter3drenderer.cpp b/src/datavisualization/engine/scatter3drenderer.cpp
index 34386ca6..22d40a74 100644
--- a/src/datavisualization/engine/scatter3drenderer.cpp
+++ b/src/datavisualization/engine/scatter3drenderer.cpp
@@ -200,6 +200,10 @@ void Scatter3DRenderer::updateData()
 
             for (int i = 0; i < dataSize; i++)
                 updateRenderItem(dataArray.at(i), renderArray[i]);
+
+            if (m_cachedOptimizationHint.testFlag(QAbstract3DGraph::OptimizationStatic))
+                cache->setStaticBufferDirty(true);
+
             cache->setDataDirty(false);
         }
     }
@@ -232,7 +236,8 @@ void Scatter3DRenderer::updateData()
                         cache->setBufferObject(object);
                     }
                     if (renderArraySize != cache->oldArraySize()
-                            || cache->object()->objectFile() != cache->oldMeshFileName()) {
+                            || cache->object()->objectFile() != cache->oldMeshFileName()
+                            || cache->staticBufferDirty()) {
                         object->setScaleY(m_scaleY);
                         object->fullLoad(cache, m_dotSizeScale);
                         cache->setOldArraySize(renderArraySize);
@@ -241,6 +246,8 @@ void Scatter3DRenderer::updateData()
                         object->update(cache, m_dotSizeScale);
                     }
                 }
+
+                cache->setStaticBufferDirty(false);
             }
         }
     }
diff --git a/src/datavisualization/engine/scatterseriesrendercache.cpp b/src/datavisualization/engine/scatterseriesrendercache.cpp
index e8888d19..4bc733ac 100644
--- a/src/datavisualization/engine/scatterseriesrendercache.cpp
+++ b/src/datavisualization/engine/scatterseriesrendercache.cpp
@@ -27,6 +27,7 @@ ScatterSeriesRenderCache::ScatterSeriesRenderCache(QAbstract3DSeries *series,
     : SeriesRenderCache(series, renderer),
       m_itemSize(0.0f),
       m_selectionIndexOffset(0),
+      m_staticBufferDirty(false),
       m_oldRenderArraySize(0),
       m_oldMeshFileName(QString()),
       m_scatterBufferObj(0),
diff --git a/src/datavisualization/engine/scatterseriesrendercache_p.h b/src/datavisualization/engine/scatterseriesrendercache_p.h
index 490e21fb..e7643748 100644
--- a/src/datavisualization/engine/scatterseriesrendercache_p.h
+++ b/src/datavisualization/engine/scatterseriesrendercache_p.h
@@ -53,6 +53,8 @@ public:
     inline float itemSize() const { return m_itemSize; }
     inline void setSelectionIndexOffset(int offset) { m_selectionIndexOffset = offset; }
     inline int selectionIndexOffset() const { return m_selectionIndexOffset; }
+    inline void setStaticBufferDirty(bool state) { m_staticBufferDirty = state; }
+    inline bool staticBufferDirty() const { return m_staticBufferDirty; }
     inline int oldArraySize() const { return m_oldRenderArraySize; }
     inline void setOldArraySize(int size) { m_oldRenderArraySize = size; }
     inline const QString &oldMeshFileName() const { return m_oldMeshFileName; }
@@ -66,6 +68,7 @@ protected:
     ScatterRenderItemArray m_renderArray;
     float m_itemSize;
     int m_selectionIndexOffset; // Temporarily cached value for selection color calculations
+    bool m_staticBufferDirty;
     int m_oldRenderArraySize; // Used to detect if full buffer change needed
     QString m_oldMeshFileName; // Used to detect if full buffer change needed
     ScatterObjectBufferHelper *m_scatterBufferObj;