diff --git a/server/TracyView.hpp b/server/TracyView.hpp index d27927fa..d2c9341d 100644 --- a/server/TracyView.hpp +++ b/server/TracyView.hpp @@ -259,7 +259,7 @@ private: void DrawSourceTooltip( const char* filename, uint32_t line, int before = 3, int after = 3, bool separateTooltip = true ); void DrawWaitStacks(); - void ListMemData( std::vector& vec, const std::function& DrawAddress, const char* id = nullptr, int64_t startTime = -1, uint64_t pool = 0 ); + void ListMemData( std::vector& vec, const std::function& DrawAddress, int64_t startTime = -1, uint64_t pool = 0 ); unordered_flat_map GetCallstackPaths( const MemData& mem, MemRange memRange ) const; unordered_flat_map GetCallstackFrameTreeBottomUp( const MemData& mem ) const; diff --git a/server/TracyView_Memory.cpp b/server/TracyView_Memory.cpp index f5a4bbaa..b3b4d403 100644 --- a/server/TracyView_Memory.cpp +++ b/server/TracyView_Memory.cpp @@ -313,7 +313,7 @@ void View::DrawMemory() { ImGui::Text( "0x%" PRIx64 "+%" PRIu64, v->Ptr(), m_memInfo.ptrFind - v->Ptr() ); } - }, "##allocations", -1, m_memInfo.pool ); + }, -1, m_memInfo.pool ); } } ImGui::TreePop(); @@ -362,7 +362,7 @@ void View::DrawMemory() { ListMemData( items, []( auto v ) { ImGui::Text( "0x%" PRIx64, v->Ptr() ); - }, "##activeMem", -1, m_memInfo.pool ); + }, -1, m_memInfo.pool ); } else { @@ -650,7 +650,7 @@ void View::DrawMemoryAllocWindow() if( !show ) m_memoryAllocInfoWindow = -1; } -void View::ListMemData( std::vector& vec, const std::function& DrawAddress, const char* id, int64_t startTime, uint64_t pool ) +void View::ListMemData( std::vector& vec, const std::function& DrawAddress, int64_t startTime, uint64_t pool ) { if( startTime == -1 ) startTime = 0; if( ImGui::BeginTable( "##mem", 8, ImGuiTableFlags_Resizable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Hideable | ImGuiTableFlags_Sortable | ImGuiTableFlags_BordersInnerV | ImGuiTableFlags_ScrollY, ImVec2( 0, ImGui::GetTextLineHeightWithSpacing() * std::min( 1+vec.size(), 15 ) ) ) ) @@ -918,7 +918,7 @@ void View::DrawAllocList() TextFocused( "Number of allocations:", RealToString( m_memInfo.allocList.size() ) ); ListMemData( data, []( auto v ) { ImGui::Text( "0x%" PRIx64, v->Ptr() ); - }, "##allocations", -1, m_memInfo.pool ); + }, -1, m_memInfo.pool ); ImGui::End(); } diff --git a/server/TracyView_ZoneInfo.cpp b/server/TracyView_ZoneInfo.cpp index df147f68..4683a05d 100644 --- a/server/TracyView_ZoneInfo.cpp +++ b/server/TracyView_ZoneInfo.cpp @@ -848,7 +848,7 @@ void View::DrawZoneInfoWindow() ListMemData( v, []( auto v ) { ImGui::Text( "0x%" PRIx64, v->Ptr() ); - }, nullptr, m_allocTimeRelativeToZone ? ev.Start() : -1, m_zoneInfoMemPool ); + }, m_allocTimeRelativeToZone ? ev.Start() : -1, m_zoneInfoMemPool ); ImGui::TreePop(); } }