commit 2242769a13de228df10fb55d50aa4d96c99d5975
author Brian Paul <brian.paul@tungstengraphics.com> Sat Jun 28 16:47:22 2008 -0600
committer Brian Paul <brian.paul@tungstengraphics.com> Sat Jun 28 16:47:22 2008 -0600
tree fb7264d609af1bffcbdd1112f9c62ecc83f74489
parent a1ec6efce0f614dfc2fb7af2cab68eca3be43850

s/GL_INVALID_VALUE/GL_INVALID_OPERATION/ in _mesa_get_uniformfv()

src/mesa/shader/shader_api.c

diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index 97edb25..a005c90 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -892,8 +892,10 @@
    struct gl_shader_program *shProg
       = _mesa_lookup_shader_program(ctx, program);
    if (shProg) {
-      if (location < shProg->Uniforms->NumUniforms) {
-         GLuint progPos, i;
+      if (shProg->Uniforms &&
+          location >= 0 && location < shProg->Uniforms->NumUniforms) {
+         GLint progPos;
+         GLuint i;
          const struct gl_program *prog = NULL;
 
          progPos = shProg->Uniforms->Uniforms[location].VertPos;
@@ -915,11 +917,11 @@
          }
       }
       else {
-         _mesa_error(ctx, GL_INVALID_VALUE, "glGetUniformfv(location)");
+         _mesa_error(ctx, GL_INVALID_OPERATION, "glGetUniformfv(location)");
       }
    }
    else {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glGetUniformfv(program)");
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetUniformfv(program)");
    }
 }