i965: Inline emit_reloc in __genx_combine_address

One less layer of baklava.

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Kenneth Graunke 2017-08-31 13:12:44 -07:00
parent 52b65dfda8
commit b8cd8a7545

View file

@ -75,17 +75,6 @@ struct brw_address {
uint32_t offset;
};
static uint64_t
emit_reloc(struct brw_context *brw,
void *location, struct brw_address address, uint32_t delta)
{
uint32_t offset = (char *) location - (char *) brw->batch.map;
return brw_emit_reloc(&brw->batch, offset, address.bo,
address.offset + delta,
address.reloc_flags);
}
#define __gen_address_type struct brw_address
#define __gen_user_data struct brw_context
@ -96,7 +85,11 @@ __gen_combine_address(struct brw_context *brw, void *location,
if (address.bo == NULL) {
return address.offset + delta;
} else {
return emit_reloc(brw, location, address, delta);
uint32_t offset = (char *) location - (char *) brw->batch.map;
return brw_emit_reloc(&brw->batch, offset, address.bo,
address.offset + delta,
address.reloc_flags);
}
}