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

Fix up EIDs a little being off-by-one, and track first/last EIDs

Browse Source
This commit is contained in:
baldurk
2016-02-07 18:38:43 +01:00
parent e0c1563a45
commit 0f391cb926
2 changed files with 36 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/vk_core.cpp
+35 -7
View File
@@ -344,6 +344,8 @@ WrappedVulkan::WrappedVulkan(const VulkanFunctions &real, const char *logFilenam
m_CurEventID = 1;
m_CurDrawcallID = 1;
m_FirstEventID = 0;
m_LastEventID = ~0U;
m_CurCmdBufferID = ResourceId();
@@ -994,7 +996,12 @@ bool WrappedVulkan::Serialise_vkQueueSubmit(
fence = (VkFence)GetResourceManager()->GetLiveResource(fenceId).handle;
else
fence = VK_NULL_HANDLE;
}
const string desc = m_pSerialiser->GetDebugStr();
if(m_State == READING)
{
m_SubmittedFences.insert(fenceId);
m_Real.vkQueueSubmit(queue, numCmds, cmds, fence);
@@ -1005,13 +1012,6 @@ bool WrappedVulkan::Serialise_vkQueueSubmit(
GetResourceManager()->ApplyTransitions(m_CmdBufferInfo[cmd].imgtransitions, m_ImageInfo);
}
delete[] cmds;
}
const string desc = m_pSerialiser->GetDebugStr();
if(m_State == READING)
{
AddEvent(QUEUE_SUBMIT, desc);
string name = "vkQueueSubmit(" +
ToStr::Get(numCmds) + ")";
@@ -1053,6 +1053,10 @@ bool WrappedVulkan::Serialise_vkQueueSubmit(
m_CurDrawcallID += m_CmdBufferInfo[cmdIds[c]].drawCount;
}
// the outer loop will increment the event ID but we've handled
// it ourselves, so 'undo' that.
m_CurEventID--;
// done adding command buffers
m_DrawcallStack.pop_back();
}
@@ -1064,8 +1068,20 @@ bool WrappedVulkan::Serialise_vkQueueSubmit(
m_CurEventID += 1+m_CmdBufferInfo[cmdIds[c]].eventCount;
m_CurDrawcallID += m_CmdBufferInfo[cmdIds[c]].drawCount;
}
m_SubmittedFences.insert(fenceId);
m_Real.vkQueueSubmit(queue, numCmds, cmds, fence);
for(uint32_t i=0; i < numCmds; i++)
{
ResourceId cmd = GetResourceManager()->GetID(MakeRes(cmds[i]));
GetResourceManager()->ApplyTransitions(m_CmdBufferInfo[cmd].imgtransitions, m_ImageInfo);
}
}
SAFE_DELETE_ARRAY(cmds);
return true;
}
@@ -3460,6 +3476,10 @@ bool WrappedVulkan::Serialise_vkEndCommandBuffer(VkCmdBuffer cmdBuffer)
draw.name = "API Calls";
draw.flags |= eDraw_SetMarker;
// the outer loop will increment the event ID but we've not
// actually added anything just wrapped up the existing EIDs.
m_CurEventID--;
AddDrawcall(draw, true);
}
}
@@ -4836,6 +4856,10 @@ bool WrappedVulkan::Serialise_vkCmdDbgMarkerEnd(VkCmdBuffer cmdBuffer)
draw.name = "API Calls";
draw.flags |= eDraw_SetMarker;
// the outer loop will increment the event ID but we've not
// actually added anything just wrapped up the existing EIDs.
m_CurEventID--;
AddDrawcall(draw, true);
}
@@ -5114,11 +5138,15 @@ void WrappedVulkan::ContextReplayLog(LogState readType, uint32_t startEventID, u
FetchAPIEvent ev = GetEvent(startEventID);
m_CurEventID = ev.eventID;
m_pSerialiser->SetOffset(ev.fileOffset);
m_FirstEventID = startEventID;
m_LastEventID = endEventID;
}
else if(m_State == READING)
{
m_CurEventID = 1;
m_CurDrawcallID = 1;
m_FirstEventID = 0;
m_LastEventID = ~0U;
}
if(m_State == EXECUTING)
renderdoc/driver/vulkan/vk_core.h
+1
View File
@@ -247,6 +247,7 @@ private:
uint64_t m_CurChunkOffset;
uint32_t m_CurEventID, m_CurDrawcallID;
uint32_t m_FirstEventID, m_LastEventID;
DrawcallTreeNode m_ParentDrawcall;