Returning INVALID_OPERATION when a valid program is passed to getShaderiv

BUG=angleproject:1147 Change-Id: I7f3e77f8f5f55887fe03172eadce78129ffeb10f Reviewed-on: https://chromium-review.googlesource.com/298064Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Zhenyao Mo <zmo@chromium.org> Tryjob-Request: Dian Xiang <dianx@google.com> Tested-by: Dian Xiang <dianx@google.com>

Returning INVALID_OPERATION when a valid program is passed to getShaderiv
5cf466d3 · Dian Xiang · Jamie Madill · 54c311fc · 5cf466d3
Commit 5cf466d3 authored Sep 08, 2015 by Dian Xiang Committed by Jamie Madill Sep 09, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 1 deletion

entry_points_gles_2_0.cpp src/libGLESv2/entry_points_gles_2_0.cpp +11 -1

No files found.
--- a/src/libGLESv2/entry_points_gles_2_0.cpp
+++ b/src/libGLESv2/entry_points_gles_2_0.cpp
@@ -2326,7 +2326,17 @@ void GL_APIENTRY GetShaderiv(GLuint shader, GLenum pname, GLint* params)
        if (!shaderObject)
        {
-            context->recordError(Error(GL_INVALID_VALUE));
+            Program *programObject = context->getProgram(shader);
+            if (programObject)
+            {
+                context->recordError(Error(GL_INVALID_OPERATION,
+                                           "Expected a shader name, but found a program name"));
+            }
+            else
+            {
+                context->recordError(Error(GL_INVALID_VALUE, "Shader name is invalid"));
+            }
            return;
        }