From 4bd7f1d044eee17587d6523322303a61aeb8d660 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Sat, 22 Feb 2014 16:35:15 -0800 Subject: glsl: Don't vectorize horizontal expressions. Cc: "10.1" Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75224 --- src/glsl/opt_vectorize.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/glsl/opt_vectorize.cpp b/src/glsl/opt_vectorize.cpp index dba303d3131..13faac05ef1 100644 --- a/src/glsl/opt_vectorize.cpp +++ b/src/glsl/opt_vectorize.cpp @@ -83,6 +83,7 @@ public: virtual ir_visitor_status visit_enter(ir_assignment *); virtual ir_visitor_status visit_enter(ir_swizzle *); virtual ir_visitor_status visit_enter(ir_dereference_array *); + virtual ir_visitor_status visit_enter(ir_expression *); virtual ir_visitor_status visit_enter(ir_if *); virtual ir_visitor_status visit_enter(ir_loop *); @@ -303,6 +304,20 @@ ir_vectorize_visitor::visit_enter(ir_dereference_array *ir) return visit_continue_with_parent; } +/** + * Upon entering an ir_expression, remove the current assignment from further + * consideration if the expression operates horizontally on vectors. + */ +ir_visitor_status +ir_vectorize_visitor::visit_enter(ir_expression *ir) +{ + if (ir->is_horizontal()) { + this->current_assignment = NULL; + return visit_continue_with_parent; + } + return visit_continue; +} + /* Since there is no statement to visit between the "then" and "else" * instructions try to vectorize before, in between, and after them to avoid * combining statements from different basic blocks. -- cgit v1.2.3