diff options
| author | Brian Paul <[email protected]> | 2009-01-02 16:32:26 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2009-01-02 16:32:26 -0700 |
| commit | 0815ebccfc0a12d8f3e831928f1c4210b7f75ad8 (patch) | |
| tree | 1e7db7e1d44e741215e5b4b11d33df91fe5b39a0 /src/mesa/shader/prog_parameter.c | |
| parent | eb9bbc5265562cb6f93688fc027ea76f91601e37 (diff) | |
| parent | 1fad6ccb756ae33ca3115f59c99ca8abbeb0321e (diff) | |
Merge commit 'origin/master' into gallium-0.2
Conflicts:
src/mesa/main/ffvertex_prog.c
src/mesa/main/texenvprogram.c
Diffstat (limited to 'src/mesa/shader/prog_parameter.c')
| -rw-r--r-- | src/mesa/shader/prog_parameter.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/shader/prog_parameter.c b/src/mesa/shader/prog_parameter.c index e6653157d46..8ae961241f6 100644 --- a/src/mesa/shader/prog_parameter.c +++ b/src/mesa/shader/prog_parameter.c @@ -290,7 +290,8 @@ _mesa_use_uniform(struct gl_program_parameter_list *paramList, GLuint i; for (i = 0; i < paramList->NumParameters; i++) { struct gl_program_parameter *p = paramList->Parameters + i; - if (p->Type == PROGRAM_UNIFORM && _mesa_strcmp(p->Name, name) == 0) { + if ((p->Type == PROGRAM_UNIFORM || p->Type == PROGRAM_SAMPLER) && + _mesa_strcmp(p->Name, name) == 0) { p->Used = GL_TRUE; /* Note that large uniforms may occupy several slots so we're * not done searching yet. |