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.

diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index 65f3697d3547a62fdabe6cee0a36baaeef8b0984..10fd2d5ab9371e4b13ace77bedb398c89840f65d 100644 (file)
--- 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);