Fix sampler-only slots with immutable samplers in vulkan shader debug

baldurk · Jan 30, 2023 · b683815 · b683815
1 parent 9eaabe5
commit b683815
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/renderdoc/driver/vulkan/vk_shaderdebug.cpp b/renderdoc/driver/vulkan/vk_shaderdebug.cpp
@@ -254,7 +254,14 @@ class VulkanAPIWrapper : public rdcspv::DebugAPIWrapper
             {
               const DescriptorSetSlot &slot = curSlots[i];
 
-              switch(slot.type)
+              // When bind layout contains immutable samplers, sampler-only slots always have type
+              // DescriptorSlotType::Unwritten. Treat them as sampler slots in that case.
+              DescriptorSlotType slotType = slot.type;
+              if(bindLayout.immutableSampler &&
+                 bindLayout.layoutDescType == VK_DESCRIPTOR_TYPE_SAMPLER)
+                slotType = DescriptorSlotType::Sampler;
+
+              switch(slotType)
               {
                 case DescriptorSlotType::Sampler:
                 case DescriptorSlotType::CombinedImageSampler: