summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2010-10-04 15:09:18 -0700
committerEric Anholt <[email protected]>2010-10-06 10:09:45 -0700
commitf7cb28fad9855020e9fbd1481df03bb09346d4be (patch)
tree34fb114907f9fa7a0ca3d8f915b67ac6d7c30958 /src/mesa
parent3c97c00e3810d31c3aa26173eb9fdef91b3e7c87 (diff)
i965: Gen6 no longer has the IFF instruction; always use IF.
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/i965/brw_eu_emit.c8
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 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;