Fixes error handling in GetAttachedShaders

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

Fixes error handling in GetAttachedShaders
23953e3e · daniel@transgaming.com · 8976c1e8 · 23953e3e
Commit 23953e3e 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
@@ -1902,7 +1902,14 @@ void __stdcall glGetAttachedShaders(GLuint program, GLsizei maxcount, GLsizei* c

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

            return programObject->getAttachedShaders(maxcount, count, shaders);