mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-23 06:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Construct zone info stack.

Browse Source
This commit is contained in:
Bartosz Taudul 2018-05-02 19:23:46 +02:00
parent e28022f735
commit 1cc798cea3
2 changed files with 60 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
server/TracyView.cpp
View File

@ -1232,8 +1232,7 @@ int View::DrawZoneLevel( const Vector<ZoneEvent*>& vec, bool hover, double pxns,
} }
if( ImGui::IsMouseClicked( 0 ) ) if( ImGui::IsMouseClicked( 0 ) )
{ {
m_zoneInfoWindow = &ev; ShowZoneInfo( ev );
m_gpuInfoWindow = nullptr;
} }
} }
} }
@ -1345,8 +1344,7 @@ int View::DrawZoneLevel( const Vector<ZoneEvent*>& vec, bool hover, double pxns,
} }
if( ImGui::IsMouseClicked( 0 ) ) if( ImGui::IsMouseClicked( 0 ) )
{ {
m_zoneInfoWindow = &ev; ShowZoneInfo( ev );
m_gpuInfoWindow = nullptr;
} }
} }
@ -1499,9 +1497,7 @@ int View::DrawGpuZoneLevel( const Vector<GpuEvent*>& vec, bool hover, double pxn
} }
if( ImGui::IsMouseClicked( 0 ) ) if( ImGui::IsMouseClicked( 0 ) )
{ {
m_zoneInfoWindow = nullptr; ShowZoneInfo( ev, thread );
m_gpuInfoWindow = &ev;
m_gpuInfoWindowThread = thread;
} }
m_gpuThread = thread; m_gpuThread = thread;
@ -1585,9 +1581,7 @@ int View::DrawGpuZoneLevel( const Vector<GpuEvent*>& vec, bool hover, double pxn
} }
if( ImGui::IsMouseClicked( 0 ) ) if( ImGui::IsMouseClicked( 0 ) )
{ {
m_zoneInfoWindow = nullptr; ShowZoneInfo( ev, thread );
m_gpuInfoWindow = &ev;
m_gpuInfoWindowThread = thread;
} }
m_gpuThread = thread; m_gpuThread = thread;
@ -2632,7 +2626,7 @@ void View::DrawZoneInfoWindow()
auto parent = GetZoneParent( ev ); auto parent = GetZoneParent( ev );
if( parent ) if( parent )
{ {
m_zoneInfoWindow = parent; ShowZoneInfo( *parent );
} }
} }
ImGui::SameLine(); ImGui::SameLine();
@ -2799,7 +2793,7 @@ void View::DrawZoneInfoWindow()
ImGui::PopID(); ImGui::PopID();
if( sel ) if( sel )
{ {
m_zoneInfoWindow = v; ShowZoneInfo( *v );
} }
if( hover ) if( hover )
{ {
@ -2853,7 +2847,7 @@ void View::DrawZoneInfoWindow()
ImGui::PushID( (int)i ); ImGui::PushID( (int)i );
if( ImGui::Selectable( txt, &b, ImGuiSelectableFlags_SpanAllColumns ) ) if( ImGui::Selectable( txt, &b, ImGuiSelectableFlags_SpanAllColumns ) )
{ {
m_zoneInfoWindow = &cev; ShowZoneInfo( cev );
} }
if( ImGui::IsItemHovered() ) if( ImGui::IsItemHovered() )
{ {
@ -2879,7 +2873,11 @@ void View::DrawZoneInfoWindow()
ImGui::End(); ImGui::End();
if( !show ) m_zoneInfoWindow = nullptr; if( !show )
{
m_zoneInfoWindow = nullptr;
m_zoneInfoStack.clear();
}
} }
void View::DrawGpuInfoWindow() void View::DrawGpuInfoWindow()
@ -2899,7 +2897,7 @@ void View::DrawGpuInfoWindow()
auto parent = GetZoneParent( ev ); auto parent = GetZoneParent( ev );
if( parent ) if( parent )
{ {
m_gpuInfoWindow = parent; ShowZoneInfo( *parent, m_gpuInfoWindowThread );
} }
} }
@ -2958,7 +2956,7 @@ void View::DrawGpuInfoWindow()
ImGui::PopID(); ImGui::PopID();
if( sel ) if( sel )
{ {
m_gpuInfoWindow = v; ShowZoneInfo( *v, m_gpuInfoWindowThread );
} }
if( hover ) if( hover )
{ {
@ -3011,7 +3009,7 @@ void View::DrawGpuInfoWindow()
ImGui::PushID( (int)i ); ImGui::PushID( (int)i );
if( ImGui::Selectable( m_worker.GetString( csl.name ), &b, ImGuiSelectableFlags_SpanAllColumns ) ) if( ImGui::Selectable( m_worker.GetString( csl.name ), &b, ImGuiSelectableFlags_SpanAllColumns ) )
{ {
m_gpuInfoWindow = &cev; ShowZoneInfo( cev, m_gpuInfoWindowThread );
} }
if( ImGui::IsItemHovered() ) if( ImGui::IsItemHovered() )
{ {
@ -3037,7 +3035,11 @@ void View::DrawGpuInfoWindow()
ImGui::End(); ImGui::End();
if( !show ) m_gpuInfoWindow = nullptr; if( !show )
{
m_gpuInfoWindow = nullptr;
m_gpuInfoStack.clear();
}
} }
void View::DrawOptions() void View::DrawOptions()
@ -3871,7 +3873,7 @@ void View::DrawFindZone()
auto& srcloc = m_worker.GetSourceLocation( ev->srcloc ); auto& srcloc = m_worker.GetSourceLocation( ev->srcloc );
if( ImGui::Selectable( TimeToString( ev->start - m_worker.GetFrameBegin( 0 ) ), m_zoneInfoWindow == ev, ImGuiSelectableFlags_SpanAllColumns ) ) if( ImGui::Selectable( TimeToString( ev->start - m_worker.GetFrameBegin( 0 ) ), m_zoneInfoWindow == ev, ImGuiSelectableFlags_SpanAllColumns ) )
{ {
m_zoneInfoWindow = ev; ShowZoneInfo( *ev );
} }
if( ImGui::IsItemHovered() ) if( ImGui::IsItemHovered() )
{ {
@ -4655,7 +4657,7 @@ void View::ListMemData( T ptr, T end, std::function<const MemEvent*(T&)> DrawAdd
ImGui::PopID(); ImGui::PopID();
if( sel ) if( sel )
{ {
m_zoneInfoWindow = zone; ShowZoneInfo( *zone );
} }
if( hover ) if( hover )
{ {
@ -4699,7 +4701,7 @@ void View::ListMemData( T ptr, T end, std::function<const MemEvent*(T&)> DrawAdd
ImGui::PopID(); ImGui::PopID();
if( sel ) if( sel )
{ {
m_zoneInfoWindow = zoneFree; ShowZoneInfo( *zoneFree );
} }
if( hover ) if( hover )
{ {
@ -5177,6 +5179,37 @@ void View::ZoomToRange( int64_t start, int64_t end )
m_zoomAnim.lenMod = 10.0 / log10( diff ); m_zoomAnim.lenMod = 10.0 / log10( diff );
} }
void View::ShowZoneInfo( const ZoneEvent& ev )
{
if( m_zoneInfoWindow )
{
m_zoneInfoStack.push_back( m_zoneInfoWindow );
}
m_zoneInfoWindow = &ev;
if( m_gpuInfoWindow )
{
m_gpuInfoWindow = nullptr;
m_gpuInfoStack.clear();
}
}
void View::ShowZoneInfo( const GpuEvent& ev, uint64_t thread )
{
if( m_gpuInfoWindow )
{
m_gpuInfoStack.push_back( m_gpuInfoWindow );
}
m_gpuInfoWindow = &ev;
m_gpuInfoWindowThread = thread;
if( m_zoneInfoWindow )
{
m_zoneInfoWindow = nullptr;
m_zoneInfoStack.clear();
}
}
void View::ZoneTooltip( const ZoneEvent& ev ) void View::ZoneTooltip( const ZoneEvent& ev )
{ {
int dmul = ev.text.active ? 2 : 1; int dmul = ev.text.active ? 2 : 1;

6
server/TracyView.hpp
View File

@ -102,6 +102,9 @@ private:
void ZoomToZone( const GpuEvent& ev ); void ZoomToZone( const GpuEvent& ev );
void ZoomToRange( int64_t start, int64_t end ); void ZoomToRange( int64_t start, int64_t end );
void ShowZoneInfo( const ZoneEvent& ev );
void ShowZoneInfo( const GpuEvent& ev, uint64_t thread );
void ZoneTooltip( const ZoneEvent& ev ); void ZoneTooltip( const ZoneEvent& ev );
void ZoneTooltip( const GpuEvent& ev ); void ZoneTooltip( const GpuEvent& ev );
const ZoneEvent* GetZoneParent( const ZoneEvent& zone ) const; const ZoneEvent* GetZoneParent( const ZoneEvent& zone ) const;
@ -184,6 +187,9 @@ private:
Namespace m_namespace; Namespace m_namespace;
Animation m_zoomAnim; Animation m_zoomAnim;
Vector<const ZoneEvent*> m_zoneInfoStack;
Vector<const GpuEvent*> m_gpuInfoStack;
struct { struct {
enum : uint64_t { Unselected = std::numeric_limits<uint64_t>::max() - 1 }; enum : uint64_t { Unselected = std::numeric_limits<uint64_t>::max() - 1 };