[Mesa-dev] [PATCH 19/20] i965/fs: Rename variable in predicated break pass.

[Pohjolainen, Topi]

On Thu, Jul 24, 2014 at 07:54:26PM -0700, Matt Turner wrote:
> ---
>  .../drivers/dri/i965/brw_fs_peephole_predicated_break.cpp | 15 ++++++++-------
>  1 file changed, 8 insertions(+), 7 deletions(-)

Reviewed-by: Topi Pohjolainen <topi.pohjolainen at 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 fe3812d..445d10e 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();
> -- 
> 1.8.5.5
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev