Fixes error handling in BindAttribLocation

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

Fixes error handling in BindAttribLocation
98079839 · daniel@transgaming.com · cf4aa879 · 98079839
Commit 98079839 authored Apr 13, 2010 by daniel@transgaming.com
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 1 deletion

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

No files found.
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -120,7 +120,19 @@ void __stdcall glBindAttribLocation(GLuint program, GLuint index, const GLchar* 
            if (!programObject)
            {
-                return error(GL_INVALID_VALUE);
+                if (context->getShader(program))
+                {
+                    return error(GL_INVALID_OPERATION);
+                }
+                else
+                {
+                    return error(GL_INVALID_VALUE);
+                }
+            }
+            if (strncmp(name, "gl_", 3) == 0)
+            {
+                return error(GL_INVALID_OPERATION);
            }
            programObject->bindAttributeLocation(index, name);