aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Arceri <[email protected]>2015-10-18 09:12:40 +1100
committerTimothy Arceri <[email protected]>2015-10-20 11:54:09 +1100
commitaa9f06b3ea99b318469c3d140651f4b4986896a6 (patch)
tree4e67cd81b79991cd17e22eb4f224333b39c17964
parent867284a8f07b69887f8adb109fb6c71156668227 (diff)
glsl: fix regression when building interface field name for SSBOs
Fixes regression cased by bb5aeb854915ba67abc56257f830d002c956439e We don't care about the swizzle when building the name so just skip over it. Tested-by: Markus Wick <[email protected]> Reviewed-by: Samuel Iglesias Gonsálvez <[email protected]>
-rw-r--r--src/glsl/lower_ubo_reference.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/glsl/lower_ubo_reference.cpp b/src/glsl/lower_ubo_reference.cpp
index e818c048461..57a242b4074 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;
}