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

Fixes error handling in ShaderSource
8e6a6be8 · daniel@transgaming.com · 75401e61 · 8e6a6be8
Commit 8e6a6be8 authored Apr 13, 2010 by daniel@transgaming.com
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

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

No files found.
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -3225,7 +3225,7 @@ void __stdcall glShaderSource(GLuint shader, GLsizei count, const GLchar** strin
    try
    {
-        if (shader == 0 || count < 0)
+        if (count < 0)
        {
            return error(GL_INVALID_VALUE);
        }
@@ -3238,8 +3238,15 @@ void __stdcall glShaderSource(GLuint shader, GLsizei count, const GLchar** strin
            if (!shaderObject)
            {
+                if (context->getProgram(shader))
+                {
                    return error(GL_INVALID_OPERATION);
                }
+                else
+                {
+                    return error(GL_INVALID_VALUE);
+                }
+            }
            shaderObject->setSource(count, string, length);
        }