KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glsl: allow setting arrays of samplers in set_program_uniform() 

Arrays of sampler vars haven't been tested much and might actually be broken.
Will need to be revisited someday.

Another fix for bug 20056.
This commit is contained in:
Brian Paul 2009-02-11 09:12:34 -07:00
parent 234f03e90a
commit 2b4f0216bf
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/mesa/shader/shader_api.c
View File

@ -1603,27 +1603,36 @@ set_program_uniform(GLcontext *ctx, struct gl_program *program,
if (param->Type == PROGRAM_SAMPLER) {
/* This controls which texture unit which is used by a sampler */
GLuint texUnit, sampler;
GLint i;
/* data type for setting samplers must be int */
if (type != GL_INT || count != 1) {
if (type != GL_INT) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"glUniform(only glUniform1i can be used "
"to set sampler uniforms)");
return;
}
sampler = (GLuint) program->Parameters->ParameterValues[index][0];
texUnit = ((GLuint *) values)[0];
/* XXX arrays of samplers haven't been tested much, but it's not a
* common thing...
*/
for (i = 0; i < count; i++) {
sampler = (GLuint) program->Parameters->ParameterValues[index + i][0];
texUnit = ((GLuint *) values)[i];
/* 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)");
return;
/* 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)");
return;
}
/* This maps a sampler to a texture unit: */
if (sampler < MAX_SAMPLERS) {
program->SamplerUnits[sampler] = texUnit;
}
}
/* This maps a sampler to a texture unit: */
program->SamplerUnits[sampler] = texUnit;
_mesa_update_shader_textures_used(program);
FLUSH_VERTICES(ctx, _NEW_TEXTURE);