diff --git a/Tracy.hpp b/Tracy.hpp index 4e1ab1d7..b40e3c19 100644 --- a/Tracy.hpp +++ b/Tracy.hpp @@ -24,7 +24,7 @@ #define FrameMarkStart(x) #define FrameMarkEnd(x) -#define FrameImage(x,y,z) +#define FrameImage(x,y,z,w) #define TracyLockable( type, varname ) type varname; #define TracyLockableN( type, varname, desc ) type varname; @@ -88,7 +88,7 @@ #define FrameMarkStart( name ) tracy::Profiler::SendFrameMark( name, tracy::QueueType::FrameMarkMsgStart ); #define FrameMarkEnd( name ) tracy::Profiler::SendFrameMark( name, tracy::QueueType::FrameMarkMsgEnd ); -#define FrameImage( image, width, height ) tracy::Profiler::SendFrameImage( image, width, height ); +#define FrameImage( image, width, height, offset ) tracy::Profiler::SendFrameImage( image, width, height, offset ); #define TracyLockable( type, varname ) tracy::Lockable varname { [] () -> const tracy::SourceLocationData* { static const tracy::SourceLocationData srcloc { nullptr, #type " " #varname, __FILE__, __LINE__, 0 }; return &srcloc; }() }; #define TracyLockableN( type, varname, desc ) tracy::Lockable varname { [] () -> const tracy::SourceLocationData* { static const tracy::SourceLocationData srcloc { nullptr, desc, __FILE__, __LINE__, 0 }; return &srcloc; }() }; diff --git a/client/TracyProfiler.hpp b/client/TracyProfiler.hpp index 8679104c..378c4e58 100644 --- a/client/TracyProfiler.hpp +++ b/client/TracyProfiler.hpp @@ -170,7 +170,7 @@ public: GetProfiler().m_serialLock.unlock(); } - static tracy_force_inline void SendFrameImage( void* image, uint16_t w, uint16_t h ) + static tracy_force_inline void SendFrameImage( void* image, uint16_t w, uint16_t h, uint8_t offset ) { #ifdef TRACY_ON_DEMAND if( !GetProfiler().IsConnected() ) return; @@ -186,6 +186,7 @@ public: MemWrite( &item->frameImage.image, (uint64_t)ptr ); MemWrite( &item->frameImage.w, w ); MemWrite( &item->frameImage.h, h ); + MemWrite( &item->frameImage.offset, offset ); tail.store( magic + 1, std::memory_order_release ); } diff --git a/common/TracyQueue.hpp b/common/TracyQueue.hpp index 51ad6249..d7a5ffc9 100644 --- a/common/TracyQueue.hpp +++ b/common/TracyQueue.hpp @@ -105,6 +105,7 @@ struct QueueFrameImage uint64_t image; // ptr uint16_t w; uint16_t h; + uint8_t offset; }; struct QueueSourceLocation