X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fglsl%2Fir_hierarchical_visitor.cpp;h=b5eacd6d2d480e4cd21230d683156e311a0f74be;hb=7199b0b6811b3340cb5c531c8625220e964fa16c;hp=0d520b127f287500a7974a94668774bd46fa5677;hpb=bcc13b74443137043e8a34f8cb64a5add0d8af93;p=mesa.git

diff --git a/src/glsl/ir_hierarchical_visitor.cpp b/src/glsl/ir_hierarchical_visitor.cpp
index 0d520b127f2..b5eacd6d2d4 100644
--- a/src/glsl/ir_hierarchical_visitor.cpp
+++ b/src/glsl/ir_hierarchical_visitor.cpp
@@ -26,8 +26,10 @@
 
 ir_hierarchical_visitor::ir_hierarchical_visitor()
 {
+   this->base_ir = NULL;
    this->callback = NULL;
    this->data = NULL;
+   this->in_assignee = false;
 }
 
 ir_visitor_status
@@ -242,6 +244,22 @@ ir_hierarchical_visitor::visit_leave(ir_return *ir)
    return visit_continue;
 }
 
+ir_visitor_status
+ir_hierarchical_visitor::visit_enter(ir_discard *ir)
+{
+   if (this->callback != NULL)
+      this->callback(ir, this->data);
+
+   return visit_continue;
+}
+
+ir_visitor_status
+ir_hierarchical_visitor::visit_leave(ir_discard *ir)
+{
+   (void) ir;
+   return visit_continue;
+}
+
 ir_visitor_status
 ir_hierarchical_visitor::visit_enter(ir_if *ir)
 {
@@ -261,12 +279,7 @@ ir_hierarchical_visitor::visit_leave(ir_if *ir)
 void
 ir_hierarchical_visitor::run(exec_list *instructions)
 {
-   foreach_list(n, instructions) {
-      ir_instruction *ir = (ir_instruction *) n;
-
-      if (ir->accept(this) != visit_continue)
-	 break;
-   }
+   visit_list_elements(this, instructions);
 }