fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-04 20:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl2: Don't try to assign locations for samplers during linking.

Browse source 
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.
This commit is contained in:
Eric Anholt 2010-08-04 14:26:15 -07:00
parent fe1918c71c
commit b6ceddc371
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/glsl/linker.cpp
View file

@ -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);