Add alpha multiplier to QCustom3DVolume api

Change-Id: I856c4166513f6d6f7b73fd52bc46d52ab1b8fdff
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Reviewed-by: Mika Salmela <mika.salmela@digia.com>

2 files changed, 20 insertions, 0 deletions

diff --git a/src/datavisualization/utils/shaderhelper.cpp b/src/datavisualization/utils/shaderhelper.cpp
index 3361638a..9d1ad0d9 100644
--- a/src/datavisualization/utils/shaderhelper.cpp
+++ b/src/datavisualization/utils/shaderhelper.cpp
@@ -99,6 +99,8 @@ void ShaderHelper::initialize()
     m_color8BitUniform = m_program->uniformLocation("color8Bit");
     m_textureDimensionsUniform = m_program->uniformLocation("textureDimensions");
     m_sampleCountUniform = m_program->uniformLocation("sampleCount");
+    m_alphaMultiplierUniform = m_program->uniformLocation("alphaMultiplier");
+    m_preserveOpacityUniform = m_program->uniformLocation("preserveOpacity");
     m_initialized = true;
 }
 
@@ -308,6 +310,20 @@ GLuint ShaderHelper::sampleCount()
     return m_sampleCountUniform;
 }
 
+GLuint ShaderHelper::alphaMultiplier()
+{
+    if (!m_initialized)
+        qFatal("Shader not initialized");
+    return m_alphaMultiplierUniform;
+}
+
+GLuint ShaderHelper::preserveOpacity()
+{
+    if (!m_initialized)
+        qFatal("Shader not initialized");
+    return m_preserveOpacityUniform;
+}
+
 GLuint ShaderHelper::posAtt()
 {
     if (!m_initialized)
diff --git a/src/datavisualization/utils/shaderhelper_p.h b/src/datavisualization/utils/shaderhelper_p.h
index bc7609bb..ac815447 100644
--- a/src/datavisualization/utils/shaderhelper_p.h
+++ b/src/datavisualization/utils/shaderhelper_p.h
@@ -80,6 +80,8 @@ class ShaderHelper
     GLuint color8Bit();
     GLuint textureDimensions();
     GLuint sampleCount();
+    GLuint alphaMultiplier();
+    GLuint preserveOpacity();
 
     GLuint posAtt();
     GLuint uvAtt();
@@ -120,6 +122,8 @@ class ShaderHelper
     GLuint m_color8BitUniform;
     GLuint m_textureDimensionsUniform;
     GLuint m_sampleCountUniform;
+    GLuint m_alphaMultiplierUniform;
+    GLuint m_preserveOpacityUniform;
 
     GLboolean m_initialized;
 };