Mesa (master): i965: Gen6 no longer has the IFF instruction; always use IF.

[Eric Anholt]

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

Author: Eric Anholt <eric at anholt.net>
Date:   Mon Oct  4 15:09:18 2010 -0700

i965: Gen6 no longer has the IFF instruction; always use IF.

---

 src/mesa/drivers/dri/i965/brw_eu_emit.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_eu_emit.c b/src/mesa/drivers/dri/i965/brw_eu_emit.c
index 5954135..fbc6894 100644
--- a/src/mesa/drivers/dri/i965/brw_eu_emit.c
+++ b/src/mesa/drivers/dri/i965/brw_eu_emit.c
@@ -899,9 +899,11 @@ void brw_ENDIF(struct brw_compile *p,
        * instruction respectively.
        */
       if (patch_insn->header.opcode == BRW_OPCODE_IF) {
-	 /* Automagically turn it into an IFF:
-	  */
-	 patch_insn->header.opcode = BRW_OPCODE_IFF;
+	 if (intel->gen < 6) {
+	    /* Automagically turn it into an IFF:
+	     */
+	    patch_insn->header.opcode = BRW_OPCODE_IFF;
+	 }
 	 patch_insn->bits3.if_else.jump_count = br * (insn - patch_insn + 1);
 	 patch_insn->bits3.if_else.pop_count = 0;
 	 patch_insn->bits3.if_else.pad0 = 0;