diff options
| author | Brian Paul <brianp@vmware.com> | 2009-02-11 09:05:08 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-02-11 09:17:21 -0700 |
| commit | 234f03e90ab718f5b16300a91bac477ccbabf36c (patch) | |
| tree | 811942e6658aec9ebdb2c01dc9fec37d1cf0d187 | |
| parent | 4ef7a93296dd7d7480dfa00a2b085009ca8c4814 (diff) | |
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.
| -rw-r--r-- | 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 290717ff55..e738cde791 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) { |