summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2011-03-11 13:23:13 -0800
committerEric Anholt <eric@anholt.net>2011-03-15 09:49:01 -0700
commit2b13e135942ea7ebe1426a1809bf0efb7891387d (patch)
treeea610d53b5042d441bf15e8dce67eec38514dc20
parent05cf1ad82eb903eb07d7b379d0ea610bb43dd84a (diff)
glsl: Skip processing of expression trees in discard simplification.
It only cares about "if", "loop", and "discard".
-rw-r--r--src/glsl/opt_discard_simplification.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/glsl/opt_discard_simplification.cpp b/src/glsl/opt_discard_simplification.cpp
index 0e577c478a..7c2928d271 100644
--- a/src/glsl/opt_discard_simplification.cpp
+++ b/src/glsl/opt_discard_simplification.cpp
@@ -95,6 +95,7 @@ public:
ir_visitor_status visit_enter(ir_if *);
ir_visitor_status visit_enter(ir_loop *);
+ ir_visitor_status visit_enter(ir_assignment *);
bool progress;
};
@@ -117,6 +118,15 @@ is_only_instruction(ir_discard *discard)
discard->next->is_tail_sentinel());
}
+/* We only care about the top level instructions, so don't descend
+ * into expressions.
+ */
+ir_visitor_status
+discard_simplifier::visit_enter(ir_assignment *ir)
+{
+ return visit_continue_with_parent;
+}
+
ir_visitor_status
discard_simplifier::visit_enter(ir_if *ir)
{