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

Fix previous/next drawcall buttons when some drawcalls are filtered out

Browse Source
This commit is contained in:
baldurk
2021-07-01 15:15:02 +01:00
parent 3c0e0803f9
commit 7c2e7bff47
1 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Windows/EventBrowser.cpp
+31 -10
View File
@@ -2159,7 +2159,7 @@ void EventBrowser::events_currentChanged(const QModelIndex &current, const QMode
m_Model->RefreshCache();
const DrawcallDescription *draw = m_Ctx.GetDrawcall(effectiveEID);
const DrawcallDescription *draw = m_Ctx.GetDrawcall(selectedEID);
if(draw && draw->IsFakeMarker())
draw = &draw->children.back();
@@ -2168,11 +2168,11 @@ void EventBrowser::events_currentChanged(const QModelIndex &current, const QMode
ui->stepNext->setEnabled(draw && draw->next);
// special case for the first draw in the frame
if(effectiveEID == 0)
if(selectedEID == 0)
ui->stepNext->setEnabled(true);
// special case for the first 'virtual' draw at EID 0
if(m_Ctx.GetFirstDrawcall() && effectiveEID == m_Ctx.GetFirstDrawcall()->eventId)
if(m_Ctx.GetFirstDrawcall() && selectedEID == m_Ctx.GetFirstDrawcall()->eventId)
ui->stepPrev->setEnabled(true);
highlightBookmarks();
@@ -2303,12 +2303,23 @@ void EventBrowser::on_stepNext_clicked()
const DrawcallDescription *draw = m_Ctx.CurDrawcall();
if(draw && draw->next)
SelectEvent(draw->next->eventId);
if(draw)
draw = draw->next;
// special case for the first 'virtual' draw at EID 0
if(m_Ctx.CurEvent() == 0)
SelectEvent(m_Ctx.GetFirstDrawcall()->eventId);
draw = m_Ctx.GetFirstDrawcall();
while(draw)
{
// try to select the next event. If successful, stop
if(SelectEvent(draw->eventId))
return;
// if it failed, possibly the next draw is filtered out. Step along the list until we find one
// which isn't
draw = draw->next;
}
}
void EventBrowser::on_stepPrev_clicked()
@@ -2318,12 +2329,22 @@ void EventBrowser::on_stepPrev_clicked()
const DrawcallDescription *draw = m_Ctx.CurDrawcall();
if(draw && draw->previous)
SelectEvent(draw->previous->eventId);
if(draw)
draw = draw->previous;
while(draw)
{
// try to select the previous event. If successful, stop
if(SelectEvent(draw->eventId))
return;
// if it failed, possibly the previous draw is filtered out. Step along the list until we find
// one which isn't
draw = draw->previous;
}
// special case for the first 'virtual' draw at EID 0
if(m_Ctx.CurEvent() == m_Ctx.GetFirstDrawcall()->eventId)
SelectEvent(0);
SelectEvent(0);
}
void EventBrowser::on_exportDraws_clicked()