From 229e892e42e8b45ae2652dde4b8ace01a349a657 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Wed, 25 Feb 2026 11:17:17 +0100 Subject: [PATCH] radv: use radv_physical_cache_key::disable_shrink_image_store more Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_pipeline.c | 3 +-- src/amd/vulkan/radv_shader.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c index 9e48735e7d0..8f35f90f063 100644 --- a/src/amd/vulkan/radv_pipeline.c +++ b/src/amd/vulkan/radv_pipeline.c @@ -249,7 +249,6 @@ radv_postprocess_nir(struct radv_device *device, const struct radv_graphics_stat struct radv_shader_stage *stage) { const struct radv_physical_device *pdev = radv_device_physical(device); - const struct radv_instance *instance = radv_physical_device_instance(pdev); enum amd_gfx_level gfx_level = pdev->info.gfx_level; bool progress; @@ -302,7 +301,7 @@ radv_postprocess_nir(struct radv_device *device, const struct radv_graphics_stat NIR_PASS(progress, stage->nir, nir_opt_load_store_vectorize, &vectorize_opts); if (progress) { NIR_PASS(_, stage->nir, nir_opt_copy_prop); - NIR_PASS(_, stage->nir, nir_opt_shrink_stores, !instance->drirc.debug.disable_shrink_image_store); + NIR_PASS(_, stage->nir, nir_opt_shrink_stores, !pdev->cache_key.disable_shrink_image_store); constant_fold_for_push_const = true; } diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c index 1639591c589..c1139cb0533 100644 --- a/src/amd/vulkan/radv_shader.c +++ b/src/amd/vulkan/radv_shader.c @@ -743,7 +743,7 @@ radv_shader_spirv_to_nir(struct radv_device *device, const struct radv_shader_st }); NIR_PASS(_, nir, nir_lower_load_const_to_scalar); - NIR_PASS(_, nir, nir_opt_shrink_stores, !instance->drirc.debug.disable_shrink_image_store); + NIR_PASS(_, nir, nir_opt_shrink_stores, !pdev->cache_key.disable_shrink_image_store); if (nir->info.stage == MESA_SHADER_FRAGMENT && nir->info.fs.uses_discard) NIR_PASS(_, nir, nir_lower_discard_if, nir_move_terminate_out_of_loops);