Mesa (master): i965: Use next_offset() in instruction compaction code.

[Matt Turner]

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

Author: Matt Turner <mattst88 at gmail.com>
Date:   Sat May 17 13:03:59 2014 -0700

i965: Use next_offset() in instruction compaction code.

Reviewed-by: Eric Anholt <eric at anholt.net>

---

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

diff --git a/src/mesa/drivers/dri/i965/brw_eu_compact.c b/src/mesa/drivers/dri/i965/brw_eu_compact.c
index 40d1fc2..f6f055f 100644
--- a/src/mesa/drivers/dri/i965/brw_eu_compact.c
+++ b/src/mesa/drivers/dri/i965/brw_eu_compact.c
@@ -765,11 +765,7 @@ brw_compact_instructions(struct brw_compile *p, int start_offset,
          break;
       }
 
-      if (insn->header.cmpt_control) {
-         offset += 8;
-      } else {
-         offset += 16;
-      }
+      offset = next_offset(store, offset);
    }
 
    /* p->nr_insn is counting the number of uncompacted instructions still, so
@@ -792,22 +788,12 @@ brw_compact_instructions(struct brw_compile *p, int start_offset,
          while (start_offset + old_ip[offset / 8] * 8 != annotation[i].offset) {
             assert(start_offset + old_ip[offset / 8] * 8 <
                    annotation[i].offset);
-            struct brw_instruction *insn = store + offset;
-            if (insn->header.cmpt_control) {
-               offset += 8;
-            } else {
-               offset += 16;
-            }
+            offset = next_offset(store, offset);
          }
 
          annotation[i].offset = start_offset + offset;
 
-         struct brw_instruction *insn = store + offset;
-         if (insn->header.cmpt_control) {
-            offset += 8;
-         } else {
-            offset += 16;
-         }
+         offset = next_offset(store, offset);
       }
 
       annotation[num_annotations].offset = p->next_insn_offset;