Fixes error handling in CompileShader

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

Fixes error handling in CompileShader
0cefaf45 · daniel@transgaming.com · b8c28edd · 0cefaf45
Commit 0cefaf45 authored Apr 13, 2010 by daniel@transgaming.com
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

libGLESv2.cpp src/libGLESv2/libGLESv2.cpp +7 -0

No files found.
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -701,8 +701,15 @@ void __stdcall glCompileShader(GLuint shader)
            if (!shaderObject)
            {
+                if (context->getProgram(shader))
+                {
+                    return error(GL_INVALID_OPERATION);
+                }
+                else
+                {
                    return error(GL_INVALID_VALUE);
                }
+            }
            shaderObject->compile();
        }