summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/mesa/main/ff_fragment_shader.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/mesa/main/ff_fragment_shader.cpp b/src/mesa/main/ff_fragment_shader.cpp
index e4e2a18c1da..aad726689cc 100644
--- a/src/mesa/main/ff_fragment_shader.cpp
+++ b/src/mesa/main/ff_fragment_shader.cpp
@@ -975,13 +975,11 @@ static void load_texture( texenv_fragment_program *p, GLuint unit )
ir_var_uniform);
p->top_instructions->push_head(sampler);
- /* Set the texture unit for this sampler. The linker will pick this value
- * up and do-the-right-thing.
- *
- * NOTE: The cast to int is important. Without it, the constant will have
- * type uint, and things later on may get confused.
+ /* Set the texture unit for this sampler in the same way that
+ * layout(binding=X) would.
*/
- sampler->constant_value = new(p->mem_ctx) ir_constant(int(unit));
+ sampler->data.explicit_binding = true;
+ sampler->data.binding = unit;
deref = new(p->mem_ctx) ir_dereference_variable(sampler);
tex->set_sampler(deref, glsl_type::vec4_type);