Corrects error handling in UseProgram

TRAC #11666 Signed-off-by: Nicolas Capens Signed-off-by: Daniel Koch Author: Shannon Woods git-svn-id: https://angleproject.googlecode.com/svn/trunk@141 736b8ea6-26fd-11df-bfd4-992fa37f6226

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

Showing with 13 additions and 1 deletion

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

No files found.
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -4268,7 +4268,19 @@ void __stdcall glUseProgram(GLuint program)
        {
            gl::Program *programObject = context->getProgram(program);
-            if (programObject && !programObject->isLinked())
+            if (!programObject && program != 0)
+            {
+                if (context->getShader(program))
+                {
+                    return error(GL_INVALID_OPERATION);
+                }
+                else
+                {
+                    return error(GL_INVALID_VALUE);
+                }
+            }
+            if (program != 0 && !programObject->isLinked())
            {
                return error(GL_INVALID_OPERATION);
            }