From 9d94cdbb52052e265195171742c4fb65c9689039 Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Sun, 3 May 2020 14:33:47 +0200 Subject: [PATCH] Parametrize color highlighting. --- server/TracyView.cpp | 17 +++++++++-------- server/TracyView.hpp | 1 - 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/server/TracyView.cpp b/server/TracyView.cpp index 451ef772..07d43667 100644 --- a/server/TracyView.cpp +++ b/server/TracyView.cpp @@ -119,6 +119,15 @@ static tracy_force_inline void PrintStringPercent( char* buf, double percent ) memcpy( end, "%)", 3 ); } +template +static tracy_force_inline uint32_t HighlightColor( uint32_t color ) +{ + return 0xFF000000 | + ( std::min( 0xFF, ( ( ( color & 0x00FF0000 ) >> 16 ) + V ) ) << 16 ) | + ( std::min( 0xFF, ( ( ( color & 0x0000FF00 ) >> 8 ) + V ) ) << 8 ) | + ( std::min( 0xFF, ( ( ( color & 0x000000FF ) ) + V ) ) ); +} + enum { MinVisSize = 3 }; enum { MinCtxSize = 4 }; @@ -15191,14 +15200,6 @@ uint32_t View::GetRawZoneColor( const GpuEvent& ev ) return GetZoneColor( ev ); } -uint32_t View::HighlightColor( uint32_t color ) -{ - return 0xFF000000 | - ( std::min( 0xFF, ( ( ( color & 0x00FF0000 ) >> 16 ) + 25 ) ) << 16 ) | - ( std::min( 0xFF, ( ( ( color & 0x0000FF00 ) >> 8 ) + 25 ) ) << 8 ) | - ( std::min( 0xFF, ( ( ( color & 0x000000FF ) ) + 25 ) ) ); -} - uint32_t View::GetZoneHighlight( const ZoneEvent& ev, uint64_t thread, int depth ) { if( m_zoneInfoWindow == &ev ) diff --git a/server/TracyView.hpp b/server/TracyView.hpp index 010f3b4d..bcc04ff8 100644 --- a/server/TracyView.hpp +++ b/server/TracyView.hpp @@ -194,7 +194,6 @@ private: uint32_t GetZoneColor( const GpuEvent& ev ); uint32_t GetRawZoneColor( const ZoneEvent& ev, uint64_t thread, int depth ); uint32_t GetRawZoneColor( const GpuEvent& ev ); - uint32_t HighlightColor( uint32_t color ); uint32_t GetZoneHighlight( const ZoneEvent& ev, uint64_t thread, int depth ); uint32_t GetZoneHighlight( const GpuEvent& ev ); float GetZoneThickness( const ZoneEvent& ev );