X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fglsl%2Fir_basic_block.cpp;h=15481aa47f6f1319d630d62d00ad5e4effd37833;hb=0abfb80dacf80c1f2d0a6a4142b9ab84695aa9e7;hp=2cbc682d46cac948bb59c5876088b85c9d9bdd11;hpb=5bb90cfceb6d6eaed88d4ffa0c5d953d8609e98c;p=mesa.git

diff --git a/src/glsl/ir_basic_block.cpp b/src/glsl/ir_basic_block.cpp
index 2cbc682d46c..15481aa47f6 100644
--- a/src/glsl/ir_basic_block.cpp
+++ b/src/glsl/ir_basic_block.cpp
@@ -28,9 +28,7 @@
  */
 
 #include "ir.h"
-#include "ir_visitor.h"
 #include "ir_basic_block.h"
-#include "glsl_types.h"
 
 /**
  * Calls a user function for every basic block in the instruction stream.
@@ -58,8 +56,7 @@ void call_for_basic_blocks(exec_list *instructions,
    ir_instruction *leader = NULL;
    ir_instruction *last = NULL;
 
-   foreach_iter(exec_list_iterator, iter, *instructions) {
-      ir_instruction *ir = (ir_instruction *)iter.get();
+   foreach_in_list(ir_instruction, ir, instructions) {
       ir_if *ir_if;
       ir_loop *ir_loop;
       ir_function *ir_function;
@@ -90,11 +87,7 @@ void call_for_basic_blocks(exec_list *instructions,
 	  * and the body of main().  Perhaps those instructions ought
 	  * to live inside of main().
 	  */
-	 foreach_iter(exec_list_iterator, fun_iter, *ir_function) {
-	    ir_function_signature *ir_sig;
-
-	    ir_sig = (ir_function_signature *)fun_iter.get();
-
+	 foreach_in_list(ir_function_signature, ir_sig, &ir_function->signatures) {
 	    call_for_basic_blocks(&ir_sig->body, callback, data);
 	 }
       }