[Mesa-dev] [PATCH] glsl: fix SSBO regression

Timothy Arceri t_arceri at yahoo.com.au
Sat Oct 17 15:19:11 PDT 2015


Fixes regression cased by bb5aeb854915ba67abc56257f830d002c956439e

We don't care about the swizzle when building the name so just skip over it.
---

 New piglit test: http://patchwork.freedesktop.org/patch/62111/ 

 src/glsl/lower_ubo_reference.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/glsl/lower_ubo_reference.cpp b/src/glsl/lower_ubo_reference.cpp
index 1fbb09d..35469bf 100644
--- a/src/glsl/lower_ubo_reference.cpp
+++ b/src/glsl/lower_ubo_reference.cpp
@@ -238,6 +238,8 @@ interface_field_name(void *mem_ctx, char *base_name, ir_rvalue *d,
       case ir_type_swizzle: {
          ir_swizzle *s = (ir_swizzle *) ir;
          ir = s->val->as_dereference();
+         /* Skip swizzle in the next pass */
+         d = ir;
          break;
       }
 
-- 
2.4.3



More information about the mesa-dev mailing list