From 6d47c3eb4e54c58314c2e2a1ce3a478151485bea Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Fri, 24 Jun 2016 15:37:35 -0700 Subject: [PATCH] glsl: Ignore ir_texture in lower_const_arrays_to_uniforms. The only part of an ir_texture which can be an array is the offsets array in textureGatherOffsets() calls. We don't want to lower those, because they're required to remain constants. Fixes textureGatherOffsets with Gallium drivers such as llvmpipe, which commit ef78df8d3b0cf540e5f08c8c2f6caa338b64a6c7 regressed. Cc: mesa-stable@lists.freedesktop.org Signed-off-by: Kenneth Graunke Reviewed-by: Ilia Mirkin (cherry picked from commit a36a73a7b8a058c037cb0307b57ac97292953c58) --- src/compiler/glsl/lower_const_arrays_to_uniforms.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/compiler/glsl/lower_const_arrays_to_uniforms.cpp b/src/compiler/glsl/lower_const_arrays_to_uniforms.cpp index 99481505e0e..665a9ad1d48 100644 --- a/src/compiler/glsl/lower_const_arrays_to_uniforms.cpp +++ b/src/compiler/glsl/lower_const_arrays_to_uniforms.cpp @@ -57,6 +57,7 @@ public: return progress; } + ir_visitor_status visit_enter(ir_texture *); void handle_rvalue(ir_rvalue **rvalue); private: @@ -64,6 +65,12 @@ private: bool progress; }; +ir_visitor_status +lower_const_array_visitor::visit_enter(ir_texture *) +{ + return visit_continue_with_parent; +} + void lower_const_array_visitor::handle_rvalue(ir_rvalue **rvalue) { -- 2.11.0