diff options
| author | Eric Anholt <[email protected]> | 2010-08-04 14:26:15 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2010-08-04 14:28:57 -0700 |
| commit | b6ceddc371d026dc30f2cc0f377bc0214e11d768 (patch) | |
| tree | 93936cb3e141a6d58b66262120155c2bd97dd14a | |
| parent | fe1918c71c3e387939cef9359d4b31ebc5c11a17 (diff) | |
glsl2: Don't try to assign locations for samplers during linking.
Mesa will do the mapping at _mesa_add_sampler() time. Fixes assertion
failures in debug builds, which might have caught real problems with
multiple samplers linked in a row.
| -rw-r--r-- | src/glsl/linker.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp index 65f3697d354..10fd2d5ab93 100644 --- a/src/glsl/linker.cpp +++ b/src/glsl/linker.cpp @@ -793,6 +793,9 @@ assign_uniform_locations(struct gl_shader_program *prog) if ((var == NULL) || (var->mode != ir_var_uniform)) continue; + if (var->type->is_sampler()) + continue; + const unsigned vec4_slots = (var->component_slots() + 3) / 4; assert(vec4_slots != 0); |