Only read sampler when unwrapping combined image/sampler descriptor

Author: baldurk

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: