i965: Pass brw into next_offset().

The new brw_inst API is going to require a brw pointer in order
to access fields (so it can do generation checks).  Plumb it in now.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Matt Turner <mattst88@gmail.com>

diff --git a/src/mesa/drivers/dri/i965/brw_eu.h b/src/mesa/drivers/dri/i965/brw_eu.h
index a610f2da9a90b907da4afacf268bc91b20f9a0d9..a958fef6a05a48ea4301ee974916b6de68f62f9f 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_eu.h
+++ b/src/mesa/drivers/dri/i965/brw_eu.h
@@ -427,7 +427,7 @@ void brw_debug_compact_uncompact(struct brw_context *brw,
                                 struct brw_instruction *uncompacted);
 
 static inline int
-next_offset(void *store, int offset)
+next_offset(const struct brw_context *brw, void *store, int offset)
 {
    struct brw_instruction *insn =
       (struct brw_instruction *)((char *)store + offset);

diff --git a/src/mesa/drivers/dri/i965/brw_eu_compact.c b/src/mesa/drivers/dri/i965/brw_eu_compact.c
index 05603670a059799814642c57588dc834370e5219..0ae3f2d247b3030deccce3129fecc78a55326fbe 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_eu_compact.c
+++ b/src/mesa/drivers/dri/i965/brw_eu_compact.c
@@ -808,7 +808,7 @@ brw_compact_instructions(struct brw_compile *p, int start_offset,
          break;
       }
 
-      offset = next_offset(store, offset);
+      offset = next_offset(brw, store, offset);
    }
 
    /* p->nr_insn is counting the number of uncompacted instructions still, so
@@ -831,12 +831,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);
-            offset = next_offset(store, offset);
+            offset = next_offset(brw, store, offset);
          }
 
          annotation[i].offset = start_offset + offset;
 
-         offset = next_offset(store, offset);
+         offset = next_offset(brw, store, offset);
       }
 
       annotation[num_annotations].offset = p->next_insn_offset;

diff --git a/src/mesa/drivers/dri/i965/brw_eu_emit.c b/src/mesa/drivers/dri/i965/brw_eu_emit.c
index c566aec39c47c73cd11589163d365357bd010420..ab61868bb7551be7c18e5bc08798b5f8f4ede252 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_eu_emit.c
+++ b/src/mesa/drivers/dri/i965/brw_eu_emit.c
@@ -2355,9 +2355,11 @@ brw_find_next_block_end(struct brw_compile *p, int start_offset)
 {
    int offset;
    void *store = p->store;
+   const struct brw_context *brw = p->brw;
 
-   for (offset = next_offset(store, start_offset); offset < p->next_insn_offset;
-        offset = next_offset(store, offset)) {
+   for (offset = next_offset(brw, store, start_offset);
+        offset < p->next_insn_offset;
+        offset = next_offset(brw, store, offset)) {
       struct brw_instruction *insn = store + offset;
 
       switch (insn->header.opcode) {
@@ -2387,8 +2389,9 @@ brw_find_loop_end(struct brw_compile *p, int start_offset)
    /* Always start after the instruction (such as a WHILE) we're trying to fix
     * up.
     */
-   for (offset = next_offset(store, start_offset); offset < p->next_insn_offset;
-        offset = next_offset(store, offset)) {
+   for (offset = next_offset(brw, store, start_offset);
+        offset < p->next_insn_offset;
+        offset = next_offset(brw, store, offset)) {
       struct brw_instruction *insn = store + offset;
 
       if (insn->header.opcode == BRW_OPCODE_WHILE) {
@@ -2417,7 +2420,7 @@ brw_set_uip_jip(struct brw_compile *p)
       return;
 
    for (offset = 0; offset < p->next_insn_offset;
-        offset = next_offset(store, offset)) {
+        offset = next_offset(brw, store, offset)) {
       struct brw_instruction *insn = store + offset;
 
       if (insn->header.cmpt_control) {