Module: Mesa
Branch: master
Commit: aa9f06b3ea99b318469c3d140651f4b4986896a6
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=aa9f06b3ea99b318469c3d140651f4b4986896a6
Author: Timothy Arceri <t_arc...@yahoo.com.au>
Date: Sun Oct 18 09:12:40 2015 +1100
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 <mar...@selfnet.de>
Reviewed-by: Samuel Iglesias Gonsálvez <sigles...@igalia.com>
---
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 e818c04..57a242b 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;
}
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
