Corrects error handling in AttachShader

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

Corrects error handling in AttachShader
e9d6ed03 · daniel@transgaming.com · bb274c35 · e9d6ed03
Commit e9d6ed03 authored Apr 13, 2010 by daniel@transgaming.com
Show whitespace changes
Inline Side-by-side

Showing with 20 additions and 1 deletion

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

No files found.
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -65,10 +65,29 @@ void __stdcall glAttachShader(GLuint program, GLuint shader)
            gl::Program *programObject = context->getProgram(program);
            gl::Shader *shaderObject = context->getShader(shader);
-            if (!programObject || !shaderObject)
+            if (!programObject)
+            {
+                if (context->getShader(program))
+                {
+                    return error(GL_INVALID_OPERATION);
+                }
+                else
                {
                    return error(GL_INVALID_VALUE);
                }
+            }
+            if (!shaderObject)
+            {
+                if (context->getProgram(shader))
+                {
+                    return error(GL_INVALID_OPERATION);
+                }
+                else
+                {
+                    return error(GL_INVALID_VALUE);
+                }
+            }
            if (!programObject->attachShader(shaderObject))
            {