Merge the GetZoneColor functions

This change has CPU and GPU use the same code to calculate zone
colors. This changes the UI because the GPU zones will have a different
color. The color of GPU zones will be set to match the CPU thread making
the GPU calls.

Author: Eric Eaton

profiler/src/profiler/TracyView.hpp

@@ -332,10 +332,8 @@ class View
     uint32_t GetThreadColor( uint64_t thread, int depth );
     uint32_t GetSrcLocColor( const SourceLocation& srcloc, int depth );
     uint32_t GetRawSrcLocColor( const SourceLocation& srcloc, int depth );
-    uint32_t GetZoneColor( const ZoneEvent& ev, uint64_t thread, int depth );
-    uint32_t GetZoneColor( const ZoneEvent& ev );
-    ZoneColorData GetZoneColorData( const ZoneEvent& ev, uint64_t thread, int depth, uint32_t inheritedColor );
-    ZoneColorData GetZoneColorData( const ZoneEvent& ev );
+    uint32_t GetZoneColor( const ZoneEventC ev, uint64_t thread, int depth );
+    ZoneColorData GetZoneColorData( const ZoneEventC ev, uint64_t thread, int depth, uint32_t inheritedColor );
 
     void ZoomToZone( const ZoneEvent& ev );
     void ZoomToZoneGPU( const ZoneEventC ev );

profiler/src/profiler/TracyView_GpuTimeline.cpp

@@ -162,7 +162,7 @@ int View::DrawGpuZoneLevel( const V& vec, bool hover, double pxns, int64_t nspx,
         const auto zoneThread = ctx->thread != 0 ? ctx->thread : m_worker.DecompressThread( ev.Thread() );
         if( zsz < MinVisSize )
         {
-            const auto color = GetZoneColor( ev );
+            const auto color = GetZoneColor( { &ev.event, ctx }, zoneThread, depth );
             const auto MinVisNs = MinVisSize * nspx;
             int num = 0;
             const auto px0 = ( start - m_vd.zvStart ) * pxns;
@@ -242,7 +242,7 @@ int View::DrawGpuZoneLevel( const V& vec, bool hover, double pxns, int64_t nspx,
             const auto pr1 = ( end - m_vd.zvStart ) * pxns;
             const auto px0 = std::max( pr0, -10.0 );
             const auto px1 = std::max( { std::min( pr1, double( w + 10 ) ), px0 + pxns * 0.5, px0 + MinVisSize } );
-            const auto zoneColor = GetZoneColorData( ev );
+            const auto zoneColor = GetZoneColorData( { &ev.event, ctx }, zoneThread, depth, 0 );
             draw->AddRectFilled( wpos + ImVec2( px0, offset ), wpos + ImVec2( px1, offset + tsz.y ), zoneColor.color );
             if( zoneColor.highlight )
             {

profiler/src/profiler/TracyView_Utility.cpp

@@ -49,13 +49,13 @@ uint32_t View::GetSrcLocColor( const SourceLocation& srcloc, int depth )
     return GetRawSrcLocColor( srcloc, depth );
 }
 
-uint32_t View::GetZoneColor( const ZoneEvent& ev, uint64_t thread, int depth )
+uint32_t View::GetZoneColor( const ZoneEventC ev, uint64_t thread, int depth )
 {
     const auto sl = ev.SrcLoc();
     const auto& srcloc = m_worker.GetSourceLocation( sl );
     if( !m_vd.forceColors )
     {
-        if( m_worker.HasZoneExtra( ev ) )
+        if( m_worker.HasZoneExtra( *ev.event ) )
         {
             const auto custom_color = m_worker.GetZoneExtra( ev ).color.Val();
             if( custom_color != 0 ) return custom_color | 0xFF000000;
@@ -77,25 +77,18 @@ uint32_t View::GetZoneColor( const ZoneEvent& ev, uint64_t thread, int depth )
     }
 }
 
-uint32_t View::GetZoneColor( const ZoneEvent& ev )
-{
-    const auto& srcloc = m_worker.GetSourceLocation( ev.SrcLoc() );
-    const auto color = srcloc.color;
-    return color != 0 ? ( color | 0xFF000000 ) : 0xFF222288;
-}
-
-View::ZoneColorData View::GetZoneColorData( const ZoneEvent& ev, uint64_t thread, int depth, uint32_t inheritedColor )
+View::ZoneColorData View::GetZoneColorData( const ZoneEventC ev, uint64_t thread, int depth, uint32_t inheritedColor )
 {
     ZoneColorData ret;
     const auto& srcloc = ev.SrcLoc();
-    if( m_zoneInfoWindow == &ev )
+    if( m_zoneInfoWindow == ev.event )
     {
         ret.color = inheritedColor ? inheritedColor : GetZoneColor( ev, thread, depth );
         ret.accentColor = 0xFF44DD44;
         ret.thickness = 3.f;
         ret.highlight = true;
     }
-    else if( m_zoneHighlight == &ev )
+    else if( m_zoneHighlight == ev.event )
     {
         ret.color = inheritedColor ? inheritedColor : GetZoneColor( ev, thread, depth );
         ret.accentColor = 0xFF4444FF;
@@ -136,33 +129,6 @@ View::ZoneColorData View::GetZoneColorData( const ZoneEvent& ev, uint64_t thread
     return ret;
 }
 
-View::ZoneColorData View::GetZoneColorData( const ZoneEvent& ev )
-{
-    ZoneColorData ret;
-    const auto color = GetZoneColor( ev );
-    ret.color = color;
-    if( m_gpuInfoWindow == &ev )
-    {
-        ret.accentColor = 0xFF44DD44;
-        ret.thickness = 3.f;
-        ret.highlight = true;
-    }
-    else if( m_gpuHighlight == &ev )
-    {
-        ret.accentColor = 0xFF4444FF;
-        ret.thickness = 3.f;
-        ret.highlight = true;
-    }
-    else
-    {
-        ret.accentColor = HighlightColor( color );
-        ret.thickness = 1.f;
-        ret.highlight = false;
-    }
-    return ret;
-}
-
-
 const ZoneEvent* View::FindZoneAtTime( uint64_t thread, int64_t time ) const
 {
     // TODO add thread rev-map

profiler/src/profiler/TracyView_ZoneTimeline.cpp

@@ -351,7 +351,7 @@ void View::DrawZoneList( const TimelineContext& ctx, const std::vector<TimelineD
             const auto pr1 = ( end - vStart ) * pxns;
             const auto zsz = std::max( pr1 - pr0, pxns * 0.5 );
 
-            const auto zoneColor = GetZoneColorData( ev, tid, v.depth, v.inheritedColor );
+            const auto zoneColor = GetZoneColorData( { &ev, nullptr }, tid, v.depth, v.inheritedColor );
             const char* zoneName = m_worker.GetZoneName( ev );
 
             auto tsz = ImGui::CalcTextSize( zoneName );

server/TracyEvent.hpp

@@ -801,6 +801,14 @@ struct ZoneEventC
 {
     tracy_force_inline ZoneEventC(const ZoneEvent* event, const GpuCtxData* ctx): event(event), ctx(ctx) {}
 
+    tracy_force_inline int64_t Start() const { return event->Start(); }
+    tracy_force_inline int64_t End() const { return event->End(); }
+    tracy_force_inline bool IsEndValid() const { return event->IsEndValid(); }
+    tracy_force_inline int16_t SrcLoc() const { return event->SrcLoc(); }
+    tracy_force_inline int32_t Child() const { return event->Child(); }
+    tracy_force_inline bool HasChildren() const { return event->HasChildren(); }
+    tracy_force_inline bool IsGpu() const { return ctx != nullptr; }
+
     tracy_force_inline operator bool() const { return event != nullptr; }
     tracy_force_inline bool operator==( const ZoneEventC& other ) const { return other.event == event; }
     tracy_force_inline bool operator==( const ZoneEvent* other ) const { return other == event; }

server/TracyWorker.cpp

@@ -2359,7 +2359,7 @@ const uint64_t* Worker::GetInlineSymbolList( uint64_t sym, uint32_t len )
     return it;
 }
 
-int64_t Worker::GetZoneEndImpl( const ZoneEvent& ev, const Vector<Vector<short_ptr<ZoneEvent>>>& childArray )
+int64_t Worker::GetZoneEndImpl( const ZoneEvent& ev, const Vector<Vector<short_ptr<ZoneEvent>>>& childArray ) const
 {
     assert( !ev.IsEndValid() );
     auto ptr = &ev;

server/TracyWorker.hpp

@@ -579,6 +579,7 @@ class Worker
     //     before its children have ended).
     // GetZoneEndDirect() will only return zone's direct timing data, without looking at children.
     tracy_force_inline int64_t GetZoneEnd( const ZoneEvent& ev ) { return ev.IsEndValid() ? ev.End() : GetZoneEndImpl( ev, m_data.zoneChildren ); }
+    tracy_force_inline int64_t GetZoneEnd( const ZoneEventC ev ) const { return ev.IsEndValid() ? ev.End() : GetZoneEndImpl( *ev.event, ev.IsGpu() ? m_data.gpuChildren : m_data.zoneChildren ); }
     tracy_force_inline int64_t GetZoneEndGPU( const ZoneEvent& ev ) { return ev.IsEndValid() ? ev.End() : GetZoneEndImpl( ev, m_data.gpuChildren ); }
     static tracy_force_inline int64_t GetZoneEndDirect( const ZoneEvent& ev ) { return ev.IsEndValid() ? ev.End() : ev.Start(); }
 
@@ -606,6 +607,7 @@ class Worker
     tracy_force_inline const bool HasZoneExtra( const ZoneEvent& ev ) const { return ev.extra != 0; }
     tracy_force_inline const ZoneExtra& GetZoneExtra( const ZoneEvent& ev ) const { return m_data.zoneExtra[ev.extra]; }
     tracy_force_inline const EventAdapter<true> GetGpuExtra( const ZoneEvent& ev ) const { return { ev, m_data.gpuExtra[ev.extra] }; }
+    tracy_force_inline const ZoneExtra& GetZoneExtra( const ZoneEventC ev ) const { return ev.IsGpu() ? m_data.gpuExtra[ev.event->extra] : m_data.zoneExtra[ev.event->extra]; }
 
     std::vector<int16_t> GetMatchingSourceLocation( const char* query, bool ignoreCase ) const;
 
@@ -959,7 +961,7 @@ class Worker
     tracy_force_inline ZoneExtra& AllocZoneExtra( ZoneEvent& ev );
     tracy_force_inline ZoneExtra& RequestZoneExtra( ZoneEvent& ev );
 
-    int64_t GetZoneEndImpl( const ZoneEvent& ev, const Vector<Vector<short_ptr<ZoneEvent>>>& childArray );
+    int64_t GetZoneEndImpl( const ZoneEvent& ev, const Vector<Vector<short_ptr<ZoneEvent>>>& childArray ) const;
 
     void UpdateMbps( int64_t td );