Minor optimization for scatter

+ fix for barstest and scattertest

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

3 files changed, 7 insertions, 5 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) {
diff --git a/tests/barstest/main.cpp b/tests/barstest/main.cpp
index 850561a7..7742cb0e 100644
--- a/tests/barstest/main.cpp
+++ b/tests/barstest/main.cpp
@@ -298,7 +298,7 @@ int main(int argc, char **argv)
                      &GraphModifier::changePresetCamera);
     QObject::connect(themeButton, &QPushButton::clicked, modifier, &GraphModifier::changeTheme);
     QObject::connect(labelButton, &QPushButton::clicked, modifier,
-                     &GraphModifier::changeStyle);
+                     &GraphModifier::changeLabelStyle);
     QObject::connect(addDataButton, &QPushButton::clicked, modifier, &GraphModifier::addRow);
     QObject::connect(addMultiDataButton, &QPushButton::clicked, modifier, &GraphModifier::addRows);
     QObject::connect(insertDataButton, &QPushButton::clicked, modifier, &GraphModifier::insertRow);
diff --git a/tests/scattertest/main.cpp b/tests/scattertest/main.cpp
index 35ba228d..dda4536b 100644
--- a/tests/scattertest/main.cpp
+++ b/tests/scattertest/main.cpp
@@ -184,7 +184,7 @@ int main(int argc, char **argv)
     QObject::connect(themeButton, &QPushButton::clicked, modifier,
                      &ScatterDataModifier::changeTheme);
     QObject::connect(labelButton, &QPushButton::clicked, modifier,
-                     &ScatterDataModifier::changeStyle);
+                     &ScatterDataModifier::changeLabelStyle);
 
     QObject::connect(shadowQuality, SIGNAL(currentIndexChanged(int)), modifier,
                      SLOT(changeShadowQuality(int)));