From: Matt Turner <mattst88@gmail.com>
Date: Thu, 21 Aug 2014 23:46:49 +0000 (-0700)
Subject: i965/compaction: Don't set UIP on ELSE on Gen < 8.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=118021f929e9f8a378033b3c5711e087205a2877;p=mesa.git

i965/compaction: Don't set UIP on ELSE on Gen < 8.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
---

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;