Fixes error handling in LinkProgram

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

Fixes error handling in LinkProgram
277b7142 · daniel@transgaming.com · 8e6a6be8 · 277b7142
Commit 277b7142 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
@@ -2950,7 +2950,14 @@ void __stdcall glLinkProgram(GLuint program)

            if (!programObject)
            {
-                return error(GL_INVALID_VALUE);
+                if (context->getShader(program))
+                {
+                    return error(GL_INVALID_OPERATION);
+                }
+                else
+                {
+                    return error(GL_INVALID_VALUE);
+                }
            }

            programObject->link();