summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2017-08-31 13:12:44 -0700
committerKenneth Graunke <[email protected]>2017-09-02 12:56:18 -0700
commitb8cd8a75452b76db5a0b0e7cb70b1f6149255a18 (patch)
tree196f4bb58dc2ccbe08af2208465d56d194ad664d
parent52b65dfda84e4d433a332dd84596eef054eb5cbb (diff)
i965: Inline emit_reloc in __genx_combine_address
One less layer of baklava. Reviewed-by: Jason Ekstrand <[email protected]>
-rw-r--r--src/mesa/drivers/dri/i965/genX_state_upload.c17
1 files changed, 5 insertions, 12 deletions
diff --git a/src/mesa/drivers/dri/i965/genX_state_upload.c b/src/mesa/drivers/dri/i965/genX_state_upload.c
index b15829fb57c..4eb1a79bcd4 100644
--- a/src/mesa/drivers/dri/i965/genX_state_upload.c
+++ b/src/mesa/drivers/dri/i965/genX_state_upload.c
@@ -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);
}
}