Minor optimization for scatter

+ fix for barstest and scattertest

Change-Id: I9c04aeb847162cacc9ceeb788b8626b81c75f7fa
Change-Id: I9c04aeb847162cacc9ceeb788b8626b81c75f7fa
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

1 files changed, 5 insertions, 3 deletions

diff --git a/src/datavisualization/engine/scatter3drenderer.cpp b/src/datavisualization/engine/scatter3drenderer.cpp
index a482cc42..d2f983f1 100644
--- a/src/datavisualization/engine/scatter3drenderer.cpp
+++ b/src/datavisualization/engine/scatter3drenderer.cpp
@@ -472,6 +472,11 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
     // Bind dot shader
     m_dotShader->bind();
 
+    // Set unchanging shader bindings
+    m_dotShader->setUniformValue(m_dotShader->lightP(), lightPos);
+    m_dotShader->setUniformValue(m_dotShader->view(), viewMatrix);
+    m_dotShader->setUniformValue(m_dotShader->ambientS(), m_cachedTheme.m_ambientStrength);
+
     // Enable texture
     glEnable(GL_TEXTURE_2D);
 
@@ -546,14 +551,11 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
         }
 
         // Set shader bindings
-        m_dotShader->setUniformValue(m_dotShader->lightP(), lightPos);
-        m_dotShader->setUniformValue(m_dotShader->view(), viewMatrix);
         m_dotShader->setUniformValue(m_dotShader->model(), modelMatrix);
         m_dotShader->setUniformValue(m_dotShader->nModel(),
                                      itModelMatrix.inverted().transposed());
         m_dotShader->setUniformValue(m_dotShader->MVP(), MVPMatrix);
         m_dotShader->setUniformValue(m_dotShader->color(), dotColor);
-        m_dotShader->setUniformValue(m_dotShader->ambientS(), m_cachedTheme.m_ambientStrength);
 
 #if !defined(QT_OPENGL_ES_2)
         if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {