From a47289f8fc5619bee66cb61a08cdeadcf084ad46 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Thu, 27 Apr 2017 19:00:56 +0200 Subject: [PATCH] radeonsi: remove unused parameters from si_shader_apply_scratch_relocs MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Nicolai Hähnle --- src/gallium/drivers/radeonsi/si_compute.c | 2 +- src/gallium/drivers/radeonsi/si_shader.c | 6 ++---- src/gallium/drivers/radeonsi/si_shader.h | 6 ++---- src/gallium/drivers/radeonsi/si_state_shaders.c | 2 +- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c index 63f1ac92add..382e5a1cd89 100644 --- a/src/gallium/drivers/radeonsi/si_compute.c +++ b/src/gallium/drivers/radeonsi/si_compute.c @@ -342,7 +342,7 @@ static bool si_setup_compute_scratch_buffer(struct si_context *sctx, if (sctx->compute_scratch_buffer != shader->scratch_bo && scratch_needed) { uint64_t scratch_va = sctx->compute_scratch_buffer->gpu_address; - si_shader_apply_scratch_relocs(sctx, shader, config, scratch_va); + si_shader_apply_scratch_relocs(shader, scratch_va); if (si_shader_binary_upload(sctx->screen, shader)) return false; diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index ece9a74163f..efdaef361fa 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -6492,10 +6492,8 @@ void si_shader_binary_read_config(struct ac_shader_binary *binary, conf->spi_ps_input_addr = conf->spi_ps_input_ena; } -void si_shader_apply_scratch_relocs(struct si_context *sctx, - struct si_shader *shader, - struct si_shader_config *config, - uint64_t scratch_va) +void si_shader_apply_scratch_relocs(struct si_shader *shader, + uint64_t scratch_va) { unsigned i; uint32_t scratch_rsrc_dword0 = scratch_va; diff --git a/src/gallium/drivers/radeonsi/si_shader.h b/src/gallium/drivers/radeonsi/si_shader.h index 4a2c042778d..61269bd2001 100644 --- a/src/gallium/drivers/radeonsi/si_shader.h +++ b/src/gallium/drivers/radeonsi/si_shader.h @@ -605,10 +605,8 @@ void si_shader_dump(struct si_screen *sscreen, struct si_shader *shader, FILE *f, bool check_debug_option); void si_multiwave_lds_size_workaround(struct si_screen *sscreen, unsigned *lds_size); -void si_shader_apply_scratch_relocs(struct si_context *sctx, - struct si_shader *shader, - struct si_shader_config *config, - uint64_t scratch_va); +void si_shader_apply_scratch_relocs(struct si_shader *shader, + uint64_t scratch_va); void si_shader_binary_read_config(struct ac_shader_binary *binary, struct si_shader_config *conf, unsigned symbol_offset); diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c index b80a3478caf..7191e4100a1 100644 --- a/src/gallium/drivers/radeonsi/si_state_shaders.c +++ b/src/gallium/drivers/radeonsi/si_state_shaders.c @@ -2611,7 +2611,7 @@ static int si_update_scratch_buffer(struct si_context *sctx, assert(sctx->scratch_buffer); - si_shader_apply_scratch_relocs(sctx, shader, &shader->config, scratch_va); + si_shader_apply_scratch_relocs(shader, scratch_va); /* Replace the shader bo with a new bo that has the relocs applied. */ r = si_shader_binary_upload(sctx->screen, shader); -- 2.30.2