From d47122586ccdeb6955bb643eaa76113423322afd Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Mon, 23 Jan 2023 01:23:15 +0100 Subject: [PATCH] Fix color channel names in source location message. --- public/client/TracyProfiler.cpp | 4 ++-- public/common/TracyQueue.hpp | 4 ++-- server/TracyWorker.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/public/client/TracyProfiler.cpp b/public/client/TracyProfiler.cpp index d08f96fe..6104a7ed 100644 --- a/public/client/TracyProfiler.cpp +++ b/public/client/TracyProfiler.cpp @@ -3026,9 +3026,9 @@ void Profiler::SendSourceLocation( uint64_t ptr ) MemWrite( &item.srcloc.file, (uint64_t)srcloc->file ); MemWrite( &item.srcloc.function, (uint64_t)srcloc->function ); MemWrite( &item.srcloc.line, srcloc->line ); - MemWrite( &item.srcloc.r, uint8_t( ( srcloc->color ) & 0xFF ) ); + MemWrite( &item.srcloc.b, uint8_t( ( srcloc->color ) & 0xFF ) ); MemWrite( &item.srcloc.g, uint8_t( ( srcloc->color >> 8 ) & 0xFF ) ); - MemWrite( &item.srcloc.b, uint8_t( ( srcloc->color >> 16 ) & 0xFF ) ); + MemWrite( &item.srcloc.r, uint8_t( ( srcloc->color >> 16 ) & 0xFF ) ); AppendData( &item, QueueDataSize[(int)QueueType::SourceLocation] ); } diff --git a/public/common/TracyQueue.hpp b/public/common/TracyQueue.hpp index cf033c0d..8443193a 100644 --- a/public/common/TracyQueue.hpp +++ b/public/common/TracyQueue.hpp @@ -222,9 +222,9 @@ struct QueueSourceLocation uint64_t function; // ptr uint64_t file; // ptr uint32_t line; - uint8_t r; - uint8_t g; uint8_t b; + uint8_t g; + uint8_t r; }; struct QueueZoneTextFat diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp index efb8e056..d3820076 100644 --- a/server/TracyWorker.cpp +++ b/server/TracyWorker.cpp @@ -3725,7 +3725,7 @@ void Worker::AddSourceLocation( const QueueSourceLocation& srcloc ) } } CheckString( srcloc.function ); - const uint32_t color = ( srcloc.r << 16 ) | ( srcloc.g << 8 ) | srcloc.b; + const uint32_t color = ( srcloc.b << 16 ) | ( srcloc.g << 8 ) | srcloc.r; it->second = SourceLocation {{ srcloc.name == 0 ? StringRef() : StringRef( StringRef::Ptr, srcloc.name ), StringRef( StringRef::Ptr, srcloc.function ), StringRef( StringRef::Ptr, srcloc.file ), srcloc.line, color }}; }