Fixes incorrect error handling in GetAttribLocation

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

Fixes incorrect error handling in GetAttribLocation
bb274c35 · daniel@transgaming.com · d91cfe7e · bb274c35
Commit bb274c35 authored Apr 13, 2010 by daniel@transgaming.com
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

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

No files found.
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -1722,11 +1722,19 @@ int __stdcall glGetAttribLocation(GLuint program, const GLchar* name)
        if (context)
        {
            gl::Program *programObject = context->getProgram(program);
            if (!programObject)
            {
-                return error(GL_INVALID_VALUE, -1);
+                if (context->getShader(program))
+                {
+                    return error(GL_INVALID_OPERATION, -1);
+                }
+                else
+                {
+                    return error(GL_INVALID_VALUE, -1);
+                }
            }
            return programObject->getAttributeLocation(name);