diff options
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4_emit.cpp | 10 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp | 4 |
2 files changed, 5 insertions, 9 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp b/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp index 6b0ae42e0e0..fca31b6dec9 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp @@ -57,8 +57,8 @@ vec4_visitor::setup_attributes(int payload_reg) } } - foreach_iter(exec_list_iterator, iter, this->instructions) { - vec4_instruction *inst = (vec4_instruction *)iter.get(); + foreach_list(node, &this->instructions) { + vec4_instruction *inst = (vec4_instruction *)node; for (int i = 0; i < 3; i++) { if (inst->src[i].file != ATTR) @@ -546,11 +546,7 @@ vec4_visitor::run() /* Generate VS IR for main(). (the visitor only descends into * functions called "main"). */ - foreach_iter(exec_list_iterator, iter, *shader->ir) { - ir_instruction *ir = (ir_instruction *)iter.get(); - base_ir = ir; - ir->accept(this); - } + visit_instructions(shader->ir); emit_urb_writes(); diff --git a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp index ae733810757..fc75cc35172 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp @@ -234,8 +234,8 @@ vec4_visitor::emit_math(enum opcode opcode, void vec4_visitor::visit_instructions(const exec_list *list) { - foreach_iter(exec_list_iterator, iter, *list) { - ir_instruction *ir = (ir_instruction *)iter.get(); + foreach_list(node, list) { + ir_instruction *ir = (ir_instruction *)node; base_ir = ir; ir->accept(this); |