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

diff --git a/src/mesa/drivers/dri/i965/brw_eu_emit.c b/src/mesa/drivers/dri/i965/brw_eu_emit.c
index 595413532142657bdc3bc439ba27eb2fd70699f9..fbc6894d05447c8a8d8e7709fc03ab08f182fefb 100644 (file)
--- 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;