From 3c4c2a6e300fccbbec89f149e05ff086d6774319 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Thu, 17 Jul 2014 11:14:02 -0700 Subject: [PATCH] i965/fs: Rename variable in predicated break pass. Reviewed-by: Topi Pohjolainen --- .../dri/i965/brw_fs_peephole_predicated_break.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) 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 fe3812d5912..445d10e9b7d 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 @@ -51,15 +51,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 *inst = (fs_inst *) block->end; - if (inst->opcode != BRW_OPCODE_BREAK && inst->opcode != BRW_OPCODE_CONTINUE) + fs_inst *jump_inst = (fs_inst *)block->end; + if (jump_inst->opcode != BRW_OPCODE_BREAK && + jump_inst->opcode != BRW_OPCODE_CONTINUE) continue; - fs_inst *if_inst = (fs_inst *) inst->prev; + fs_inst *if_inst = (fs_inst *)jump_inst->prev; if (if_inst->opcode != BRW_OPCODE_IF) continue; - fs_inst *endif_inst = (fs_inst *) inst->next; + fs_inst *endif_inst = (fs_inst *)jump_inst->next; if (endif_inst->opcode != BRW_OPCODE_ENDIF) continue; @@ -70,10 +71,10 @@ fs_visitor::opt_peephole_predicated_break() fs_inst *cmp_inst = CMP(reg_null_d, if_inst->src[0], if_inst->src[1], if_inst->conditional_mod); if_inst->insert_before(cmp_inst); - inst->predicate = BRW_PREDICATE_NORMAL; + jump_inst->predicate = BRW_PREDICATE_NORMAL; } else { - inst->predicate = if_inst->predicate; - inst->predicate_inverse = if_inst->predicate_inverse; + jump_inst->predicate = if_inst->predicate; + jump_inst->predicate_inverse = if_inst->predicate_inverse; } if_inst->remove();