fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 09:08:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radeonsi: inline si_shader_binary_read_config into its only caller

Browse source 
Since it can only be used for reading the config of an individual,
non-combined shader, it is not very reusable anyway.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Nicolai Hähnle 2019-05-03 19:15:52 +02:00 • committed by Marek Olšák
parent bf8a1ca902
commit ca21ba2a08
2 changed files with 7 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/gallium/drivers/radeonsi/si_shader.c
View file

@ -5389,19 +5389,6 @@ void si_shader_dump(struct si_screen *sscreen, const struct si_shader *shader,
check_debug_option);
}
bool si_shader_binary_read_config(struct si_shader_binary *binary,
struct ac_shader_config *conf)
{
struct ac_rtld_binary rtld;
if (!ac_rtld_open(&rtld, 1, &binary->elf_buffer, &binary->elf_size))
return false;
bool ok = ac_rtld_read_config(&rtld, conf);
ac_rtld_close(&rtld);
return ok;
}
static int si_compile_llvm(struct si_screen *sscreen,
struct si_shader_binary *binary,
struct ac_shader_config *conf,
@ -5437,7 +5424,13 @@ static int si_compile_llvm(struct si_screen *sscreen,
return r;
}
if (!si_shader_binary_read_config(binary, conf))
struct ac_rtld_binary rtld;
if (!ac_rtld_open(&rtld, 1, &binary->elf_buffer, &binary->elf_size))
return -1;
bool ok = ac_rtld_read_config(&rtld, conf);
ac_rtld_close(&rtld);
if (!ok)
return -1;
/* Enable 64-bit and 16-bit denormals, because there is no performance

2
src/gallium/drivers/radeonsi/si_shader.h
View file

@ -707,8 +707,6 @@ void si_shader_dump_stats_for_shader_db(const struct si_shader *shader,
void si_multiwave_lds_size_workaround(struct si_screen *sscreen,
unsigned *lds_size);
const char *si_get_shader_name(const struct si_shader *shader, unsigned processor);
bool si_shader_binary_read_config(struct si_shader_binary *binary,
struct ac_shader_config *conf);
void si_shader_binary_clean(struct si_shader_binary *binary);
/* si_shader_nir.c */