From: Brian Paul <brianp@vmware.com>
Date: Wed, 11 Feb 2009 16:05:08 +0000 (-0700)
Subject: glsl: raise GL_INVALID_OPERATION for glUniform(location < -1)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=234f03e90ab718f5b16300a91bac477ccbabf36c;p=mesa.git

glsl: raise GL_INVALID_OPERATION for glUniform(location < -1)

location = -1 is silently ignored, but other negative values should raise
an error.

Another fix for bug 20056.
---

diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index 290717ff557..e738cde7916 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -1700,6 +1700,11 @@ _mesa_uniform(GLcontext *ctx, GLint location, GLsizei count,
    if (location == -1)
       return;   /* The standard specifies this as a no-op */
 
+   if (location < -1) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glUniform(location)");
+      return;
+   }
+
    split_location_offset(&location, &offset);
 
    if (location < 0 || location >= (GLint) shProg->Uniforms->NumUniforms) {
@@ -1874,6 +1879,11 @@ _mesa_uniform_matrix(GLcontext *ctx, GLint cols, GLint rows,
    if (location == -1)
       return;   /* The standard specifies this as a no-op */
 
+   if (location < -1) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glUniformMatrix(location)");
+      return;
+   }
+
    split_location_offset(&location, &offset);
 
    if (location < 0 || location >= (GLint) shProg->Uniforms->NumUniforms) {