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

Use unwrapped memory map/unmap functions for GPUBuffer

Browse Source 
* If we use the wrapped functions this can deadlock on the CapTransitionLock
  when using GPUBuffers during capture.
This commit is contained in:
baldurk
2024-12-06 16:24:58 +00:00
parent bc5bd00205
commit acc29c9291
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/vk_common.cpp
+7 -6
View File
@@ -314,7 +314,8 @@ void *GPUBuffer::Map(uint32_t *bindoffset, VkDeviceSize usedsize)
}
void *ptr = NULL;
VkResult vkr = m_pDriver->vkMapMemory(device, mem, offset, size, 0, (void **)&ptr);
VkResult vkr =
ObjDisp(device)->MapMemory(Unwrap(device), Unwrap(mem), offset, size, 0, (void **)&ptr);
CHECK_VKR(m_pDriver, vkr);
if(!ptr)
@@ -326,10 +327,10 @@ void *GPUBuffer::Map(uint32_t *bindoffset, VkDeviceSize usedsize)
if(createFlags & eGPUBufferReadback)
{
VkMappedMemoryRange range = {
VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE, NULL, mem, offset, size,
VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE, NULL, Unwrap(mem), offset, size,
};
vkr = m_pDriver->vkInvalidateMappedMemoryRanges(device, 1, &range);
vkr = ObjDisp(device)->InvalidateMappedMemoryRanges(Unwrap(device), 1, &range);
CHECK_VKR(m_pDriver, vkr);
}
@@ -352,14 +353,14 @@ void GPUBuffer::Unmap()
if(!(createFlags & eGPUBufferReadback) && !(createFlags & eGPUBufferGPULocal))
{
VkMappedMemoryRange range = {
VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE, NULL, mem, mapoffset, VK_WHOLE_SIZE,
VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE, NULL, Unwrap(mem), mapoffset, VK_WHOLE_SIZE,
};
VkResult vkr = m_pDriver->vkFlushMappedMemoryRanges(device, 1, &range);
VkResult vkr = ObjDisp(device)->FlushMappedMemoryRanges(Unwrap(device), 1, &range);
CHECK_VKR(m_pDriver, vkr);
}
m_pDriver->vkUnmapMemory(device, mem);
ObjDisp(device)->UnmapMemory(Unwrap(device), Unwrap(mem));
}
bool VkInitParams::IsSupportedVersion(uint64_t ver)