From faf3e012480a006bf95a6bd8ce1b6337b02d9cb2 Mon Sep 17 00:00:00 2001 From: baldurk Date: Wed, 11 Mar 2026 22:26:54 +0000 Subject: [PATCH] Command annotations do not produce EIDs --- renderdoc/driver/d3d12/d3d12_commands.cpp | 3 ++- renderdoc/driver/vulkan/vk_core.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/renderdoc/driver/d3d12/d3d12_commands.cpp b/renderdoc/driver/d3d12/d3d12_commands.cpp index 209b3e7c6..0dcbf1d44 100644 --- a/renderdoc/driver/d3d12/d3d12_commands.cpp +++ b/renderdoc/driver/d3d12/d3d12_commands.cpp @@ -1335,7 +1335,8 @@ RDResult WrappedID3D12CommandQueue::ReplayLog(CaptureState readType, uint32_t st // boundaries, the event IDs would no longer match up). if(m_Cmd.m_LastCmdListID == ResourceId() || startEventID > 1) { - m_Cmd.m_RootEventID++; + if(context != D3D12Chunk::SetCommandAnnotation) + m_Cmd.m_RootEventID++; if(startEventID > 1) ser.GetReader()->SetOffset(GetEvent(m_Cmd.m_RootEventID).fileOffset); diff --git a/renderdoc/driver/vulkan/vk_core.cpp b/renderdoc/driver/vulkan/vk_core.cpp index d1a2a4fe3..5800d452f 100644 --- a/renderdoc/driver/vulkan/vk_core.cpp +++ b/renderdoc/driver/vulkan/vk_core.cpp @@ -4079,7 +4079,8 @@ RDResult WrappedVulkan::ContextReplayLog(CaptureState readType, uint32_t startEv // boundaries, the event IDs would no longer match up). if(m_LastCmdBufferID == ResourceId() || startEventID > 1) { - m_RootEventID++; + if(chunktype != VulkanChunk::SetCommandAnnotation) + m_RootEventID++; if(startEventID > 1) ser.GetReader()->SetOffset(GetEvent(m_RootEventID).fileOffset);