From: Marek Olšák <marek.ol...@amd.com>

---
 src/gallium/drivers/radeonsi/si_compute.c | 5 ++---
 src/gallium/drivers/radeonsi/si_shader.c  | 7 +++----
 src/gallium/drivers/radeonsi/si_shader.h  | 5 ++---
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_compute.c 
b/src/gallium/drivers/radeonsi/si_compute.c
index 01a2450..6fffefb 100644
--- a/src/gallium/drivers/radeonsi/si_compute.c
+++ b/src/gallium/drivers/radeonsi/si_compute.c
@@ -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);
        }
@@ -262,7 +261,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 */
diff --git a/src/gallium/drivers/radeonsi/si_shader.c 
b/src/gallium/drivers/radeonsi/si_shader.c
index df0ff48..38e5bca 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -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 =
@@ -3846,7 +3845,7 @@ void si_shader_binary_read(struct si_screen *sscreen, 
struct si_shader *shader,
        const struct radeon_shader_binary *binary = &shader->binary;
        unsigned i;
 
-       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)) {
diff --git a/src/gallium/drivers/radeonsi/si_shader.h 
b/src/gallium/drivers/radeonsi/si_shader.h
index 3ed4b49..f422021 100644
--- a/src/gallium/drivers/radeonsi/si_shader.h
+++ b/src/gallium/drivers/radeonsi/si_shader.h
@@ -339,8 +339,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
-- 
2.1.4

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to