commit 8e6a6be85ed1851b513316a5e45c25db2f427f65
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Tue Apr 13 03:26:41 2010 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Tue Apr 13 03:26:41 2010 +0000
tree aa7ec5527d2ba4313935d00614e92a93d294b7e6
parent 75401e61fb26eb68681287697db11aed5ed14edb

Fixes error handling in ShaderSource
TRAC #11664
Signed-off-by: Nicolas Capens
Signed-off-by: Daniel Koch

Author:    Shannon Woods

git-svn-id: https://angleproject.googlecode.com/svn/trunk@135 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/libGLESv2/libGLESv2.cpp

diff --git a/src/libGLESv2/libGLESv2.cpp b/src/libGLESv2/libGLESv2.cpp
index 12fded6..799cedf 100644
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -3225,7 +3225,7 @@
 
     try
     {
-        if (shader == 0 || count < 0)
+        if (count < 0)
         {
             return error(GL_INVALID_VALUE);
         }
@@ -3238,7 +3238,14 @@
 
             if (!shaderObject)
             {
-                return error(GL_INVALID_OPERATION);
+                if (context->getProgram(shader))
+                {
+                    return error(GL_INVALID_OPERATION);
+                }
+                else
+                {
+                    return error(GL_INVALID_VALUE);
+                }
             }
 
             shaderObject->setSource(count, string, length);