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

mesa: more info in glUniform error messages

Browse source
This commit is contained in:
Brian Paul 2010-05-13 16:52:06 -06:00
parent e22e65d223
commit 16f8df893c
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1753,7 +1753,8 @@ set_program_uniform(GLcontext *ctx, struct gl_program *program,
/* check that the sampler (tex unit index) is legal */
if (texUnit >= ctx->Const.MaxTextureImageUnits) {
_mesa_error(ctx, GL_INVALID_VALUE,
"glUniform1(invalid sampler/tex unit index)");
"glUniform1(invalid sampler/tex unit index for '%s')",
param->Name);
return;
}
@ -1801,7 +1802,8 @@ set_program_uniform(GLcontext *ctx, struct gl_program *program,
/* non-array: count must be at most one; count == 0 is handled by the loop below */
if (count > 1) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"glUniform(uniform is not an array)");
"glUniform(uniform '%s' is not an array)",
param->Name);
return;
}
}
@ -1864,14 +1866,15 @@ _mesa_uniform(GLcontext *ctx, GLint location, GLsizei count,
return; /* The standard specifies this as a no-op */
if (location < -1) {
_mesa_error(ctx, GL_INVALID_OPERATION, "glUniform(location)");
_mesa_error(ctx, GL_INVALID_OPERATION, "glUniform(location=%d)",
location);
return;
}
split_location_offset(&location, &offset);
if (location < 0 || location >= (GLint) shProg->Uniforms->NumUniforms) {
_mesa_error(ctx, GL_INVALID_VALUE, "glUniform(location)");
_mesa_error(ctx, GL_INVALID_VALUE, "glUniform(location=%d)", location);
return;
}