diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2014-06-07 21:15:59 -0700 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2014-06-26 11:44:22 -0700 |
| commit | 05040d6f8fcfdc4fb070c7ff24d3990ffede77f1 (patch) | |
| tree | 6494b715120bf22ee7f12223e2f11c66c4ef64ef | |
| parent | 890287b96bfa2cae9bc3b477ab1eac2062f663ba (diff) | |
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>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_eu.h | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_eu_compact.c | 6 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_eu_emit.c | 13 |
3 files changed, 12 insertions, 9 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_eu.h b/src/mesa/drivers/dri/i965/brw_eu.h index a610f2da9a9..a958fef6a05 100644 --- 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 05603670a05..0ae3f2d247b 100644 --- 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 c566aec39c4..ab61868bb75 100644 --- 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) { |