mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-23 06:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Include frame offset in frame image message.

Browse Source
This commit is contained in:
Bartosz Taudul 2019-06-07 20:09:29 +02:00
parent 8c912890f0
commit 784c4da53a
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Tracy.hpp
View File

@ -24,7 +24,7 @@
#define FrameMarkStart(x) #define FrameMarkStart(x)
#define FrameMarkEnd(x) #define FrameMarkEnd(x)
#define FrameImage(x,y,z) #define FrameImage(x,y,z,w)
#define TracyLockable( type, varname ) type varname; #define TracyLockable( type, varname ) type varname;
#define TracyLockableN( type, varname, desc ) type varname; #define TracyLockableN( type, varname, desc ) type varname;
@ -88,7 +88,7 @@
#define FrameMarkStart( name ) tracy::Profiler::SendFrameMark( name, tracy::QueueType::FrameMarkMsgStart ); #define FrameMarkStart( name ) tracy::Profiler::SendFrameMark( name, tracy::QueueType::FrameMarkMsgStart );
#define FrameMarkEnd( name ) tracy::Profiler::SendFrameMark( name, tracy::QueueType::FrameMarkMsgEnd ); #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<type> varname { [] () -> const tracy::SourceLocationData* { static const tracy::SourceLocationData srcloc { nullptr, #type " " #varname, __FILE__, __LINE__, 0 }; return &srcloc; }() }; #define TracyLockable( type, varname ) tracy::Lockable<type> varname { [] () -> const tracy::SourceLocationData* { static const tracy::SourceLocationData srcloc { nullptr, #type " " #varname, __FILE__, __LINE__, 0 }; return &srcloc; }() };
#define TracyLockableN( type, varname, desc ) tracy::Lockable<type> varname { [] () -> const tracy::SourceLocationData* { static const tracy::SourceLocationData srcloc { nullptr, desc, __FILE__, __LINE__, 0 }; return &srcloc; }() }; #define TracyLockableN( type, varname, desc ) tracy::Lockable<type> varname { [] () -> const tracy::SourceLocationData* { static const tracy::SourceLocationData srcloc { nullptr, desc, __FILE__, __LINE__, 0 }; return &srcloc; }() };

3
client/TracyProfiler.hpp
View File

@ -170,7 +170,7 @@ public:
GetProfiler().m_serialLock.unlock(); 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 #ifdef TRACY_ON_DEMAND
if( !GetProfiler().IsConnected() ) return; if( !GetProfiler().IsConnected() ) return;
@ -186,6 +186,7 @@ public:
MemWrite( &item->frameImage.image, (uint64_t)ptr ); MemWrite( &item->frameImage.image, (uint64_t)ptr );
MemWrite( &item->frameImage.w, w ); MemWrite( &item->frameImage.w, w );
MemWrite( &item->frameImage.h, h ); MemWrite( &item->frameImage.h, h );
MemWrite( &item->frameImage.offset, offset );
tail.store( magic + 1, std::memory_order_release ); tail.store( magic + 1, std::memory_order_release );
} }

1
common/TracyQueue.hpp
View File

@ -105,6 +105,7 @@ struct QueueFrameImage
uint64_t image; // ptr uint64_t image; // ptr
uint16_t w; uint16_t w;
uint16_t h; uint16_t h;
uint8_t offset;
}; };
struct QueueSourceLocation struct QueueSourceLocation