radeonsi: remove redundant parameter in si_shader_binary_read

Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>

diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c
index 89bef2e7afddea21577dc1e882bfc1cfa8fbab90..0361c99b549b47424b8ef49f466f2fcddc20e7d5 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_compute.c
+++ b/src/gallium/drivers/radeonsi/si_compute.c
@@ -144,7 +144,7 @@ static void *si_create_compute_state(
         * the shader code to the GPU.
         */
        init_scratch_buffer(sctx, program);
-       si_shader_binary_read(sctx->screen, &program->shader, &program->shader.binary);
+       si_shader_binary_read(sctx->screen, &program->shader);
 
 #endif
        program->input_buffer = si_resource_create_custom(sctx->b.b.screen,

diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index 75a29aeebc9d488cd0b0f18a0e36ae581dd47289..b988f6d2c1067da0aff2050ec7893da658ade113 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -2686,11 +2686,9 @@ void si_shader_apply_scratch_relocs(struct si_context *sctx,
        }
 }
 
-int si_shader_binary_read(struct si_screen *sscreen,
-                       struct si_shader *shader,
-                       const struct radeon_shader_binary *binary)
+int si_shader_binary_read(struct si_screen *sscreen, struct si_shader *shader)
 {
-
+       const struct radeon_shader_binary *binary = &shader->binary;
        unsigned i;
        unsigned code_size;
        unsigned char *ptr;
@@ -2750,7 +2748,7 @@ int si_compile_llvm(struct si_screen *sscreen, struct si_shader *shader,
        if (r) {
                return r;
        }
-       r = si_shader_binary_read(sscreen, shader, &shader->binary);
+       r = si_shader_binary_read(sscreen, shader);
 
        FREE(shader->binary.config);
        FREE(shader->binary.rodata);

diff --git a/src/gallium/drivers/radeonsi/si_shader.h b/src/gallium/drivers/radeonsi/si_shader.h
index 8d309b4eb37708b5b864525420e7d2a8ce73720f..1e8b52b8e58356308b44a3c41d2cf4f5654a5d77 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_shader.h
+++ b/src/gallium/drivers/radeonsi/si_shader.h
@@ -191,8 +191,7 @@ int si_compile_llvm(struct si_screen *sscreen, struct si_shader *shader,
                    LLVMTargetMachineRef tm, LLVMModuleRef mod);
 void si_shader_destroy(struct pipe_context *ctx, struct si_shader *shader);
 unsigned si_shader_io_get_unique_index(unsigned semantic_name, unsigned index);
-int si_shader_binary_read(struct si_screen *sscreen, struct si_shader *shader,
-               const struct radeon_shader_binary *binary);
+int si_shader_binary_read(struct si_screen *sscreen, struct si_shader *shader);
 void si_shader_apply_scratch_relocs(struct si_context *sctx,
                        struct si_shader *shader,
                        uint64_t scratch_va);