lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-07-09 09:10:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle external queues properly when doing coherent memory readback

Browse Source
This commit is contained in:
baldurk
2022-05-23 13:52:58 +01:00
parent b0fce7c8cc
commit 6db5e339bb
1 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp
+26 -11
View File
@@ -1073,7 +1073,14 @@ void WrappedVulkan::CaptureQueueSubmit(VkQueue queue,
// immediately issue a command buffer to copy back the data. We do that on this queue to
// avoid complexity with synchronising with another queue, but the transfer queue if
// available would be better for this purpose.
VkCommandBuffer copycmd = GetNextCmd();
VkCommandBuffer copycmd;
const uint32_t queueFamilyIndex = GetRecord(queue)->queueFamilyIndex;
if(m_QueueFamilyIdx == queueFamilyIndex)
copycmd = GetNextCmd();
else
copycmd = GetExtQueueCmd(queueFamilyIndex);
VkCommandBufferBeginInfo beginInfo = {VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, NULL,
VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT};
@@ -1102,13 +1109,23 @@ void WrappedVulkan::CaptureQueueSubmit(VkQueue queue,
ObjDisp(copycmd)->EndCommandBuffer(Unwrap(copycmd));
VkSubmitInfo submit = {
VK_STRUCTURE_TYPE_SUBMIT_INFO, NULL, 0, NULL, NULL, 1, UnwrapPtr(copycmd),
};
VkResult copyret = ObjDisp(queue)->QueueSubmit(Unwrap(queue), 1, &submit, VK_NULL_HANDLE);
RDCASSERTEQUAL(copyret, VK_SUCCESS);
if(m_QueueFamilyIdx == queueFamilyIndex)
{
VkSubmitInfo submit = {
VK_STRUCTURE_TYPE_SUBMIT_INFO, NULL, 0, NULL, NULL, 1, UnwrapPtr(copycmd),
};
VkResult copyret = ObjDisp(queue)->QueueSubmit(Unwrap(queue), 1, &submit, VK_NULL_HANDLE);
RDCASSERTEQUAL(copyret, VK_SUCCESS);
ObjDisp(queue)->QueueWaitIdle(Unwrap(queue));
ObjDisp(queue)->QueueWaitIdle(Unwrap(queue));
RemovePendingCommandBuffer(copycmd);
AddFreeCommandBuffer(copycmd);
}
else
{
SubmitAndFlushExtQueue(queueFamilyIndex);
}
VkMappedMemoryRange range = {
VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE,
@@ -1118,12 +1135,10 @@ void WrappedVulkan::CaptureQueueSubmit(VkQueue queue,
VK_WHOLE_SIZE,
};
copyret = ObjDisp(queue)->InvalidateMappedMemoryRanges(Unwrap(m_Device), 1, &range);
VkResult copyret =
ObjDisp(queue)->InvalidateMappedMemoryRanges(Unwrap(m_Device), 1, &range);
RDCASSERTEQUAL(copyret, VK_SUCCESS);
RemovePendingCommandBuffer(copycmd);
AddFreeCommandBuffer(copycmd);
state.cpuReadPtr = GetDebugManager()->GetReadbackPtr();
}
else