[Mesa-dev] [PATCH 18/20] i965/fs: Pass block to insert and remove functions missed earlier.

Matt Turner mattst88 at gmail.com
Tue Sep 2 21:34:29 PDT 2014


---
 src/mesa/drivers/dri/i965/brw_fs.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index 8e328ea..255df18 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -2220,7 +2220,7 @@ fs_visitor::compute_to_mrf()
 	       scan_inst->dst.file = MRF;
 	       scan_inst->dst.reg = inst->dst.reg;
 	       scan_inst->saturate |= inst->saturate;
-	       inst->remove();
+	       inst->remove(block);
 	       progress = true;
 	    }
 	    break;
@@ -2372,9 +2372,9 @@ fs_visitor::try_rep_send()
          mov->dst.type = BRW_REGISTER_TYPE_F;
 
          /* Replace the four MOVs with the new vec4 MOV. */
-         start->insert_before(mov);
+         start->insert_before(block, mov);
          for (i = 0; i < 4; i++)
-            mov->next->remove();
+            ((fs_inst *)mov->next)->remove(block);
 
          /* Finally, adjust the message length and set the opcode to
           * REP_FB_WRITE for the send, so that the generator will use the
@@ -3136,7 +3136,7 @@ fs_visitor::opt_drop_redundant_mov_to_flags()
          if (!flag_mov_found[inst->flag_subreg])
             flag_mov_found[inst->flag_subreg] = true;
          else
-            inst->remove();
+            inst->remove(block);
       } else if (inst->writes_flag()) {
          flag_mov_found[inst->flag_subreg] = false;
       }
-- 
1.8.5.5



More information about the mesa-dev mailing list