Mesa (master): i965: Reverse condition ordering to let us support other gens.

[Matt Turner]

Module: Mesa
Branch: master
Commit: 23ab55cb6c7936fd2c3d017bb9b5f5f7e5b19a06
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=23ab55cb6c7936fd2c3d017bb9b5f5f7e5b19a06

Author: Matt Turner <mattst88 at gmail.com>
Date:   Fri Jun 13 19:38:51 2014 -0700

i965: Reverse condition ordering to let us support other gens.

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/mesa/drivers/dri/i965/brw_eu_compact.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_eu_compact.c b/src/mesa/drivers/dri/i965/brw_eu_compact.c
index 625cfbb..25a96e7 100644
--- a/src/mesa/drivers/dri/i965/brw_eu_compact.c
+++ b/src/mesa/drivers/dri/i965/brw_eu_compact.c
@@ -789,14 +789,14 @@ brw_compact_instructions(struct brw_compile *p, int start_offset,
       case BRW_OPCODE_ELSE:
       case BRW_OPCODE_ENDIF:
       case BRW_OPCODE_WHILE:
-         if (brw->gen == 6) {
+         if (brw->gen >= 7) {
+            update_uip_jip(brw, insn, this_old_ip, compacted_counts);
+         } else if (brw->gen == 6) {
             int gen6_jump_count = brw_inst_gen6_jump_count(brw, insn);
             target_old_ip = this_old_ip + gen6_jump_count;
             target_compacted_count = compacted_counts[target_old_ip];
             gen6_jump_count -= (target_compacted_count - this_compacted_count);
             brw_inst_set_gen6_jump_count(brw, insn, gen6_jump_count);
-         } else {
-            update_uip_jip(brw, insn, this_old_ip, compacted_counts);
          }
          break;
       }