From 52801766a00ba3b2a93e14d1ac80afd8980d15d8 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Mon, 8 Feb 2016 11:09:29 +1000 Subject: glsl/ir: add param index to variable. We have a requirement to store the index into the mesa parameterlist for uniforms. Up until now we've overwritten var->data.location with this info. However this then stops us accessing UniformStorage, which is needed to do proper dereferencing. Add a new variable to ir_variable to store this value in, and change the two uses to use it correctly. Reviewed-by: Timothy Arceri Signed-off-by: Dave Airlie --- src/compiler/glsl/ir.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/compiler') diff --git a/src/compiler/glsl/ir.h b/src/compiler/glsl/ir.h index 09e21b22188..bf9b7caffae 100644 --- a/src/compiler/glsl/ir.h +++ b/src/compiler/glsl/ir.h @@ -863,6 +863,14 @@ public: */ int location; + /** + * for glsl->tgsi/mesa IR we need to store the index into the + * parameters for uniforms, initially the code overloaded location + * but this causes problems with indirect samplers and AoA. + * This is assigned in _mesa_generate_parameters_list_for_uniforms. + */ + int param_index; + /** * Vertex stream output identifier. */ -- cgit v1.2.3