commit d1abe5b0edc45ca37f2e9db21ba8b1f20c6b704c
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Tue Apr 13 19:53:33 2010 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Tue Apr 13 19:53:33 2010 +0000
tree 46bed7e9c6a97530c6bb7175e9a3640305129139
parent 23953e3ef3bfdec596bed0be52569553bfad6032

Corrects error handling in GetUniformLocation
TRAC #11845
Signed-off-by: Andrew Lewycky
Signed-off-by: Daniel Koch

Author:    Shannon Woods

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

src/libGLESv2/libGLESv2.cpp

diff --git a/src/libGLESv2/libGLESv2.cpp b/src/libGLESv2/libGLESv2.cpp
index 6147e86..004a70f 100644
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -2617,7 +2617,14 @@
 
             if (!programObject)
             {
-                return error(GL_INVALID_VALUE, -1);
+                if (context->getShader(program))
+                {
+                    return error(GL_INVALID_OPERATION, -1);
+                }
+                else
+                {
+                    return error(GL_INVALID_VALUE, -1);
+                }
             }
 
             if (!programObject->isLinked())