summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorMatt Turner <[email protected]>2014-08-21 16:46:49 -0700
committerMatt Turner <[email protected]>2014-09-25 11:02:36 -0700
commit118021f929e9f8a378033b3c5711e087205a2877 (patch)
tree25c154f49c8b7f4c255bc8469d2e1c3a7bd83bc0 /src/mesa
parent45c3ece266857c2f0d5cef50e95507ffb30694ba (diff)
i965/compaction: Don't set UIP on ELSE on Gen < 8.
Reviewed-by: Kenneth Graunke <[email protected]> Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/i965/brw_eu_compact.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_eu_compact.c b/src/mesa/drivers/dri/i965/brw_eu_compact.c
index 8c30809f1d5..56179476b7c 100644
--- a/src/mesa/drivers/dri/i965/brw_eu_compact.c
+++ b/src/mesa/drivers/dri/i965/brw_eu_compact.c
@@ -1038,7 +1038,8 @@ update_uip_jip(struct brw_context *brw, brw_inst *insn,
brw_inst_set_jip(brw, insn, jip * scale);
if (brw_inst_opcode(brw, insn) == BRW_OPCODE_ENDIF ||
- brw_inst_opcode(brw, insn) == BRW_OPCODE_WHILE)
+ brw_inst_opcode(brw, insn) == BRW_OPCODE_WHILE ||
+ (brw_inst_opcode(brw, insn) == BRW_OPCODE_ELSE && brw->gen <= 7))
return;
int32_t uip = brw_inst_uip(brw, insn) / scale;