radeonsi: remove unused parameter from si_shader_binary_read_config
authorMarek Olšák <marek.olsak@amd.com>
Mon, 28 Dec 2015 00:39:20 +0000 (01:39 +0100)
committerMarek Olšák <marek.olsak@amd.com>
Sun, 3 Jan 2016 21:41:16 +0000 (22:41 +0100)
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
src/gallium/drivers/radeonsi/si_compute.c
src/gallium/drivers/radeonsi/si_shader.c
src/gallium/drivers/radeonsi/si_shader.h

index 3d10e0e..1c4d6b3 100644 (file)
@@ -67,8 +67,7 @@ static void init_scratch_buffer(struct si_context *sctx, struct si_compute *prog
                                program->shader.binary.global_symbol_offsets[i];
                unsigned scratch_bytes_needed;
 
-               si_shader_binary_read_config(sctx->screen,
-                                               &program->shader, offset);
+               si_shader_binary_read_config(&program->shader, offset);
                scratch_bytes_needed = program->shader.scratch_bytes_per_wave;
                scratch_bytes = MAX2(scratch_bytes, scratch_bytes_needed);
        }
@@ -261,7 +260,7 @@ static void si_launch_grid(
 
 #if HAVE_LLVM >= 0x0306
        /* Read the config information */
-       si_shader_binary_read_config(sctx->screen, shader, pc);
+       si_shader_binary_read_config(shader, pc);
 #endif
 
        /* Upload the kernel arguments */
index c7e38b4..426f40f 100644 (file)
@@ -3741,9 +3741,8 @@ static void preload_ring_buffers(struct si_shader_context *si_shader_ctx)
        }
 }
 
-void si_shader_binary_read_config(const struct si_screen *sscreen,
-                               struct si_shader *shader,
-                               unsigned symbol_offset)
+void si_shader_binary_read_config(struct si_shader *shader,
+                                 unsigned symbol_offset)
 {
        unsigned i;
        const unsigned char *config =
@@ -3892,7 +3891,7 @@ void si_shader_binary_read(struct si_screen *sscreen, struct si_shader *shader,
 {
        const struct radeon_shader_binary *binary = &shader->binary;
 
-       si_shader_binary_read_config(sscreen, shader, 0);
+       si_shader_binary_read_config(shader, 0);
 
        if (r600_can_dump_shader(&sscreen->b, processor)) {
                if (!(sscreen->b.debug_flags & DBG_NO_ASM))
index 882f698..d377a2a 100644 (file)
@@ -341,8 +341,7 @@ void 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);
-void si_shader_binary_read_config(const struct si_screen *sscreen,
-                               struct si_shader *shader,
-                               unsigned symbol_offset);
+void si_shader_binary_read_config(struct si_shader *shader,
+                                 unsigned symbol_offset);
 
 #endif