Removed unnecessary texture enablings

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

3 files changed, 2 insertions, 24 deletions

diff --git a/src/datavisualization/engine/scatter3drenderer.cpp b/src/datavisualization/engine/scatter3drenderer.cpp
index 2935d02d..31c3973b 100644
--- a/src/datavisualization/engine/scatter3drenderer.cpp
+++ b/src/datavisualization/engine/scatter3drenderer.cpp
@@ -686,7 +686,6 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
             previousMeshColorStyle = Q3DTheme::ColorStyleRangeGradient;
             m_dotGradientShader->setUniformValue(m_dotGradientShader->gradientHeight(), 0.0f);
         }
-        glEnable(GL_TEXTURE_2D);
     } else {
         dotShader = pointSelectionShader;
         previousDrawingPoints = true;
@@ -1045,9 +1044,6 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
         }
     }
 
-    // Disable textures
-    glDisable(GL_TEXTURE_2D);
-
     // Draw grid lines
     QVector3D gridLineScaleX(m_scaleXWithBackground, gridLineWidth, gridLineWidth);
     QVector3D gridLineScaleZ(gridLineWidth, gridLineWidth, m_scaleZWithBackground);
@@ -1429,7 +1425,6 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
         glEnable(GL_DEPTH_TEST);
     }
 
-    glDisable(GL_TEXTURE_2D);
     glDisable(GL_BLEND);
 
     // Release shader
@@ -1452,7 +1447,6 @@ void Scatter3DRenderer::drawLabels(bool drawSelection, const Q3DCamera *activeCa
         shader = m_labelShader;
         shader->bind();
 
-        glEnable(GL_TEXTURE_2D);
         glEnable(GL_BLEND);
         glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     }
diff --git a/src/datavisualization/engine/selectionpointer.cpp b/src/datavisualization/engine/selectionpointer.cpp
index 183d3f8e..c40034ba 100644
--- a/src/datavisualization/engine/selectionpointer.cpp
+++ b/src/datavisualization/engine/selectionpointer.cpp
@@ -122,9 +122,6 @@ void SelectionPointer::render(GLuint defaultFboHandle, bool useOrtho)
 
     MVPMatrix = projectionMatrix * viewMatrix * modelMatrix;
 
-    // Enable texturing
-    glEnable(GL_TEXTURE_2D);
-
     QVector3D lightPos =  m_cachedScene->activeLight()->position();
 
     //
@@ -186,9 +183,6 @@ void SelectionPointer::render(GLuint defaultFboHandle, bool useOrtho)
     // Release shader
     glUseProgram(0);
 
-    // Disable textures
-    glDisable(GL_TEXTURE_2D);
-
     // Disable transparency
     glDisable(GL_BLEND);
 
diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp
index 1558b636..cc1ac1ae 100644
--- a/src/datavisualization/engine/surface3drenderer.cpp
+++ b/src/datavisualization/engine/surface3drenderer.cpp
@@ -832,9 +832,6 @@ void Surface3DRenderer::drawSlicedScene()
         }
     }
 
-    // Disable textures
-    glDisable(GL_TEXTURE_2D);
-
     glEnable(GL_CULL_FACE);
     glCullFace(GL_BACK);
 
@@ -927,7 +924,6 @@ void Surface3DRenderer::drawSlicedScene()
 
     // Draw labels
     m_labelShader->bind();
-    glEnable(GL_TEXTURE_2D);
     glDisable(GL_DEPTH_TEST);
     glEnable(GL_BLEND);
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -1000,7 +996,6 @@ void Surface3DRenderer::drawSlicedScene()
                         m_cachedSelectionMode, m_labelShader, m_labelObj, activeCamera,
                         false, false, Drawer::LabelMid, Qt::AlignBottom);
 
-    glDisable(GL_TEXTURE_2D);
     glEnable(GL_DEPTH_TEST);
     glDisable(GL_BLEND);
 
@@ -1200,9 +1195,6 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle)
         glCullFace(GL_BACK);
     }
 #endif
-    // Enable texturing
-    glEnable(GL_TEXTURE_2D);
-
     // Draw selection buffer
     if (!m_cachedIsSlicingActivated && (!m_renderCacheList.isEmpty()
                                         || !m_customRenderCache.isEmpty())
@@ -1837,7 +1829,7 @@ void Surface3DRenderer::drawLabels(bool drawSelection, const Q3DCamera *activeCa
     } else {
         shader = m_labelShader;
         shader->bind();
-        glEnable(GL_TEXTURE_2D);
+
         glEnable(GL_BLEND);
         glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     }
@@ -2262,10 +2254,8 @@ void Surface3DRenderer::drawLabels(bool drawSelection, const Q3DCamera *activeCa
     }
     glDisable(GL_POLYGON_OFFSET_FILL);
 
-    if (!drawSelection) {
-        glDisable(GL_TEXTURE_2D);
+    if (!drawSelection)
         glDisable(GL_BLEND);
-    }
 }
 
 void Surface3DRenderer::updateSelectionMode(QAbstract3DGraph::SelectionFlags mode)