fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 00:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

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

Another fix for bug 20056.
This commit is contained in:
Brian Paul 2009-02-11 09:05:08 -07:00
parent 4ef7a93296
commit 234f03e90a
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/mesa/shader/shader_api.c
View file

@ -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) {