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

Corrects error handling in GetUniformLocation
d1abe5b0 · daniel@transgaming.com · 23953e3e · d1abe5b0
Commit d1abe5b0 authored Apr 13, 2010 by daniel@transgaming.com
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

libGLESv2.cpp src/libGLESv2/libGLESv2.cpp +8 -1

No files found.
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -2617,7 +2617,14 @@ int __stdcall glGetUniformLocation(GLuint program, const GLchar* name)
            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())