Shader: Removing const declaration of loadUniforms

diff --git a/LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/include/ShaderProgramGLES.h b/LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/include/ShaderProgramGLES.h
index 0550a36..6211815 100644 (file)
--- a/LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/include/ShaderProgramGLES.h
+++ b/LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/include/ShaderProgramGLES.h
@@ -51,7 +51,7 @@ public:
      */
     virtual void use(void) const;
 
-    virtual int getUniformLocation(const char* name) const
+    virtual int getUniformLocation(const char* name) 
     {
         return glGetUniformLocation(m_progHandle, name);
     }

diff --git a/LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/src/ShaderProgramGLES.cpp b/LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/src/ShaderProgramGLES.cpp
index 2be734c..27ccb32 100644 (file)
--- a/LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/src/ShaderProgramGLES.cpp
+++ b/LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/src/ShaderProgramGLES.cpp
@@ -58,7 +58,7 @@ ShaderProgram* ShaderProgramGLES::createProgram(const std::string& vertName, con
        else
        {
                // load shader sources from file, compile and link them:
-               progHandle = RenderUtilLoadShaderSources(vertName.c_str(), fragName.c_str(), GL_FALSE);
+               progHandle = RenderUtilLoadShaderSources(vertName.c_str(), fragName.c_str(), GL_TRUE);
        }
 
     if (progHandle != 0)

diff --git a/LayerManagerService/include/Shader.h b/LayerManagerService/include/Shader.h
index 42f8c67..b038a7b 100644 (file)
--- a/LayerManagerService/include/Shader.h
+++ b/LayerManagerService/include/Shader.h
@@ -76,7 +76,7 @@ public:
      * used for position, size, etc... They need to be set separately
      * by loadCommonUniforms().
      */
-    void loadUniforms(void) const;
+    void loadUniforms(void);
 
     /**
      * Load uniform values for common surface properties, like position,

diff --git a/LayerManagerService/include/ShaderProgram.h b/LayerManagerService/include/ShaderProgram.h
index fc1923f..65daa70 100644 (file)
--- a/LayerManagerService/include/ShaderProgram.h
+++ b/LayerManagerService/include/ShaderProgram.h
@@ -110,7 +110,7 @@ public:
      */
     void unref(void);
 
-    virtual int getUniformLocation(const char* name) const = 0;
+    virtual int getUniformLocation(const char* name) = 0;
 
     virtual void uniform1iv(int location, int count, const int* v) const = 0;
 

diff --git a/LayerManagerService/include/ShaderUniform.h b/LayerManagerService/include/ShaderUniform.h
index a586218..9d822b9 100644 (file)
--- a/LayerManagerService/include/ShaderUniform.h
+++ b/LayerManagerService/include/ShaderUniform.h
@@ -114,7 +114,7 @@ public:
     /**
      * Load uniform data in current OpenGL context.
      */
-    void load(const ShaderProgram& program) const;
+    void load(ShaderProgram& program);
 
 private:
     /// the uniform name

diff --git a/LayerManagerService/src/shader/Shader.cpp b/LayerManagerService/src/shader/Shader.cpp
index 1776d05..7b93f1a 100644 (file)
--- a/LayerManagerService/src/shader/Shader.cpp
+++ b/LayerManagerService/src/shader/Shader.cpp
@@ -86,14 +86,14 @@ void Shader::setUniform(const ShaderUniform& uniform)
     m_uniformMap[name]->setData(uniform);
 }
 
-void Shader::loadUniforms(void) const
+void Shader::loadUniforms(void)
 {
     UniformMapConstIterator iter = m_uniformMap.begin();
     UniformMapConstIterator iterEnd = m_uniformMap.end();
 
     for (; iter != iterEnd; ++iter)
-    {
-        const ShaderUniform* uniform = (*iter).second;
+    {       
+        ShaderUniform* uniform = (*iter).second;
         uniform->load(m_program);
     }
 }

diff --git a/LayerManagerService/src/shader/ShaderUniform.cpp b/LayerManagerService/src/shader/ShaderUniform.cpp
index ac8ecc3..37315ff 100644 (file)
--- a/LayerManagerService/src/shader/ShaderUniform.cpp
+++ b/LayerManagerService/src/shader/ShaderUniform.cpp
@@ -174,11 +174,18 @@ void ShaderUniform::setData(const ShaderUniform& other)
     m_transpose = other.m_transpose;
 }
 
-void ShaderUniform::load(const ShaderProgram& program) const
+void ShaderUniform::load(ShaderProgram& program)
 {
+    LOG_DEBUG("ShaderUniform","Load Uniform " << getName() << " location " << m_location);
+    if ( m_location == 0 ) 
+    {
+        m_location = program.getUniformLocation(getName().c_str());
+    }
+    LOG_DEBUG("ShaderUniform","Load Uniform " << getName() << " location " << m_location);
     if (m_location == -1)
     {
         // TODO: error? or silently fail?
+        LOG_WARNING("ShaderUniform","Load Uniform failed, location not defined" );
         return;
     }
 
@@ -188,18 +195,22 @@ void ShaderUniform::load(const ShaderProgram& program) const
     switch (m_type)
     {
     case Vector1f:
+        LOG_DEBUG("ShaderUniform","Load Uniform1fv : " << values[0] );
         program.uniform1fv(m_location, m_count, values);
         break;
 
     case Vector2f:
+        LOG_DEBUG("ShaderUniform","Load Uniform2fv : " << values[0] << "," << values[1] );
         program.uniform2fv(m_location, m_count, values);
         break;
 
     case Vector3f:
+        LOG_DEBUG("ShaderUniform","Load Uniform3fv : " << values[0] << "," << values[1] << "," << values[2] );
         program.uniform3fv(m_location, m_count, values);
         break;
 
     case Vector4f:
+        LOG_DEBUG("ShaderUniform","Load Uniform4fv : " << values[0] << "," << values[1] << "," << values[2] << "," << values[3] );
         program.uniform4fv(m_location, m_count, values);
         break;