From b64bab197aef05fec25511fb749bc25813588993 Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Sun, 16 Apr 2023 17:46:15 +0200 Subject: [PATCH] No need for GetZoneName() with GpuEvent + srcloc parameters. --- server/TracyView_ZoneInfo.cpp | 2 +- server/TracyWorker.cpp | 14 +------------- server/TracyWorker.hpp | 1 - 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/server/TracyView_ZoneInfo.cpp b/server/TracyView_ZoneInfo.cpp index 9693ee0d..cdb43b39 100644 --- a/server/TracyView_ZoneInfo.cpp +++ b/server/TracyView_ZoneInfo.cpp @@ -1506,7 +1506,7 @@ void View::DrawGpuInfoWindow() ImGui::TextDisabled( "%i.", fidx++ ); ImGui::SameLine(); const auto& srcloc = m_worker.GetSourceLocation( v->SrcLoc() ); - const auto txt = m_worker.GetZoneName( *v, srcloc ); + const auto txt = m_worker.GetZoneName( srcloc ); ImGui::PushID( idx++ ); auto sel = ImGui::Selectable( txt, false ); auto hover = ImGui::IsItemHovered(); diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp index cb55d1c4..f0004d3c 100644 --- a/server/TracyWorker.cpp +++ b/server/TracyWorker.cpp @@ -2527,19 +2527,7 @@ const char* Worker::GetZoneName( const ZoneEvent& ev, const SourceLocation& srcl const char* Worker::GetZoneName( const GpuEvent& ev ) const { auto& srcloc = GetSourceLocation( ev.SrcLoc() ); - return GetZoneName( ev, srcloc ); -} - -const char* Worker::GetZoneName( const GpuEvent& ev, const SourceLocation& srcloc ) const -{ - if( srcloc.name.active ) - { - return GetString( srcloc.name ); - } - else - { - return GetString( srcloc.function ); - } + return GetZoneName( srcloc ); } static bool strstr_nocase( const char* l, const char* r ) diff --git a/server/TracyWorker.hpp b/server/TracyWorker.hpp index 61cc8ab3..85897f48 100644 --- a/server/TracyWorker.hpp +++ b/server/TracyWorker.hpp @@ -581,7 +581,6 @@ public: const char* GetZoneName( const ZoneEvent& ev ) const; const char* GetZoneName( const ZoneEvent& ev, const SourceLocation& srcloc ) const; const char* GetZoneName( const GpuEvent& ev ) const; - const char* GetZoneName( const GpuEvent& ev, const SourceLocation& srcloc ) const; tracy_force_inline const Vector>& GetZoneChildren( int32_t idx ) const { return m_data.zoneChildren[idx]; } tracy_force_inline const Vector>& GetGpuChildren( int32_t idx ) const { return m_data.gpuChildren[idx]; }