1 files changed, 24 insertions, 8 deletions

diff --git a/src/datavisualization/utils/shaderhelper.cpp b/src/datavisualization/utils/shaderhelper.cpp
index 3c3d93ac..3361638a 100644
--- a/src/datavisualization/utils/shaderhelper.cpp
+++ b/src/datavisualization/utils/shaderhelper.cpp
@@ -93,10 +93,12 @@ void ShaderHelper::initialize()
     m_gradientMinUniform = m_program->uniformLocation("gradMin");
     m_gradientHeightUniform = m_program->uniformLocation("gradHeight");
     m_lightColorUniform = m_program->uniformLocation("lightColor");
-    m_volumeSliceIndices = m_program->uniformLocation("volumeSliceIndices");
-    m_colorIndex = m_program->uniformLocation("colorIndex");
-    m_cameraPositionRelativeToModel = m_program->uniformLocation("cameraPositionRelativeToModel");
-    m_color8Bit = m_program->uniformLocation("color8Bit");
+    m_volumeSliceIndicesUniform = m_program->uniformLocation("volumeSliceIndices");
+    m_colorIndexUniform = m_program->uniformLocation("colorIndex");
+    m_cameraPositionRelativeToModelUniform = m_program->uniformLocation("cameraPositionRelativeToModel");
+    m_color8BitUniform = m_program->uniformLocation("color8Bit");
+    m_textureDimensionsUniform = m_program->uniformLocation("textureDimensions");
+    m_sampleCountUniform = m_program->uniformLocation("sampleCount");
     m_initialized = true;
 }
 
@@ -268,28 +270,42 @@ GLuint ShaderHelper::volumeSliceIndices()
 {
     if (!m_initialized)
         qFatal("Shader not initialized");
-    return m_volumeSliceIndices;
+    return m_volumeSliceIndicesUniform;
 }
 
 GLuint ShaderHelper::colorIndex()
 {
     if (!m_initialized)
         qFatal("Shader not initialized");
-    return m_colorIndex;
+    return m_colorIndexUniform;
 }
 
 GLuint ShaderHelper::cameraPositionRelativeToModel()
 {
     if (!m_initialized)
         qFatal("Shader not initialized");
-    return m_cameraPositionRelativeToModel;
+    return m_cameraPositionRelativeToModelUniform;
 }
 
 GLuint ShaderHelper::color8Bit()
 {
     if (!m_initialized)
         qFatal("Shader not initialized");
-    return m_color8Bit;
+    return m_color8BitUniform;
+}
+
+GLuint ShaderHelper::textureDimensions()
+{
+    if (!m_initialized)
+        qFatal("Shader not initialized");
+    return m_textureDimensionsUniform;
+}
+
+GLuint ShaderHelper::sampleCount()
+{
+    if (!m_initialized)
+        qFatal("Shader not initialized");
+    return m_sampleCountUniform;
 }
 
 GLuint ShaderHelper::posAtt()