From 4850e19ebd00598e980ac6eac9ad9a1b6dfdf468 Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Fri, 10 May 2019 20:21:35 +0200 Subject: [PATCH] Store color in message data. --- server/TracyEvent.hpp | 1 + server/TracyWorker.cpp | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/server/TracyEvent.hpp b/server/TracyEvent.hpp index f4fb883e..79c093e5 100644 --- a/server/TracyEvent.hpp +++ b/server/TracyEvent.hpp @@ -229,6 +229,7 @@ struct MessageData int64_t time; StringRef ref; uint64_t thread; + uint32_t color; }; struct ThreadData diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp index e6d0792b..663d25f7 100644 --- a/server/TracyWorker.cpp +++ b/server/TracyWorker.cpp @@ -3063,6 +3063,7 @@ void Worker::ProcessMessage( const QueueMessage& ev ) msg->time = TscTime( ev.time ); msg->ref = StringRef( StringRef::Type::Idx, it->second.idx ); msg->thread = ev.thread; + msg->color = 0xFFFFFFFF; m_data.lastTime = std::max( m_data.lastTime, msg->time ); InsertMessageData( msg, ev.thread ); m_pendingCustomStrings.erase( it ); @@ -3075,6 +3076,7 @@ void Worker::ProcessMessageLiteral( const QueueMessage& ev ) msg->time = TscTime( ev.time ); msg->ref = StringRef( StringRef::Type::Ptr, ev.text ); msg->thread = ev.thread; + msg->color = 0xFFFFFFFF; m_data.lastTime = std::max( m_data.lastTime, msg->time ); InsertMessageData( msg, ev.thread ); } @@ -3087,6 +3089,7 @@ void Worker::ProcessMessageColor( const QueueMessageColor& ev ) msg->time = TscTime( ev.time ); msg->ref = StringRef( StringRef::Type::Idx, it->second.idx ); msg->thread = ev.thread; + msg->color = 0xFF000000 | ( ev.r << 16 ) | ( ev.g << 8 ) | ev.b; m_data.lastTime = std::max( m_data.lastTime, msg->time ); InsertMessageData( msg, ev.thread ); m_pendingCustomStrings.erase( it ); @@ -3099,6 +3102,7 @@ void Worker::ProcessMessageLiteralColor( const QueueMessageColor& ev ) msg->time = TscTime( ev.time ); msg->ref = StringRef( StringRef::Type::Ptr, ev.text ); msg->thread = ev.thread; + msg->color = 0xFF000000 | ( ev.r << 16 ) | ( ev.g << 8 ) | ev.b; m_data.lastTime = std::max( m_data.lastTime, msg->time ); InsertMessageData( msg, ev.thread ); }