diff options
| author | Marek Olšák <[email protected]> | 2016-01-03 17:05:05 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2016-01-07 18:26:06 +0100 |
| commit | b0df5f4c19f2c084fe65b13f5712433c91ad83d0 (patch) | |
| tree | 42040daf528569f9390127623b8fe28cf96efcc7 /src/gallium | |
| parent | c9c031f3d0ed28a65b78748ed1e6e2ec29336451 (diff) | |
radeonsi: inline si_shader_binary_read
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_compute.c | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_shader.c | 8 | ||||
| -rw-r--r-- | 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, |