commit 0cefaf45e478eaa0b12da186e1dec64f8d1c7c02
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Tue Apr 13 03:26:36 2010 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Tue Apr 13 03:26:36 2010 +0000
tree 297edf2a6c9b42384e25558f81cc9380a95afbdb
parent b8c28eddec129967128e458a0ceb4fa4cacdaa77

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

src/libGLESv2/libGLESv2.cpp

diff --git a/src/libGLESv2/libGLESv2.cpp b/src/libGLESv2/libGLESv2.cpp
index ecd66c6..ecd8bef 100644
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -701,7 +701,14 @@
 
             if (!shaderObject)
             {
-                return error(GL_INVALID_VALUE);
+                if (context->getProgram(shader))
+                {
+                    return error(GL_INVALID_OPERATION);
+                }
+                else
+                {
+                    return error(GL_INVALID_VALUE);
+                }
             }
 
             shaderObject->compile();