diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2008-08-25 09:20:00 -0600 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2008-08-25 09:20:00 -0600 |
| commit | 2d5087bf74f2d0e58037847058a123fe9d142038 (patch) | |
| tree | 5e7069b458ac130267908f7e24ef66d2a25aa1d9 /src/mesa/shader/slang/slang_link.c | |
| parent | d6df735f1c22c64c17103dd92fffd7b658a46cda (diff) | |
| download | external_mesa3d-2d5087bf74f2d0e58037847058a123fe9d142038.zip external_mesa3d-2d5087bf74f2d0e58037847058a123fe9d142038.tar.gz external_mesa3d-2d5087bf74f2d0e58037847058a123fe9d142038.tar.bz2 | |
mesa: glsl: grab latest fixes from gallium-0.1 branch
Includes:
1. Fixes failed asserting about bad swizzles in src reg emit.
2. Tracks uniform var usage.
3. Emit exp() in terms of EXP2 instruction.
Diffstat (limited to 'src/mesa/shader/slang/slang_link.c')
| -rw-r--r-- | src/mesa/shader/slang/slang_link.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c index e33272e..57dbfc2 100644 --- a/src/mesa/shader/slang/slang_link.c +++ b/src/mesa/shader/slang/slang_link.c @@ -173,7 +173,7 @@ link_uniform_vars(struct gl_shader_program *shProg, * Furthermore, we'll need to fix the state-var's size/datatype info. */ - if (p->Type == PROGRAM_UNIFORM || + if ((p->Type == PROGRAM_UNIFORM && p->Used) || p->Type == PROGRAM_SAMPLER) { _mesa_append_uniform(shProg->Uniforms, p->Name, prog->Target, i); } |