Link/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2025-03-20 07:40:02 +08:00
Code Issues Projects Wiki Activity

TRACY_ON_DEMAND_GPU_SYNC always checked with TRACY_ON_DEMAND

Browse Source
This commit is contained in:
Lectem 2021-12-20 22:05:40 +01:00
parent 0002878472
commit 3104c4ada3
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
TracyOpenGL.hpp
View File

@ -92,7 +92,7 @@ class GpuCtx
public: public:
GpuCtx() GpuCtx()
: m_context( GetGpuCtxCounter().fetch_add( 1, std::memory_order_relaxed ) ) : m_context( GetGpuCtxCounter().fetch_add( 1, std::memory_order_relaxed ) )
#ifdef TRACY_ON_DEMAND_GPU_SYNC #if defined( TRACY_ON_DEMAND ) && defined( TRACY_ON_DEMAND_GPU_SYNC )
, m_isContextReady( false ) , m_isContextReady( false )
#endif #endif
, m_head( 0 ) , m_head( 0 )
@ -100,7 +100,7 @@ public:
{ {
assert( m_context != 255 ); assert( m_context != 255 );
glGenQueries(QueryCount, m_query); glGenQueries(QueryCount, m_query);
#ifdef TRACY_ON_DEMAND_GPU_SYNC #if defined( TRACY_ON_DEMAND ) && defined( TRACY_ON_DEMAND_GPU_SYNC )
if(GetProfiler().IsConnected()) if(GetProfiler().IsConnected())
#endif #endif
SyncClockAndSendContextInfo(); SyncClockAndSendContextInfo();
@ -125,7 +125,7 @@ public:
{ {
ZoneScopedC( Color::Red4 ); ZoneScopedC( Color::Red4 );
#ifndef TRACY_ON_DEMAND_GPU_SYNC #if !( defined( TRACY_ON_DEMAND ) && defined( TRACY_ON_DEMAND_GPU_SYNC ) )
if (m_tail == m_head) return; if (m_tail == m_head) return;
#endif #endif
@ -190,10 +190,12 @@ private:
MemWrite( &item->gpuNewContext.flags, uint8_t(0) ); MemWrite( &item->gpuNewContext.flags, uint8_t(0) );
MemWrite( &item->gpuNewContext.type, GpuContextType::OpenGl ); MemWrite( &item->gpuNewContext.type, GpuContextType::OpenGl );
#if defined( TRACY_ON_DEMAND_GPU_SYNC ) #ifdef TRACY_ON_DEMAND
#ifdef TRACY_ON_DEMAND_GPU_SYNC
m_isContextReady = true; m_isContextReady = true;
#elif defined( TRACY_ON_DEMAND ) #else
GetProfiler().DeferItem( *item ); GetProfiler().DeferItem( *item );
#endif
#endif #endif
TracyLfqCommit; TracyLfqCommit;
@ -217,7 +219,7 @@ private:
return m_context; return m_context;
} }
#ifdef TRACY_ON_DEMAND_GPU_SYNC #if defined( TRACY_ON_DEMAND ) && defined( TRACY_ON_DEMAND_GPU_SYNC )
tracy_force_inline bool IsContextReady() const tracy_force_inline bool IsContextReady() const
{ {
return m_isContextReady; return m_isContextReady;
@ -226,7 +228,7 @@ private:
unsigned int m_query[QueryCount]; unsigned int m_query[QueryCount];
uint8_t m_context; uint8_t m_context;
#ifdef TRACY_ON_DEMAND_GPU_SYNC #if defined( TRACY_ON_DEMAND ) && defined( TRACY_ON_DEMAND_GPU_SYNC )
bool m_isContextReady; bool m_isContextReady;
#endif #endif
unsigned int m_head; unsigned int m_head;
@ -242,7 +244,7 @@ class GpuCtxScope
if ( !GetProfiler().IsConnected() ) return nullptr; if ( !GetProfiler().IsConnected() ) return nullptr;
#endif #endif
GpuCtx* ctx = GetGpuCtx().ptr; GpuCtx* ctx = GetGpuCtx().ptr;
#ifdef TRACY_ON_DEMAND_GPU_SYNC #if defined( TRACY_ON_DEMAND ) && defined( TRACY_ON_DEMAND_GPU_SYNC )
if ( ctx && !ctx->IsContextReady() ) return nullptr; if ( ctx && !ctx->IsContextReady() ) return nullptr;
#endif #endif
return ctx; return ctx;