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

Make sure we're on a consistent event before calling OnLogFileLoaded

Browse Source 
* Certain panels like BufferViewer assume there is a current drawcall
  at startup and not an invalid event ID like 0. Normally the event
  browser is loaded first and sets the event ID, but if it's later in
  the list this will break.
This commit is contained in:
baldurk
2017-02-01 11:17:56 +00:00
parent 0a611417c1
commit 477df04072
5 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Code/CaptureContext.cpp
+10 -3
View File
@@ -312,6 +312,13 @@ void CaptureContext::LoadLogfileThreaded(const QString &logFile, const QString &
QVector<ILogViewerForm *> logviewers(m_LogViewers);
// make sure we're on a consistent event before invoking log viewer forms
const FetchDrawcall *draw = &m_Drawcalls.back();
while(!draw->children.empty())
draw = &draw->children.back();
SetEventID(logviewers, draw->eventID, true);
GUIInvoke::blockcall([&logviewers]() {
// notify all the registers log viewers that a log has been loaded
for(ILogViewerForm *logviewer : logviewers)
@@ -366,8 +373,8 @@ void CaptureContext::CloseLogfile()
}
}
void CaptureContext::SetEventID(ILogViewerForm *exclude, uint32_t selectedEventID, uint32_t eventID,
bool force)
void CaptureContext::SetEventID(const QVector<ILogViewerForm *> &exclude, uint32_t selectedEventID,
uint32_t eventID, bool force)
{
uint32_t prevSelectedEventID = m_SelectedEventID;
m_SelectedEventID = selectedEventID;
@@ -386,7 +393,7 @@ void CaptureContext::SetEventID(ILogViewerForm *exclude, uint32_t selectedEventI
for(ILogViewerForm *logviewer : m_LogViewers)
{
if(logviewer == exclude)
if(exclude.contains(logviewer))
continue;
if(force || prevSelectedEventID != selectedEventID)
qrenderdoc/Code/CaptureContext.h
+3 -3
View File
@@ -83,9 +83,9 @@ public:
void LoadLogfile(const QString &logFile, const QString &origFilename, bool temporary, bool local);
void CloseLogfile();
void SetEventID(ILogViewerForm *exclude, uint32_t selectedEventID, uint32_t eventID,
bool force = false);
void RefreshStatus() { SetEventID(NULL, m_SelectedEventID, m_EventID, true); }
void SetEventID(const QVector<ILogViewerForm *> &exclude, uint32_t selectedEventID,
uint32_t eventID, bool force = false);
void RefreshStatus() { SetEventID({}, m_SelectedEventID, m_EventID, true); }
void AddLogViewer(ILogViewerForm *f)
{
m_LogViewers.push_back(f);