From: Stéphane Marchesin Date: Thu, 22 Sep 2011 00:53:22 +0000 (-0700) Subject: i915g: Fix bug in shader optimizer. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9a15b1eb95da138231994b6d05cf09c60ba1d842;p=mesa.git i915g: Fix bug in shader optimizer. --- diff --git a/src/gallium/drivers/i915/i915_fpc_optimize.c b/src/gallium/drivers/i915/i915_fpc_optimize.c index 2b739e9ccb8..654a8f81a09 100644 --- a/src/gallium/drivers/i915/i915_fpc_optimize.c +++ b/src/gallium/drivers/i915/i915_fpc_optimize.c @@ -130,7 +130,7 @@ static void i915_fpc_optimize_mov_after_alu(union i915_full_token* current, unio op_commutes(current->FullInstruction.Instruction.Opcode) && current->FullInstruction.Instruction.Saturate == next->FullInstruction.Instruction.Saturate && next->FullInstruction.Instruction.Opcode == TGSI_OPCODE_MOV && - same_dst_reg(&next->FullInstruction.Dst[0], &next->FullInstruction.Dst[0]) && + same_dst_reg(&next->FullInstruction.Dst[0], ¤t->FullInstruction.Dst[0]) && same_src_reg(&next->FullInstruction.Src[0], ¤t->FullInstruction.Src[1]) && is_unswizzled(¤t->FullInstruction.Src[0], current->FullInstruction.Dst[0].Register.WriteMask) && is_unswizzled(¤t->FullInstruction.Src[1], current->FullInstruction.Dst[0].Register.WriteMask) && @@ -153,7 +153,7 @@ static void i915_fpc_optimize_mov_after_alu(union i915_full_token* current, unio op_commutes(current->FullInstruction.Instruction.Opcode) && current->FullInstruction.Instruction.Saturate == next->FullInstruction.Instruction.Saturate && next->FullInstruction.Instruction.Opcode == TGSI_OPCODE_MOV && - same_dst_reg(&next->FullInstruction.Dst[0], &next->FullInstruction.Dst[0]) && + same_dst_reg(&next->FullInstruction.Dst[0], ¤t->FullInstruction.Dst[0]) && same_src_reg(&next->FullInstruction.Src[0], ¤t->FullInstruction.Src[0]) && is_unswizzled(¤t->FullInstruction.Src[0], current->FullInstruction.Dst[0].Register.WriteMask) && is_unswizzled(¤t->FullInstruction.Src[1], current->FullInstruction.Dst[0].Register.WriteMask) &&