From cf8a63c5787f0de12e495f14a7494a25b85b7520 Mon Sep 17 00:00:00 2001 From: Ryan Mckeever Date: Wed, 7 Jan 2026 22:20:40 -0800 Subject: [PATCH] panvk: lower multisampled images before nir_lower_descriptors This will allow image_deref_size intrinsics generated in pan_nir_lower_image_ms to be lowered in nir_lower_descriptors. Reviewed-by: Lars-Ivar Hesselberg Simonsen Acked-by: Erik Faye-Lund Part-of: --- src/panfrost/vulkan/panvk_vX_shader.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/panfrost/vulkan/panvk_vX_shader.c b/src/panfrost/vulkan/panvk_vX_shader.c index 265b27f2fdb..8b71ac88bd1 100644 --- a/src/panfrost/vulkan/panvk_vX_shader.c +++ b/src/panfrost/vulkan/panvk_vX_shader.c @@ -764,6 +764,12 @@ panvk_lower_nir(struct panvk_device *dev, nir_shader *nir, NIR_PASS(_, nir, nir_vk_lower_ycbcr_tex, lookup_ycbcr_conversion, &ycbcr_state); + /* We need to do this before nir_lower_descriptors so any image_deref_size + * intrinsics generated can be lowered there. + */ + if (PAN_ARCH < 9) + NIR_PASS(_, nir, pan_nir_lower_image_ms); + panvk_per_arch(nir_lower_descriptors)(nir, dev, rs, set_layout_count, set_layouts, state, desc_info);