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

Do not read baked command buffer info when selecting vkQueueSubmit Event

Browse Source 
The command buffer id will be 0 which will make an empty entry in the map.
The submit will be skipped because startEID >= m_LastEventID.
Add asserts to catch invalid command buffer ID being used during ReplayQueueSubmit()
This commit is contained in:
Jake Turner
2026-03-20 08:57:38 +00:00
parent 533debb940
commit 5e5230ddbd
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp
+16 -11
View File
@@ -312,6 +312,7 @@ void WrappedVulkan::ReplayQueueSubmit(VkQueue queue, VkSubmitInfo2 submitInfo, r
FlushQ();
ResourceId cmd = GetResID(submitInfo.pCommandBufferInfos[0].commandBuffer);
RDCASSERTNOTEQUAL(cmd, ResourceId());
submitInfo.pCommandBufferInfos++;
@@ -407,19 +408,22 @@ void WrappedVulkan::ReplayQueueSubmit(VkQueue queue, VkSubmitInfo2 submitInfo, r
}
uint32_t startEID = m_RootEventID;
// advance m_CurEventID to match the events added when reading
for(uint32_t c = 0; c < submitInfo.commandBufferInfoCount; c++)
if(m_LastEventID > startEID)
{
ResourceId cmd = GetResID(submitInfo.pCommandBufferInfos[c].commandBuffer);
m_RootEventID += m_BakedCmdBufferInfo[cmd].eventCount;
m_RootActionID += m_BakedCmdBufferInfo[cmd].actionCount;
// 2 extra for the virtual labels around the command buffer
// advance m_CurEventID to match the events added when reading
for(uint32_t c = 0; c < submitInfo.commandBufferInfoCount; c++)
{
m_RootEventID += 2;
m_RootActionID += 2;
ResourceId cmd = GetResID(submitInfo.pCommandBufferInfos[c].commandBuffer);
RDCASSERTNOTEQUAL(cmd, ResourceId());
m_RootEventID += m_BakedCmdBufferInfo[cmd].eventCount;
m_RootActionID += m_BakedCmdBufferInfo[cmd].actionCount;
// 2 extra for the virtual labels around the command buffer
{
m_RootEventID += 2;
m_RootActionID += 2;
}
}
}
@@ -448,6 +452,7 @@ void WrappedVulkan::ReplayQueueSubmit(VkQueue queue, VkSubmitInfo2 submitInfo, r
{
VkCommandBufferSubmitInfo info = submitInfo.pCommandBufferInfos[c];
ResourceId cmdId = GetResID(info.commandBuffer);
RDCASSERTNOTEQUAL(cmdId, ResourceId());
// account for the virtual vkBeginCommandBuffer label at the start of the events here
// so it matches up to baseEvent