From 2ea17af719bfefb96f968175604e9115b90fd446 Mon Sep 17 00:00:00 2001 From: baldurk Date: Fri, 25 Sep 2020 10:51:12 +0100 Subject: [PATCH] Fix unwrap of inline uniform block descriptor writes * We don't unwrap any of the data but we must still unwrap the descriptor set. --- renderdoc/driver/vulkan/wrappers/vk_descriptor_funcs.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/renderdoc/driver/vulkan/wrappers/vk_descriptor_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_descriptor_funcs.cpp index 44a4b3b52..fdac4362b 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_descriptor_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_descriptor_funcs.cpp @@ -100,10 +100,6 @@ VkWriteDescriptorSet WrappedVulkan::UnwrapInfo(const VkWriteDescriptorSet *write { VkWriteDescriptorSet ret = *writeDesc; - // nothing to unwrap for inline uniform block - if(ret.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) - return ret; - byte *memory = GetTempMemory(sizeof(VkDescriptorBufferInfo) * writeDesc->descriptorCount); VkDescriptorBufferInfo *bufInfos = (VkDescriptorBufferInfo *)memory; @@ -112,6 +108,10 @@ VkWriteDescriptorSet WrappedVulkan::UnwrapInfo(const VkWriteDescriptorSet *write ret.dstSet = Unwrap(ret.dstSet); + // nothing to unwrap for inline uniform block + if(ret.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) + return ret; + RDCCOMPILE_ASSERT(sizeof(VkDescriptorBufferInfo) >= sizeof(VkDescriptorImageInfo), "Structure sizes mean not enough space is allocated for write data"); RDCCOMPILE_ASSERT(sizeof(VkDescriptorBufferInfo) >= sizeof(VkBufferView),