Module: Mesa
Branch: glsl2
Commit: c7a18da69022d3f9b05c21ff2473e8ea390f77f1
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=c7a18da69022d3f9b05c21ff2473e8ea390f77f1
Author: Kenneth Graunke <kenn...@whitecape.org>
Date: Mon Jul 19 21:44:03 2010 -0700
glsl2: Replace insert_before/remove pairs with exec_node::replace_with.
---
src/glsl/ast_function.cpp | 3 +--
src/glsl/ir_expression_flattening.cpp | 3 +--
src/glsl/ir_function_inlining.cpp | 3 +--
src/glsl/ir_if_return.cpp | 6 ++----
src/glsl/ir_vec_index_to_cond_assign.cpp | 3 +--
src/glsl/ir_vec_index_to_swizzle.cpp | 3 +--
6 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/src/glsl/ast_function.cpp b/src/glsl/ast_function.cpp
index 73af882..2348bdf 100644
--- a/src/glsl/ast_function.cpp
+++ b/src/glsl/ast_function.cpp
@@ -1081,8 +1081,7 @@ ast_function_expression::hir(exec_list *instructions,
all_parameters_are_constant = false;
if (result != ir) {
- ir->insert_before(result);
- ir->remove();
+ ir->replace_with(result);
}
}
diff --git a/src/glsl/ir_expression_flattening.cpp
b/src/glsl/ir_expression_flattening.cpp
index 6dbebc6..ccb2e2b 100644
--- a/src/glsl/ir_expression_flattening.cpp
+++ b/src/glsl/ir_expression_flattening.cpp
@@ -171,8 +171,7 @@ ir_expression_flattening_visitor::visit_enter(ir_call *ir)
ir_rvalue *new_ir = operand_to_temp(ir);
if (new_ir != ir) {
- ir->insert_before(new_ir);
- ir->remove();
+ ir->replace_with(new_ir);
}
}
diff --git a/src/glsl/ir_function_inlining.cpp
b/src/glsl/ir_function_inlining.cpp
index 05dd83f..c391f12 100644
--- a/src/glsl/ir_function_inlining.cpp
+++ b/src/glsl/ir_function_inlining.cpp
@@ -91,8 +91,7 @@ replace_return_with_assignment(ir_instruction *ir, void *data)
if (ret) {
if (ret->value) {
ir_rvalue *lhs = new(ctx) ir_dereference_variable(retval);
- ret->insert_before(new(ctx) ir_assignment(lhs, ret->value, NULL));
- ret->remove();
+ ret->replace_with(new(ctx) ir_assignment(lhs, ret->value, NULL));
} else {
/* un-valued return has to be the last return, or we shouldn't
* have reached here. (see can_inline()).
diff --git a/src/glsl/ir_if_return.cpp b/src/glsl/ir_if_return.cpp
index a9af716..bfb52e7 100644
--- a/src/glsl/ir_if_return.cpp
+++ b/src/glsl/ir_if_return.cpp
@@ -108,13 +108,11 @@ ir_if_return_visitor::visit_enter(ir_if *ir)
assign = new(ir) ir_assignment(new(ir) ir_dereference_variable(new_var),
then_return->value, NULL);
- then_return->insert_before(assign);
- then_return->remove();
+ then_return->replace_with(assign);
assign = new(ir) ir_assignment(new(ir) ir_dereference_variable(new_var),
else_return->value, NULL);
- else_return->insert_before(assign);
- else_return->remove();
+ else_return->replace_with(assign);
ir_dereference_variable *deref = new(ir)
ir_dereference_variable(new_var);
ir->insert_after(new(ir) ir_return(deref));
diff --git a/src/glsl/ir_vec_index_to_cond_assign.cpp
b/src/glsl/ir_vec_index_to_cond_assign.cpp
index 7e04389..dbc6f9a 100644
--- a/src/glsl/ir_vec_index_to_cond_assign.cpp
+++ b/src/glsl/ir_vec_index_to_cond_assign.cpp
@@ -218,8 +218,7 @@ ir_vec_index_to_cond_assign_visitor::visit_enter(ir_call
*ir)
ir_rvalue *new_param = convert_vec_index_to_cond_assign(param);
if (new_param != param) {
- param->insert_before(new_param);
- param->remove();
+ param->replace_with(new_param);
}
}
diff --git a/src/glsl/ir_vec_index_to_swizzle.cpp
b/src/glsl/ir_vec_index_to_swizzle.cpp
index abeb43c..1e170cb 100644
--- a/src/glsl/ir_vec_index_to_swizzle.cpp
+++ b/src/glsl/ir_vec_index_to_swizzle.cpp
@@ -121,8 +121,7 @@ ir_vec_index_to_swizzle_visitor::visit_enter(ir_call *ir)
ir_rvalue *new_param = convert_vec_index_to_swizzle(param);
if (new_param != param) {
- param->insert_before(new_param);
- param->remove();
+ param->replace_with(new_param);
}
}
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
