From 02c1f657a0f39a9f4623dfc36c292188109f36a2 Mon Sep 17 00:00:00 2001 From: Rhys Perry Date: Fri, 24 Apr 2026 10:51:40 +0100 Subject: [PATCH] radv: remove family from cache key Signed-off-by: Rhys Perry Closes: https://gitlab.freedesktop.org/mesa/mesa/-/work_items/4182 Reviewed-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_device.c | 3 ++- src/amd/vulkan/radv_shader.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index e44af415f86..c2e08f3c6a0 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -1189,7 +1189,8 @@ radv_device_init_compiler_info(struct radv_device *device) .lower_terminate_to_discard = instance->drirc.debug.lower_terminate_to_discard, .no_implicit_varying_subgroup_size = instance->drirc.debug.no_implicit_varying_subgroup_size, .force_aniso = device->force_aniso, - .family = pdev->info.family, + /* Use CHIP_UNKNOWN for increased compatiblity between caches. */ + .family = pdev->use_llvm ? pdev->info.family : CHIP_UNKNOWN, /* Wave/subgroup sizes */ .ge_wave_size = pdev->ge_wave_size, diff --git a/src/amd/vulkan/radv_shader.h b/src/amd/vulkan/radv_shader.h index 0208801dea6..726ee6c772e 100644 --- a/src/amd/vulkan/radv_shader.h +++ b/src/amd/vulkan/radv_shader.h @@ -548,7 +548,7 @@ struct radv_compiler_info { int32_t force_aniso; - uint32_t family; + uint32_t family; /* CHIP_UNKNOWN unless LLVM is used. */ /* Wave/subgroup sizes */ uint8_t ge_wave_size;