glsl: Add callback_leave to ir_hierarchical_visitor.

1 files changed, 23 insertions, 6 deletions

diff --git a/src/glsl/ir_hierarchical_visitor.h b/src/glsl/ir_hierarchical_visitor.h
index bc89a04..faa52fd 100644
--- a/src/glsl/ir_hierarchical_visitor.h
+++ b/src/glsl/ir_hierarchical_visitor.h
@@ -163,14 +163,29 @@ public:
     * \warning
     * Visitor classes derived from \c ir_hierarchical_visitor \b may \b not
     * invoke this function.  This can be used, for example, to cause the
-    * callback to be invoked on every node type execpt one.
+    * callback to be invoked on every node type except one.
     */
-   void (*callback)(class ir_instruction *ir, void *data);
+   void (*callback_enter)(class ir_instruction *ir, void *data);
 
    /**
-    * Extra data parameter passed to the per-node callback function
+    * Callback function that is invoked on exit of each node visited.
+    *
+    * \warning
+    * Visitor classes derived from \c ir_hierarchical_visitor \b may \b not
+    * invoke this function.  This can be used, for example, to cause the
+    * callback to be invoked on every node type except one.
+    */
+   void (*callback_leave)(class ir_instruction *ir, void *data);
+
+   /**
+    * Extra data parameter passed to the per-node callback_enter function
+    */
+   void *data_enter;
+
+   /**
+    * Extra data parameter passed to the per-node callback_leave function
     */
-   void *data;
+   void *data_leave;
 
    /**
     * Currently in the LHS of an assignment?
@@ -181,8 +196,10 @@ public:
 };
 
 void visit_tree(ir_instruction *ir,
-		void (*callback)(class ir_instruction *ir, void *data),
-		void *data);
+		void (*callback_enter)(class ir_instruction *ir, void *data),
+		void *data_enter,
+		void (*callback_leave)(class ir_instruction *ir, void *data) = NULL,
+		void *data_leave = NULL);
 
 ir_visitor_status visit_list_elements(ir_hierarchical_visitor *v, exec_list *l,
                                       bool statement_list = true);