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
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 2 deletions

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

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,7 +3238,14 @@ void __stdcall glShaderSource(GLuint shader, GLsizei count, const GLchar** strin

            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);