radeonsi: remove unused parameters from si_shader_apply_scratch_relocs

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>

diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c
index 63f1ac92addfc7b6ccc9dda654b607b5b3e475a9..382e5a1cd89fa5c37434aac890d69cb3730c9591 100644 (file)
--- 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 ece9a74163fc4b6049bef1ec32853ce1268d1ad0..efdaef361fa3d2418ab4f16163045ef87c708b40 100644 (file)
--- 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 4a2c042778d8962f20a29b77f9e903a1c64e2f0d..61269bd2001a3f9daaff8da73a2741d5a6dec198 100644 (file)
--- 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 b80a3478cafb1747574cd616ddfc0b4006735075..7191e4100a18b71dd77023008ede488fa7ea1b40 100644 (file)
--- 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);