<div dir="ltr"><div>The comment above this about the cast to int can probably go away? </div>- Chris </div><div class="gmail_extra"> <div class="gmail_quote">On Sat, Oct 10, 2015 at 2:52 PM, Ian Romanick <<a href="mailto:idr@freedesktop.org" target="_blank">idr@freedesktop.org</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From: Ian Romanick <<a href="mailto:ian.d.romanick@intel.com">ian.d.romanick@intel.com</a>> 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. Signed-off-by: Ian Romanick <<a href="mailto:ian.d.romanick@intel.com">ian.d.romanick@intel.com</a>> Cc: "10.6 11.0" <<a href="mailto:mesa-stable@lists.freedesktop.org">mesa-stable@lists.freedesktop.org</a>> --- src/mesa/main/ff_fragment_shader.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mesa/main/ff_fragment_shader.cpp b/src/mesa/main/ff_fragment_shader.cpp index e4e2a18..f5a4fa5 100644 --- a/src/mesa/main/ff_fragment_shader.cpp +++ b/src/mesa/main/ff_fragment_shader.cpp @@ -981,7 +981,8 @@ static void load_texture( texenv_fragment_program *p, GLuint unit ) * NOTE: The cast to int is important. Without it, the constant will have * type uint, and things later on may get confused. */ - 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); -- 2.1.0 _______________________________________________ mesa-stable mailing list <a href="mailto:mesa-stable@lists.freedesktop.org">mesa-stable@lists.freedesktop.org</a> <a href="http://lists.freedesktop.org/mailman/listinfo/mesa-stable" rel="noreferrer" target="_blank">http://lists.freedesktop.org/mailman/listinfo/mesa-stable</a> </blockquote></div> </div>