mesa: glsl: fix error check in get_uniformfv()
This commit is contained in:
parent
5fc6f6a33f
commit
18cd9c229a
|
@ -50,6 +50,11 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#ifndef GL_PROGRAM_BINARY_LENGTH_OES
|
||||||
|
#define GL_PROGRAM_BINARY_LENGTH_OES 0x8741
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Allocate a new gl_shader_program object, initialize it.
|
* Allocate a new gl_shader_program object, initialize it.
|
||||||
*/
|
*/
|
||||||
|
@ -906,6 +911,9 @@ _mesa_get_programiv(GLcontext *ctx, GLuint program,
|
||||||
if (*params > 0)
|
if (*params > 0)
|
||||||
(*params)++; /* add one for terminating zero */
|
(*params)++; /* add one for terminating zero */
|
||||||
break;
|
break;
|
||||||
|
case GL_PROGRAM_BINARY_LENGTH_OES:
|
||||||
|
*params = 0;
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
_mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramiv(pname)");
|
_mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramiv(pname)");
|
||||||
return;
|
return;
|
||||||
|
@ -999,7 +1007,7 @@ get_uniformfv(GLcontext *ctx, GLuint program, GLint location,
|
||||||
GLfloat *params)
|
GLfloat *params)
|
||||||
{
|
{
|
||||||
struct gl_shader_program *shProg
|
struct gl_shader_program *shProg
|
||||||
= _mesa_lookup_shader_program(ctx, program);
|
= _mesa_lookup_shader_program_err(ctx, program, "glGetUniform[if]v");
|
||||||
if (shProg) {
|
if (shProg) {
|
||||||
if (shProg->Uniforms &&
|
if (shProg->Uniforms &&
|
||||||
location >= 0 && location < (GLint) shProg->Uniforms->NumUniforms) {
|
location >= 0 && location < (GLint) shProg->Uniforms->NumUniforms) {
|
||||||
|
@ -1033,9 +1041,6 @@ get_uniformfv(GLcontext *ctx, GLuint program, GLint location,
|
||||||
_mesa_error(ctx, GL_INVALID_OPERATION, "glGetUniformfv(location)");
|
_mesa_error(ctx, GL_INVALID_OPERATION, "glGetUniformfv(location)");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
|
||||||
_mesa_error(ctx, GL_INVALID_OPERATION, "glGetUniformfv(program)");
|
|
||||||
}
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue