[Mesa-dev] [PATCH 19/20] i965: Call insert and remove functions from exec_node directly.

[Matt Turner]

---
 src/mesa/drivers/dri/i965/brw_cfg.cpp        | 16 ++++++++--------
 src/mesa/drivers/dri/i965/brw_fs_visitor.cpp |  6 +++---
 src/mesa/drivers/dri/i965/brw_shader.h       |  3 ---
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_cfg.cpp b/src/mesa/drivers/dri/i965/brw_cfg.cpp
index 44e7744..17a7027 100644
--- a/src/mesa/drivers/dri/i965/brw_cfg.cpp
+++ b/src/mesa/drivers/dri/i965/brw_cfg.cpp
@@ -180,7 +180,7 @@ cfg_t::cfg_t(exec_list *instructions)
 
       switch (inst->opcode) {
       case BRW_OPCODE_IF:
-         inst->remove();
+         inst->exec_node::remove();
          cur->instructions.push_tail(inst);
 
 	 /* Push our information onto a stack so we can recover from
@@ -203,7 +203,7 @@ cfg_t::cfg_t(exec_list *instructions)
 	 break;
 
       case BRW_OPCODE_ELSE:
-         inst->remove();
+         inst->exec_node::remove();
          cur->instructions.push_tail(inst);
 
          cur_else = cur;
@@ -226,7 +226,7 @@ cfg_t::cfg_t(exec_list *instructions)
             set_next_block(&cur, cur_endif, ip - 1);
          }
 
-         inst->remove();
+         inst->exec_node::remove();
          cur->instructions.push_tail(inst);
 
          if (cur_else) {
@@ -277,12 +277,12 @@ cfg_t::cfg_t(exec_list *instructions)
             set_next_block(&cur, cur_do, ip - 1);
          }
 
-         inst->remove();
+         inst->exec_node::remove();
          cur->instructions.push_tail(inst);
 	 break;
 
       case BRW_OPCODE_CONTINUE:
-         inst->remove();
+         inst->exec_node::remove();
          cur->instructions.push_tail(inst);
 
 	 cur->add_successor(mem_ctx, cur_do);
@@ -295,7 +295,7 @@ cfg_t::cfg_t(exec_list *instructions)
 	 break;
 
       case BRW_OPCODE_BREAK:
-         inst->remove();
+         inst->exec_node::remove();
          cur->instructions.push_tail(inst);
 
 	 cur->add_successor(mem_ctx, cur_while);
@@ -308,7 +308,7 @@ cfg_t::cfg_t(exec_list *instructions)
 	 break;
 
       case BRW_OPCODE_WHILE:
-         inst->remove();
+         inst->exec_node::remove();
          cur->instructions.push_tail(inst);
 
 	 cur->add_successor(mem_ctx, cur_do);
@@ -320,7 +320,7 @@ cfg_t::cfg_t(exec_list *instructions)
 	 break;
 
       default:
-         inst->remove();
+         inst->exec_node::remove();
          cur->instructions.push_tail(inst);
 	 break;
       }
diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
index 2fa90a4..dcc5c1f 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
@@ -2462,8 +2462,8 @@ fs_visitor::try_replace_with_sel()
 
       /* Remove the matched instructions; we'll emit a SEL to replace them. */
       while (!if_inst->next->is_tail_sentinel())
-         if_inst->next->remove();
-      if_inst->remove();
+         if_inst->next->exec_node::remove();
+      if_inst->exec_node::remove();
 
       /* Only the last source register can be a constant, so if the MOV in
        * the "then" clause uses a constant, we need to put it in a temporary.
@@ -2762,7 +2762,7 @@ void
 fs_visitor::emit(exec_list list)
 {
    foreach_in_list_safe(fs_inst, inst, &list) {
-      inst->remove();
+      inst->exec_node::remove();
       emit(inst);
    }
 }
diff --git a/src/mesa/drivers/dri/i965/brw_shader.h b/src/mesa/drivers/dri/i965/brw_shader.h
index 35a2b96..f0d4f85 100644
--- a/src/mesa/drivers/dri/i965/brw_shader.h
+++ b/src/mesa/drivers/dri/i965/brw_shader.h
@@ -90,11 +90,8 @@ struct backend_instruction : public exec_node {
    bool reads_accumulator_implicitly() const;
    bool writes_accumulator_implicitly(struct brw_context *brw) const;
 
-   using exec_node::remove;
    void remove(bblock_t *block);
-   using exec_node::insert_after;
    void insert_after(bblock_t *block, backend_instruction *inst);
-   using exec_node::insert_before;
    void insert_before(bblock_t *block, backend_instruction *inst);
    void insert_before(bblock_t *block, exec_list *list);
 
-- 
1.8.5.5