From 2f9a3f7046551272636683cb759d632fe7a44492 Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Sat, 25 Nov 2017 15:29:18 +0100 Subject: [PATCH] Colors are always in RGB order. --- TracyLua.hpp | 4 ++-- server/TracyView.cpp | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/TracyLua.hpp b/TracyLua.hpp index 7f671ddd..40e35660 100644 --- a/TracyLua.hpp +++ b/TracyLua.hpp @@ -111,7 +111,7 @@ namespace detail static inline int LuaZoneBegin( lua_State* L ) { - const uint32_t color = 0x00CC8855; + const uint32_t color = 0x005588CC; lua_Debug dbg; lua_getstack( L, 1, &dbg ); @@ -152,7 +152,7 @@ static inline int LuaZoneBegin( lua_State* L ) static inline int LuaZoneBeginN( lua_State* L ) { - const uint32_t color = 0x00CC8855; + const uint32_t color = 0x005588CC; lua_Debug dbg; lua_getstack( L, 1, &dbg ); diff --git a/server/TracyView.cpp b/server/TracyView.cpp index fbf7a984..8a6c6b88 100644 --- a/server/TracyView.cpp +++ b/server/TracyView.cpp @@ -1089,6 +1089,10 @@ void View::AddSourceLocationPayload( uint64_t ptr, char* data, size_t sz ) const auto nsz = sz - ( end - start ); + color = ( ( color & 0x00FF0000 ) >> 16 ) | + ( ( color & 0x0000FF00 ) ) | + ( ( color & 0x000000FF ) << 16 ); + SourceLocation srcloc { nsz == 0 ? StringRef() : StringRef( StringRef::Idx, StoreString( end, nsz ).idx ), StringRef( StringRef::Idx, func.idx ), StringRef( StringRef::Idx, source.idx ), line, color }; auto it = m_sourceLocationPayloadMap.find( &srcloc ); if( it == m_sourceLocationPayloadMap.end() )