From: Matt Turner <mattst88@gmail.com>
Date: Sat, 3 Oct 2015 03:23:35 +0000 (-0700)
Subject: i965/fs: Use backend_instruction in predicated break peephole.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4098a756b5590a460bdb0ee7d54cca81375f61e8;p=mesa.git

i965/fs: Use backend_instruction in predicated break peephole.

We're not using any fs_inst fields, and the next commit will make the
peephole used by the vec4 backend.

Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
---

diff --git a/src/mesa/drivers/dri/i965/brw_fs_peephole_predicated_break.cpp b/src/mesa/drivers/dri/i965/brw_fs_peephole_predicated_break.cpp
index 8f7bd83ec70..29f21680655 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_peephole_predicated_break.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_peephole_predicated_break.cpp
@@ -66,16 +66,16 @@ fs_visitor::opt_peephole_predicated_break()
       /* BREAK and CONTINUE instructions, by definition, can only be found at
        * the ends of basic blocks.
        */
-      fs_inst *jump_inst = (fs_inst *)block->end();
+      backend_instruction *jump_inst = block->end();
       if (jump_inst->opcode != BRW_OPCODE_BREAK &&
           jump_inst->opcode != BRW_OPCODE_CONTINUE)
          continue;
 
-      fs_inst *if_inst = (fs_inst *)block->prev()->end();
+      backend_instruction *if_inst = block->prev()->end();
       if (if_inst->opcode != BRW_OPCODE_IF)
          continue;
 
-      fs_inst *endif_inst = (fs_inst *)block->next()->start();
+      backend_instruction *endif_inst = block->next()->start();
       if (endif_inst->opcode != BRW_OPCODE_ENDIF)
          continue;
 
@@ -120,7 +120,7 @@ fs_visitor::opt_peephole_predicated_break()
        * the two basic blocks.
        */
       bblock_t *while_block = earlier_block->next();
-      fs_inst *while_inst = (fs_inst *)while_block->start();
+      backend_instruction *while_inst = while_block->start();
 
       if (jump_inst->opcode == BRW_OPCODE_BREAK &&
           while_inst->opcode == BRW_OPCODE_WHILE &&