From: Ian Romanick Date: Thu, 8 Oct 2015 18:13:00 +0000 (-0700) Subject: ff_fragment_shader: Use binding to set the sampler unit X-Git-Tag: upstream/17.1.0~15427 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8acce5d53af44a3d1d05a26e69559fd35f835de4;p=platform%2Fupstream%2Fmesa.git ff_fragment_shader: Use binding to set the sampler unit This is the way layout(binding=xxx) works from GLSL. The old method just happened to work (and significantly predated support for layout(binding=xxx)), but future changes will break this. v2: Remove some stale comments. Suggested by Matt and Chris Forbes. Signed-off-by: Ian Romanick Reviewed-by: Matt Turner Cc: "10.6 11.0" --- diff --git a/src/mesa/main/ff_fragment_shader.cpp b/src/mesa/main/ff_fragment_shader.cpp index e4e2a18..aad7266 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);