Mesa (master): glsl: raise GL_INVALID_OPERATION for glUniform(location < -1 )
Brian Paul
brianp at kemper.freedesktop.org
Wed Feb 11 16:17:39 UTC 2009
Module: Mesa
Branch: master
Commit: 234f03e90ab718f5b16300a91bac477ccbabf36c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=234f03e90ab718f5b16300a91bac477ccbabf36c
Author: Brian Paul <brianp at vmware.com>
Date: Wed Feb 11 09:05:08 2009 -0700
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.
---
src/mesa/shader/shader_api.c | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index 290717f..e738cde 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) {
More information about the mesa-commit
mailing list