diff --git a/profiler/src/profiler/TracyView.hpp b/profiler/src/profiler/TracyView.hpp index 955f308a..b91571e3 100644 --- a/profiler/src/profiler/TracyView.hpp +++ b/profiler/src/profiler/TracyView.hpp @@ -314,8 +314,8 @@ private: void DrawAllocList(); void DrawCompare(); void DrawCallstackWindow(); - void DrawCallstackTable( uint32_t callstack, uint64_t thread = 0, bool globalEntriesButton = false, bool showThread = false ); - void DrawCallstackTable( const CallstackFrameId* data, size_t size, uint64_t thread = 0, bool globalEntriesButton = false, bool showThread = false, bool hasCrashed = false, int64_t callstack = -1 ); + void DrawCallstackTable( uint32_t callstack, uint64_t thread = 0, const CallstackViewWait& wait = {}, bool globalEntriesButton = false, bool showThread = false ); + void DrawCallstackTable( const CallstackFrameId* data, size_t size, uint64_t thread = 0, const CallstackViewWait& wait = {}, bool globalEntriesButton = false, bool showThread = false, bool hasCrashed = false, int64_t callstack = -1 ); void DrawMemoryAllocWindow(); void DrawInfo(); void DrawTextEditor(); diff --git a/profiler/src/profiler/TracyView_Callstack.cpp b/profiler/src/profiler/TracyView_Callstack.cpp index 5418aa1d..dfb2c567 100644 --- a/profiler/src/profiler/TracyView_Callstack.cpp +++ b/profiler/src/profiler/TracyView_Callstack.cpp @@ -24,22 +24,22 @@ void View::DrawCallstackWindow() ImGui::Begin( "Call stack", &show, ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollWithMouse ); if( !ImGui::GetCurrentWindowRead()->SkipItems ) { - DrawCallstackTable( m_callstackView.id, m_callstackView.thread, true, true ); + DrawCallstackTable( m_callstackView.id, m_callstackView.thread, m_callstackView.wait, true, true ); } ImGui::End(); if( !show ) m_callstackView = {}; } -void View::DrawCallstackTable( uint32_t callstack, uint64_t thread, bool globalEntriesButton, bool showThread ) +void View::DrawCallstackTable( uint32_t callstack, uint64_t thread, const CallstackViewWait& wait, bool globalEntriesButton, bool showThread ) { auto& crash = m_worker.GetCrashEvent(); const bool hasCrashed = crash.thread != 0 && crash.callstack == callstack; auto& cs = m_worker.GetCallstack( callstack ); - DrawCallstackTable( cs.data(), cs.size(), thread, globalEntriesButton, showThread, hasCrashed, callstack ); + DrawCallstackTable( cs.data(), cs.size(), thread, wait, globalEntriesButton, showThread, hasCrashed, callstack ); } -void View::DrawCallstackTable( const CallstackFrameId* data, size_t size, uint64_t thread, bool globalEntriesButton, bool showThread, bool hasCrashed, int64_t callstack ) +void View::DrawCallstackTable( const CallstackFrameId* data, size_t size, uint64_t thread, const CallstackViewWait& wait, bool globalEntriesButton, bool showThread, bool hasCrashed, int64_t callstack ) { if( ClipboardButton() ) {