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/libGLESv2.cpp

diff --git a/src/libGLESv2/libGLESv2.cpp b/src/libGLESv2/libGLESv2.cpp
index 1e47886..a136bd3 100644
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -2967,7 +2967,7 @@
                 return error(GL_INVALID_OPERATION, -1);
             }
 
-            return programObject->getUniformLocation(name);
+            return programObject->getUniformLocation(name, false);
         }
     }
     catch(std::bad_alloc&)