commit a3bbfd43feec81a921a14dff68e17bf25f3cfd25
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Mon Jun 07 02:06:09 2010 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Mon Jun 07 02:06:09 2010 +0000
tree cfc7af57cd4f7daa850f4656eed5cf41fb8e7fdb
parent 8f05d1aa870d3c451a0756375974d7e198caad73

Fixes double-decoration when getUniformLocation is called from defineUniform.
TRAC #12437

This fixes the WebGL Teapot Per Pixel sample rendering

Signed-off-by: Andrew Lewycky
Signed-off-by: Daniel Koch

Author:    Shannon Woods

git-svn-id: https://angleproject.googlecode.com/svn/trunk@329 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/libGLESv2/Program.cpp

diff --git a/src/libGLESv2/Program.cpp b/src/libGLESv2/Program.cpp
index 469ed4d..78253c7 100644
--- a/src/libGLESv2/Program.cpp
+++ b/src/libGLESv2/Program.cpp
@@ -239,7 +239,7 @@
     else UNREACHABLE();
 }
 
-GLint Program::getUniformLocation(const char *name)
+GLint Program::getUniformLocation(const char *name, bool decorated)
 {
     std::string nameStr(name);
     int subscript = 0;
@@ -252,7 +252,10 @@
         subscript = atoi(subscrStr.c_str());
     }
 
-    nameStr = decorate(nameStr);
+    if (!decorated)
+    {
+        nameStr = decorate(nameStr);
+    }
 
     unsigned int numUniforms = mUniformIndex.size();
     for (unsigned int location = 0; location < numUniforms; location++)
@@ -1494,14 +1497,16 @@
                 return;
             }
 
-            mDepthRangeNearLocation = getUniformLocation("gl_DepthRange.near");
-            mDepthRangeFarLocation = getUniformLocation("gl_DepthRange.far");
-            mDepthRangeDiffLocation = getUniformLocation("gl_DepthRange.diff");
-            mDxDepthLocation = getUniformLocation("dx_Depth");
-            mDxWindowLocation = getUniformLocation("dx_Window");
-            mDxHalfPixelSizeLocation = getUniformLocation("dx_HalfPixelSize");
-            mDxFrontCCWLocation = getUniformLocation("dx_FrontCCW");
-            mDxPointsOrLinesLocation = getUniformLocation("dx_PointsOrLines");
+            // these uniforms are searched as already-decorated because gl_ and dx_
+            // are reserved prefixes, and do not receive additional decoration
+            mDepthRangeNearLocation = getUniformLocation("gl_DepthRange.near", true);
+            mDepthRangeFarLocation = getUniformLocation("gl_DepthRange.far", true);
+            mDepthRangeDiffLocation = getUniformLocation("gl_DepthRange.diff", true);
+            mDxDepthLocation = getUniformLocation("dx_Depth", true);
+            mDxWindowLocation = getUniformLocation("dx_Window", true);
+            mDxHalfPixelSizeLocation = getUniformLocation("dx_HalfPixelSize", true);
+            mDxFrontCCWLocation = getUniformLocation("dx_FrontCCW", true);
+            mDxPointsOrLinesLocation = getUniformLocation("dx_PointsOrLines", true);
 
             mLinked = true;   // Success
         }
@@ -1671,7 +1676,7 @@
     }
 
     // Check if already defined
-    GLint location = getUniformLocation(name.c_str());
+    GLint location = getUniformLocation(name.c_str(), true);
     GLenum type = uniform->type;
 
     if (location >= 0)