From b8cd8a75452b76db5a0b0e7cb70b1f6149255a18 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Thu, 31 Aug 2017 13:12:44 -0700 Subject: [PATCH] i965: Inline emit_reloc in __genx_combine_address One less layer of baklava. Reviewed-by: Jason Ekstrand --- src/mesa/drivers/dri/i965/genX_state_upload.c | 17 +++++------------ 1 file 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); } } -- 2.30.2