projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 45c3ece)
i965/compaction: Don't set UIP on ELSE on Gen < 8.
authorMatt Turner <mattst88@gmail.com>
Thu, 21 Aug 2014 23:46:49 +0000 (16:46 -0700)
committerMatt Turner <mattst88@gmail.com>
Thu, 25 Sep 2014 18:02:36 +0000 (11:02 -0700)
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
src/mesa/drivers/dri/i965/brw_eu_compact.c patch | blob | history

diff --git a/src/mesa/drivers/dri/i965/brw_eu_compact.c b/src/mesa/drivers/dri/i965/brw_eu_compact.c
index 8c30809f1d580a59af454c61b38df078e61bf82d..56179476b7c498efdbe408eaca9acbd232daa755 100644 (file)
--- 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;