Implements correct error handling for DetachShader

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

Implements correct error handling for DetachShader
73c2c2ed · daniel@transgaming.com · 79f6677d · 73c2c2ed
Commit 73c2c2ed authored Apr 13, 2010 by daniel@transgaming.com
Hide whitespace changes
Inline Side-by-side

Showing with 25 additions and 2 deletions

libGLESv2.cpp src/libGLESv2/libGLESv2.cpp +25 -2

No files found.
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -1108,12 +1108,35 @@ void __stdcall glDetachShader(GLuint program, GLuint shader)

        if (context)
        {
+
            gl::Program *programObject = context->getProgram(program);
            gl::Shader *shaderObject = context->getShader(shader);
+            
+            if (!programObject)
+            {
+                gl::Shader *shaderByProgramHandle;
+                shaderByProgramHandle = context->getShader(program);
+                if (!shaderByProgramHandle)
+                {
+                    return error(GL_INVALID_VALUE);
+                }
+                else
+                {
+                    return error(GL_INVALID_OPERATION);
+                }
+            }

-            if (!programObject || !shaderObject)
+            if (!shaderObject)
            {
-                return error(GL_INVALID_VALUE);
+                gl::Program *programByShaderHandle = context->getProgram(shader);
+                if (!programByShaderHandle)
+                {
+                    return error(GL_INVALID_VALUE);
+                }
+                else
+                {
+                    return error(GL_INVALID_OPERATION);
+                }
            }

            if (!programObject->detachShader(shaderObject))