From: Matt Turner <mattst88@gmail.com>
Date: Wed, 3 Sep 2014 00:53:04 +0000 (-0700)
Subject: i965: Call insert and remove functions from exec_node directly.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=444fc0b4a837a669c585f52b1d814300cfc9c999;p=mesa.git

i965: Call insert and remove functions from exec_node directly.

Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
---

diff --git a/src/mesa/drivers/dri/i965/brw_cfg.cpp b/src/mesa/drivers/dri/i965/brw_cfg.cpp
index ac6f5e0e801..bb49a0ae955 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 d32aa1f5e38..4f7f69a6ec7 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
@@ -2524,8 +2524,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.
@@ -2828,7 +2828,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 35a2b9635a3..f0d4f857cf1 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);