From 2e7622a48714934411c84cdd8b6576b2b8ce311d Mon Sep 17 00:00:00 2001 From: Francisco Jerez Date: Thu, 19 Mar 2015 15:30:06 +0200 Subject: [PATCH] i965/vec4: Trivial copy propagate clean-up. Fix typo and punctuation in a comment, break long line and add space before curly bracket. Reviewed-by: Abdiel Janulgue --- src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp b/src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp index 478ae09..a603dd6 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp @@ -338,8 +338,8 @@ try_copy_propagate(struct brw_context *brw, vec4_instruction *inst, if (dst_saturate_mask != inst->dst.writemask) return false; - /* Limit saturate propagation only to SEL with src1 bounded within 1.0 - * and 1.0 otherwise, skip copy propagate altogether + /* Limit saturate propagation only to SEL with src1 bounded within 0.0 + * and 1.0, otherwise skip copy propagate altogether. */ switch(inst->opcode) { case BRW_OPCODE_SEL: @@ -451,8 +451,9 @@ vec4_visitor::opt_copy_propagation(bool do_constant_prop) for (int i = 0; i < 4; i++) { if (inst->dst.writemask & (1 << i)) { entries[reg].value[i] = direct_copy ? &inst->src[0] : NULL; - entries[reg].saturatemask |= (((inst->saturate && direct_copy) ? 1 : 0) << i); - } + entries[reg].saturatemask |= + inst->saturate && direct_copy ? 1 << i : 0; + } } /* Clear the records for any registers whose current value came from @@ -463,7 +464,7 @@ vec4_visitor::opt_copy_propagation(bool do_constant_prop) else { for (unsigned i = 0; i < alloc.total_size; i++) { for (int j = 0; j < 4; j++) { - if (is_channel_updated(inst, entries[i].value, j)){ + if (is_channel_updated(inst, entries[i].value, j)) { entries[i].value[j] = NULL; entries[i].saturatemask &= ~(1 << j); } -- 2.7.4