From b0df5f4c19f2c084fe65b13f5712433c91ad83d0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sun, 3 Jan 2016 17:05:05 +0100 Subject: [PATCH] radeonsi: inline si_shader_binary_read MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Nicolai Hähnle --- 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 ffa941b5f60..2380242a7fa 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 ccb179c1f67..36b0364a204 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -3885,12 +3885,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, @@ -3917,7 +3911,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 51dfcd09e9e..712bcd9075d 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.11.0