Mesa (master): i915g: Fix bug in shader optimizer.

Stephane Marchesin marcheu at kemper.freedesktop.org
Thu Sep 22 01:03:06 UTC 2011


Module: Mesa
Branch: master
Commit: 9a15b1eb95da138231994b6d05cf09c60ba1d842
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9a15b1eb95da138231994b6d05cf09c60ba1d842

Author: Stéphane Marchesin <marcheu at chromium.org>
Date:   Wed Sep 21 17:53:22 2011 -0700

i915g: Fix bug in shader optimizer.

---

 src/gallium/drivers/i915/i915_fpc_optimize.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/i915/i915_fpc_optimize.c b/src/gallium/drivers/i915/i915_fpc_optimize.c
index 2b739e9..654a8f8 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], &current->FullInstruction.Dst[0]) &&
         same_src_reg(&next->FullInstruction.Src[0], &current->FullInstruction.Src[1]) &&
         is_unswizzled(&current->FullInstruction.Src[0], current->FullInstruction.Dst[0].Register.WriteMask) &&
         is_unswizzled(&current->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], &current->FullInstruction.Dst[0]) &&
         same_src_reg(&next->FullInstruction.Src[0], &current->FullInstruction.Src[0]) &&
         is_unswizzled(&current->FullInstruction.Src[0], current->FullInstruction.Dst[0].Register.WriteMask) &&
         is_unswizzled(&current->FullInstruction.Src[1], current->FullInstruction.Dst[0].Register.WriteMask) &&




More information about the mesa-commit mailing list