[Mesa-dev] [PATCH 21/23] radeonsi: inline si_shader_binary_read

[Marek Olšák]

From: Marek Olšák <marek.olsak at amd.com>

---
 src/gallium/drivers/radeonsi/si_compute.c | 4 ++--
 src/gallium/drivers/radeonsi/si_shader.c  | 8 +-------
 src/gallium/drivers/radeonsi/si_shader.h  | 2 --
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c
index ffa941b..2380242 100644
--- a/src/gallium/drivers/radeonsi/si_compute.c
+++ b/src/gallium/drivers/radeonsi/si_compute.c
@@ -138,8 +138,8 @@ static void *si_create_compute_state(
 	 * the shader code to the GPU.
 	 */
 	init_scratch_buffer(sctx, program);
-	si_shader_binary_read(&program->shader.binary,
-			      &program->shader.config);
+	si_shader_binary_read_config(&program->shader.binary,
+				     &program->shader.config, 0);
 	si_shader_dump(sctx->screen, &program->shader.binary,
 		       &program->shader.config, &sctx->b.debug,
 		       TGSI_PROCESSOR_COMPUTE);
diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index 1f334af..fea5b14 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -3886,12 +3886,6 @@ void si_shader_dump(struct si_screen *sscreen,
 	si_shader_dump_stats(sscreen, conf, binary->code_size, debug, processor);
 }
 
-void si_shader_binary_read(struct radeon_shader_binary *binary,
-			   struct si_shader_config *conf)
-{
-	si_shader_binary_read_config(binary, conf, 0);
-}
-
 int si_compile_llvm(struct si_screen *sscreen,
 		    struct radeon_shader_binary *binary,
 		    struct si_shader_config *conf,
@@ -3918,7 +3912,7 @@ int si_compile_llvm(struct si_screen *sscreen,
 			return r;
 	}
 
-	si_shader_binary_read(binary, conf);
+	si_shader_binary_read_config(binary, conf, 0);
 	si_shader_dump(sscreen, binary, conf, debug, processor);
 
 	FREE(binary->config);
diff --git a/src/gallium/drivers/radeonsi/si_shader.h b/src/gallium/drivers/radeonsi/si_shader.h
index 51dfcd0..712bcd9 100644
--- a/src/gallium/drivers/radeonsi/si_shader.h
+++ b/src/gallium/drivers/radeonsi/si_shader.h
@@ -344,8 +344,6 @@ void si_shader_destroy(struct si_shader *shader);
 void si_shader_destroy_binary(struct radeon_shader_binary *binary);
 unsigned si_shader_io_get_unique_index(unsigned semantic_name, unsigned index);
 int si_shader_binary_upload(struct si_screen *sscreen, struct si_shader *shader);
-void si_shader_binary_read(struct radeon_shader_binary *binary,
-			   struct si_shader_config *conf);
 void si_shader_dump(struct si_screen *sscreen,
 		    struct radeon_shader_binary *binary,
 		    struct si_shader_config *conf,
-- 
2.1.4