fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-27 04:00:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965: Pass brw into next_offset().

Browse source 
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>
This commit is contained in:
Kenneth Graunke 2014-06-07 21:15:59 -07:00
parent 890287b96b
commit 05040d6f8f
3 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/drivers/dri/i965/brw_eu.h
View file

@ -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);

6
src/mesa/drivers/dri/i965/brw_eu_compact.c
View file

@ -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;

13
src/mesa/drivers/dri/i965/brw_eu_emit.c
View file

@ -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) {