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

Rename 'draw' or 'drawcall' to action

Browse Source 
* There's not a good accepted terminology for this kind of event, and for
  historical reasons 'drawcall' has been the accepted term, even though
  that can be quite confusing when a dispatch or a copy is a 'drawcall'.
* This is particularly highlighted by the event browser filters where
  $draw() includes draws and dispatches, but $dispatch() only includes
  dispatches, it's hard to intuitively understand why $draw() matches all
  of these calls.
* As a result we've defined the term 'action' to cover these types of
  events in the same way that we defined 'event' in the first place to
  mean a single atomic API call.
This commit is contained in:
baldurk
2021-07-01 15:15:05 +01:00
parent e7785bd99e
commit 7149302680
283 changed files with 5374 additions and 5320 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Code/CaptureContext.cpp
+17 -17
View File
@@ -83,7 +83,7 @@ CaptureContext::CaptureContext(PersistantConfig &cfg) : m_Config(cfg)
m_CurVulkanPipelineState = NULL;
m_CurPipelineState = &m_DummyPipelineState;
m_Drawcalls = &m_EmptyDraws;
m_Actions = &m_EmptyActions;
m_StructuredFile = &m_DummySDFile;
@@ -782,10 +782,10 @@ void CaptureContext::LoadCapture(const rdcstr &captureFile, const ReplayOptions
rdcarray<ICaptureViewer *> viewers(m_CaptureViewers);
// make sure we're on a consistent event before invoking viewer forms
if(m_LastDrawcall)
SetEventID(viewers, m_LastDrawcall->eventId, m_LastDrawcall->eventId, true);
else if(!m_Drawcalls->empty())
SetEventID(viewers, m_Drawcalls->back().eventId, m_Drawcalls->back().eventId, true);
if(m_LastAction)
SetEventID(viewers, m_LastAction->eventId, m_LastAction->eventId, true);
else if(!m_Actions->empty())
SetEventID(viewers, m_Actions->back().eventId, m_Actions->back().eventId, true);
GUIInvoke::blockcall(m_MainWindow, [&viewers]() {
// notify all the registers viewers that a capture has been loaded
@@ -857,9 +857,9 @@ void CaptureContext::LoadCaptureThreaded(const QString &captureFile, const Repla
m_EventID = 0;
m_FirstDrawcall = m_LastDrawcall = NULL;
m_FirstAction = m_LastAction = NULL;
// fetch initial data like drawcalls, textures and buffers
// fetch initial data like actions, textures and buffers
m_Replay.BlockInvoke([this](IReplayController *r) {
if(Config().EventBrowser_AddFake)
r->AddFakeMarkers();
@@ -873,15 +873,15 @@ void CaptureContext::LoadCaptureThreaded(const QString &captureFile, const Repla
m_PostloadProgress = 0.2f;
m_Drawcalls = &r->GetDrawcalls();
m_Actions = &r->GetRootActions();
m_FirstDrawcall = &m_Drawcalls->at(0);
while(!m_FirstDrawcall->children.empty())
m_FirstDrawcall = &m_FirstDrawcall->children[0];
m_FirstAction = &m_Actions->at(0);
while(!m_FirstAction->children.empty())
m_FirstAction = &m_FirstAction->children[0];
m_LastDrawcall = &m_Drawcalls->back();
while(!m_LastDrawcall->children.empty())
m_LastDrawcall = &m_LastDrawcall->children.back();
m_LastAction = &m_Actions->back();
while(!m_LastAction->children.empty())
m_LastAction = &m_LastAction->children.back();
m_PostloadProgress = 0.4f;
@@ -1316,8 +1316,8 @@ void CaptureContext::CloseCapture()
m_Bookmarks.clear();
m_Notes.clear();
m_Drawcalls = &m_EmptyDraws;
m_FirstDrawcall = m_LastDrawcall = NULL;
m_Actions = &m_EmptyActions;
m_FirstAction = m_LastAction = NULL;
m_CurD3D11PipelineState = NULL;
m_CurD3D12PipelineState = NULL;
@@ -1487,7 +1487,7 @@ void CaptureContext::SetEventID(const rdcarray<ICaptureViewer *> &exclude, uint3
if(!IsCaptureLoaded())
return;
if(eventId > m_LastDrawcall->eventId)
if(eventId > m_LastAction->eventId)
{
qCritical() << "Invalid EID being selected " << eventId;
return;