From 04a0800068aeeea9e9519ec113f68896b5f0d59a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Mon, 2 Dec 2024 21:47:31 -0500 Subject: [PATCH] radeonsi: call si_init_shader_args in si_get_nir_shader Reviewed-by: Qiang Yu Part-of: --- src/gallium/drivers/radeonsi/si_shader.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index 1ceefdaaa08..cff3b44fe24 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -2331,6 +2331,8 @@ static struct nir_shader *si_get_nir_shader(struct si_shader *shader, struct si_ nir_print_shader(nir, stdout); } + si_init_shader_args(shader, args); + /* Kill outputs according to the shader key. */ if (sel->stage <= MESA_SHADER_GEOMETRY) NIR_PASS(progress, nir, si_nir_kill_outputs, key); @@ -2986,8 +2988,6 @@ bool si_compile_shader(struct si_screen *sscreen, struct ac_llvm_compiler *compi } struct si_shader_args args; - si_init_shader_args(shader, &args); - bool free_nir; struct nir_shader *nir = si_get_nir_shader(shader, &args, &free_nir, &legacy_gs_output_info.info); @@ -3716,8 +3716,6 @@ nir_shader *si_get_prev_stage_nir_shader(struct si_shader *shader, prev_shader->is_monolithic = true; prev_shader->wave_size = shader->wave_size; - si_init_shader_args(prev_shader, args); - nir_shader *nir = si_get_nir_shader(prev_shader, args, free_nir, NULL); si_update_shader_binary_info(shader, nir);