lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-13 13:30:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix broken capture when app uses dedicated allocation weirdly

Browse Source 
Both handles in VkMemoryDedicatedAllocateInfo can be VK_NULL_HANDLE,
specification allows this. Should be safe to ignore struct in this case.
This commit is contained in:
Pavel Asyutchenko
2021-07-31 17:09:14 +03:00
committed by Baldur Karlsson
parent 93f8a59a8f
commit c31c04712d
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp
+18
View File
@@ -315,9 +315,18 @@ bool WrappedVulkan::Serialise_vkAllocateMemory(SerialiserType &ser, VkDevice dev
VkMemoryDedicatedAllocateInfo *dedicated = (VkMemoryDedicatedAllocateInfo *)FindNextStruct(
&AllocateInfo, VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO);
if(dedicated && dedicated->buffer == VK_NULL_HANDLE && dedicated->image == VK_NULL_HANDLE)
{
dedicated = NULL;
}
VkDedicatedAllocationMemoryAllocateInfoNV *dedicatedNV =
(VkDedicatedAllocationMemoryAllocateInfoNV *)FindNextStruct(
&AllocateInfo, VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_MEMORY_ALLOCATE_INFO_NV);
if(dedicatedNV && dedicatedNV->buffer == VK_NULL_HANDLE && dedicatedNV->image == VK_NULL_HANDLE)
{
dedicatedNV = NULL;
}
if(dedicated)
{
@@ -480,9 +489,18 @@ VkResult WrappedVulkan::vkAllocateMemory(VkDevice device, const VkMemoryAllocate
VkMemoryDedicatedAllocateInfo *dedicated = (VkMemoryDedicatedAllocateInfo *)FindNextStruct(
pAllocateInfo, VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO);
if(dedicated && dedicated->buffer == VK_NULL_HANDLE && dedicated->image == VK_NULL_HANDLE)
{
dedicated = NULL;
}
VkDedicatedAllocationMemoryAllocateInfoNV *dedicatedNV =
(VkDedicatedAllocationMemoryAllocateInfoNV *)FindNextStruct(
pAllocateInfo, VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_MEMORY_ALLOCATE_INFO_NV);
if(dedicatedNV && dedicatedNV->buffer == VK_NULL_HANDLE && dedicatedNV->image == VK_NULL_HANDLE)
{
dedicatedNV = NULL;
}
// create a buffer with the whole memory range bound, for copying to and from
// conveniently (for initial state data)