From 9e2be03e096966df56ddd4b480532d2065df3e2a Mon Sep 17 00:00:00 2001 From: baldurk Date: Sat, 3 Jan 2026 16:41:44 +0000 Subject: [PATCH] Only read sampler when unwrapping combined image/sampler descriptor --- .../vulkan/wrappers/vk_descriptor_funcs.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/renderdoc/driver/vulkan/wrappers/vk_descriptor_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_descriptor_funcs.cpp index 6be3e329b..a165e8d68 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_descriptor_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_descriptor_funcs.cpp @@ -1581,10 +1581,6 @@ VkDescriptorGetInfoEXT WrappedVulkan::UnwrapInfo(const VkDescriptorGetInfoEXT *p break; } case VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER: - // ignore the sampler part - case VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT: - case VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE: - case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE: { VkDescriptorImageInfo *img = (VkDescriptorImageInfo *)ret.data.pCombinedImageSampler; if(pDescriptorInfo->data.pCombinedImageSampler) @@ -1595,6 +1591,18 @@ VkDescriptorGetInfoEXT WrappedVulkan::UnwrapInfo(const VkDescriptorGetInfoEXT *p } break; } + case VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT: + case VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE: + case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE: + { + VkDescriptorImageInfo *img = (VkDescriptorImageInfo *)ret.data.pSampledImage; + if(pDescriptorInfo->data.pSampledImage) + { + img->imageView = Unwrap(pDescriptorInfo->data.pSampledImage->imageView); + img->imageLayout = pDescriptorInfo->data.pSampledImage->imageLayout; + } + break; + } case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER: case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER: case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER: