From 3274af99bfd492cc1a85d88bb4a9275eb1485f89 Mon Sep 17 00:00:00 2001 From: Daniel Lundqvist Date: Sat, 22 Jun 2024 19:20:22 +0200 Subject: [PATCH] radeonsi: Fix unused variable when LLVM is not used for AMD. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit use_aco is only used when define AMD_LLVM_AVAILABLE is set. Inline it into its only user. Reviewed-by: Marek Olšák Part-of: --- src/gallium/drivers/radeonsi/si_shader.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index 1efb5d46c04..1ee7e209d4f 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -3089,14 +3089,13 @@ si_get_shader_part(struct si_screen *sscreen, struct si_shader_part **list, result = CALLOC_STRUCT(si_shader_part); result->key = *key; - ASSERTED bool use_aco = sscreen->use_aco || - (stage == MESA_SHADER_FRAGMENT && - ((prolog && key->ps_prolog.use_aco) || - (!prolog && key->ps_epilog.use_aco))); - bool ok = #if AMD_LLVM_AVAILABLE - !use_aco ? si_llvm_build_shader_part(sscreen, stage, prolog, compiler, debug, name, result) : + !(sscreen->use_aco || + (stage == MESA_SHADER_FRAGMENT && + ((prolog && key->ps_prolog.use_aco) || + (!prolog && key->ps_epilog.use_aco)))) ? + si_llvm_build_shader_part(sscreen, stage, prolog, compiler, debug, name, result) : #endif si_aco_build_shader_part(sscreen, stage, prolog, debug, name, result);