From 0c43ddd3e43adc1dadd8b5510db20c30f48eba33 Mon Sep 17 00:00:00 2001 From: Qiang Yu Date: Fri, 27 Dec 2024 11:03:08 +0800 Subject: [PATCH] radeonsi: unify disk cache id no matter use_aco or not MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Which compiler shader is compiled with could be distinguished with nir->info.use_aco_amd now, so no need to separate disk cache id for them. Reviewed-by: Marek Olšák Part-of: --- src/gallium/drivers/radeonsi/si_pipe.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index a9a733a0750..3ace56464d9 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -1112,13 +1112,8 @@ static void si_disk_cache_create(struct si_screen *sscreen) if (!disk_cache_get_function_identifier(si_disk_cache_create, &ctx)) return; - /* ACO and LLVM shader binary have different cache id distinguished by if adding - * the LLVM function identifier. ACO is a built-in component in mesa, so no need - * to add aco function here. - */ #if AMD_LLVM_AVAILABLE - if (!sscreen->use_aco && - !disk_cache_get_function_identifier(LLVMInitializeAMDGPUTargetInfo, &ctx)) + if (!disk_cache_get_function_identifier(LLVMInitializeAMDGPUTargetInfo, &ctx)) return; #endif