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

Remove DrawFlags::SetMarker from API Calls events

Browse Source 
* This made them behave inconsistently and was not really necessary
  anyway.
This commit is contained in:
baldurk
2018-02-20 10:02:40 +00:00
parent 98e46d2ba1
commit dbfa3cdc4d
7 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Code/CaptureContext.cpp
+2 -2
View File
@@ -501,8 +501,8 @@ void CaptureContext::AddFakeProfileMarkers()
int start = 0;
int refdraw = 0;
DrawFlags drawFlags =
DrawFlags::Copy | DrawFlags::Resolve | DrawFlags::SetMarker | DrawFlags::CmdList;
DrawFlags drawFlags = DrawFlags::Copy | DrawFlags::Resolve | DrawFlags::SetMarker |
DrawFlags::APICalls | DrawFlags::CmdList;
for(int32_t i = 1; i < draws.count(); i++)
{
qrenderdoc/Windows/TimelineBar.cpp
+1 -1
View File
@@ -1022,7 +1022,7 @@ uint32_t TimelineBar::processDraws(QVector<Marker> &markers, QVector<uint32_t> &
}
else
{
if((d.flags & (DrawFlags::SetMarker | DrawFlags::APICalls)) != DrawFlags::SetMarker)
if(!(d.flags & DrawFlags::SetMarker))
{
m_Draws.push_back(d.eventId);
draws.push_back(d.eventId);
renderdoc/driver/d3d11/d3d11_context_wrap.cpp
+1 -1
View File
@@ -127,7 +127,7 @@ bool WrappedID3D11DeviceContext::Serialise_PopMarker(SerialiserType &ser)
{
DrawcallDescription draw;
draw.name = "API Calls";
draw.flags |= DrawFlags::SetMarker | DrawFlags::APICalls;
draw.flags |= DrawFlags::APICalls;
AddEvent();
AddDrawcall(draw, true);
renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp
+2 -2
View File
@@ -96,7 +96,7 @@ bool WrappedID3D12GraphicsCommandList::Serialise_Close(SerialiserType &ser)
{
DrawcallDescription draw;
draw.name = "API Calls";
draw.flags |= DrawFlags::SetMarker | DrawFlags::APICalls;
draw.flags |= DrawFlags::APICalls;
m_Cmd->AddDrawcall(draw, true);
@@ -3037,7 +3037,7 @@ bool WrappedID3D12GraphicsCommandList::Serialise_EndEvent(SerialiserType &ser)
{
DrawcallDescription draw;
draw.name = "API Calls";
draw.flags = DrawFlags::SetMarker | DrawFlags::APICalls;
draw.flags = DrawFlags::APICalls;
m_Cmd->AddDrawcall(draw, true);
}
renderdoc/driver/gl/wrappers/gl_debug_funcs.cpp
+1 -1
View File
@@ -352,7 +352,7 @@ bool WrappedOpenGL::Serialise_glPopDebugGroup(SerialiserType &ser)
{
DrawcallDescription draw;
draw.name = "API Calls";
draw.flags |= DrawFlags::SetMarker | DrawFlags::APICalls;
draw.flags |= DrawFlags::APICalls;
AddDrawcall(draw, true);
}
renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp
+2 -2
View File
@@ -907,7 +907,7 @@ bool WrappedVulkan::Serialise_vkEndCommandBuffer(SerialiserType &ser, VkCommandB
{
DrawcallDescription draw;
draw.name = "API Calls";
draw.flags |= DrawFlags::SetMarker | DrawFlags::APICalls;
draw.flags |= DrawFlags::APICalls;
AddDrawcall(draw, true);
@@ -2807,7 +2807,7 @@ bool WrappedVulkan::Serialise_vkCmdDebugMarkerEndEXT(SerialiserType &ser,
{
DrawcallDescription draw;
draw.name = "API Calls";
draw.flags = DrawFlags::SetMarker | DrawFlags::APICalls;
draw.flags = DrawFlags::APICalls;
AddDrawcall(draw, true);
}
renderdoc/replay/replay_driver.cpp
+2 -3
View File
@@ -77,11 +77,10 @@ DrawcallDescription *SetupDrawcallPointers(vector<DrawcallDescription *> *drawca
ret = SetupDrawcallPointers(drawcallTable, draw->children, draw, previous);
}
else if((draw->flags & (DrawFlags::PushMarker | DrawFlags::SetMarker | DrawFlags::MultiDraw)) &&
!(draw->flags & DrawFlags::APICalls))
else if(draw->flags & (DrawFlags::PushMarker | DrawFlags::SetMarker | DrawFlags::MultiDraw))
{
// don't want to set up previous/next links for markers, but still add them to the table
// Some markers like Present or API Calls should have previous/next
// Some markers like Present or API Calls should have previous/next and are not markers
if(drawcallTable)
{