From: Eric Anholt <eric@anholt.net>
Date: Mon, 4 Oct 2010 22:09:18 +0000 (-0700)
Subject: i965: Gen6 no longer has the IFF instruction; always use IF.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f7cb28fad9855020e9fbd1481df03bb09346d4be;p=mesa.git

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 59541353214..fbc6894d054 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;