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

Fix build when TRACY_HAS_CALLSTACK is not defined

Browse Source
This commit is contained in:
Balázs Végh 2022-11-09 09:54:29 +01:00
parent c0035a492f
commit 800a05e4e7
5 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/client/TracyProfiler.cpp
View File

@ -4172,6 +4172,7 @@ TRACY_API void ___tracy_emit_gpu_zone_begin( const struct ___tracy_gpu_zone_begi
TracyLfqCommitC; TracyLfqCommitC;
} }
#ifdef TRACY_HAS_CALLSTACK
TRACY_API void ___tracy_emit_gpu_zone_begin_callstack( const struct ___tracy_gpu_zone_begin_callstack_data data ) TRACY_API void ___tracy_emit_gpu_zone_begin_callstack( const struct ___tracy_gpu_zone_begin_callstack_data data )
{ {
tracy::GetProfiler().SendCallstack( data.depth ); tracy::GetProfiler().SendCallstack( data.depth );
@ -4183,6 +4184,7 @@ TRACY_API void ___tracy_emit_gpu_zone_begin_callstack( const struct ___tracy_gpu
tracy::MemWrite( &item->gpuZoneBegin.srcloc, data.srcloc ); tracy::MemWrite( &item->gpuZoneBegin.srcloc, data.srcloc );
TracyLfqCommitC; TracyLfqCommitC;
} }
#endif
TRACY_API void ___tracy_emit_gpu_zone_begin_alloc( const struct ___tracy_gpu_zone_begin_data data ) TRACY_API void ___tracy_emit_gpu_zone_begin_alloc( const struct ___tracy_gpu_zone_begin_data data )
{ {
@ -4195,6 +4197,7 @@ TRACY_API void ___tracy_emit_gpu_zone_begin_alloc( const struct ___tracy_gpu_zon
TracyLfqCommitC; TracyLfqCommitC;
} }
#ifdef TRACY_HAS_CALLSTACK
TRACY_API void ___tracy_emit_gpu_zone_begin_alloc_callstack( const struct ___tracy_gpu_zone_begin_callstack_data data ) TRACY_API void ___tracy_emit_gpu_zone_begin_alloc_callstack( const struct ___tracy_gpu_zone_begin_callstack_data data )
{ {
tracy::GetProfiler().SendCallstack( data.depth ); tracy::GetProfiler().SendCallstack( data.depth );
@ -4206,6 +4209,7 @@ TRACY_API void ___tracy_emit_gpu_zone_begin_alloc_callstack( const struct ___tra
tracy::MemWrite( &item->gpuZoneBegin.context, data.context ); tracy::MemWrite( &item->gpuZoneBegin.context, data.context );
TracyLfqCommitC; TracyLfqCommitC;
} }
#endif
TRACY_API void ___tracy_emit_gpu_time( const struct ___tracy_gpu_time_data data ) TRACY_API void ___tracy_emit_gpu_time( const struct ___tracy_gpu_time_data data )
{ {
@ -4273,6 +4277,7 @@ TRACY_API void ___tracy_emit_gpu_zone_begin_serial( const struct ___tracy_gpu_zo
tracy::Profiler::QueueSerialFinish(); tracy::Profiler::QueueSerialFinish();
} }
#ifdef TRACY_HAS_CALLSTACK
TRACY_API void ___tracy_emit_gpu_zone_begin_callstack_serial( const struct ___tracy_gpu_zone_begin_callstack_data data ) TRACY_API void ___tracy_emit_gpu_zone_begin_callstack_serial( const struct ___tracy_gpu_zone_begin_callstack_data data )
{ {
auto item = tracy::Profiler::QueueSerialCallstack( tracy::Callstack( data.depth ) ); auto item = tracy::Profiler::QueueSerialCallstack( tracy::Callstack( data.depth ) );
@ -4284,6 +4289,7 @@ TRACY_API void ___tracy_emit_gpu_zone_begin_callstack_serial( const struct ___tr
tracy::MemWrite( &item->gpuZoneBegin.context, data.context ); tracy::MemWrite( &item->gpuZoneBegin.context, data.context );
tracy::Profiler::QueueSerialFinish(); tracy::Profiler::QueueSerialFinish();
} }
#endif
TRACY_API void ___tracy_emit_gpu_zone_begin_alloc_serial( const struct ___tracy_gpu_zone_begin_data data ) TRACY_API void ___tracy_emit_gpu_zone_begin_alloc_serial( const struct ___tracy_gpu_zone_begin_data data )
{ {
@ -4297,6 +4303,7 @@ TRACY_API void ___tracy_emit_gpu_zone_begin_alloc_serial( const struct ___tracy_
tracy::Profiler::QueueSerialFinish(); tracy::Profiler::QueueSerialFinish();
} }
#ifdef TRACY_HAS_CALLSTACK
TRACY_API void ___tracy_emit_gpu_zone_begin_alloc_callstack_serial( const struct ___tracy_gpu_zone_begin_callstack_data data ) TRACY_API void ___tracy_emit_gpu_zone_begin_alloc_callstack_serial( const struct ___tracy_gpu_zone_begin_callstack_data data )
{ {
auto item = tracy::Profiler::QueueSerialCallstack( tracy::Callstack( data.depth ) ); auto item = tracy::Profiler::QueueSerialCallstack( tracy::Callstack( data.depth ) );
@ -4308,6 +4315,7 @@ TRACY_API void ___tracy_emit_gpu_zone_begin_alloc_callstack_serial( const struct
tracy::MemWrite( &item->gpuZoneBegin.context, data.context ); tracy::MemWrite( &item->gpuZoneBegin.context, data.context );
tracy::Profiler::QueueSerialFinish(); tracy::Profiler::QueueSerialFinish();
} }
#endif
TRACY_API void ___tracy_emit_gpu_time_serial( const struct ___tracy_gpu_time_data data ) TRACY_API void ___tracy_emit_gpu_time_serial( const struct ___tracy_gpu_time_data data )
{ {

4
public/tracy/TracyD3D11.hpp
View File

@ -275,6 +275,7 @@ public:
Profiler::QueueSerialFinish(); Profiler::QueueSerialFinish();
} }
#ifdef TRACY_HAS_CALLSTACK
tracy_force_inline D3D11ZoneScope( D3D11Ctx* ctx, const SourceLocationData* srcloc, int depth, bool is_active ) tracy_force_inline D3D11ZoneScope( D3D11Ctx* ctx, const SourceLocationData* srcloc, int depth, bool is_active )
#ifdef TRACY_ON_DEMAND #ifdef TRACY_ON_DEMAND
: m_active( is_active && GetProfiler().IsConnected() ) : m_active( is_active && GetProfiler().IsConnected() )
@ -303,6 +304,7 @@ public:
GetProfiler().SendCallstack( depth ); GetProfiler().SendCallstack( depth );
} }
#endif
tracy_force_inline D3D11ZoneScope(D3D11Ctx* ctx, uint32_t line, const char* source, size_t sourceSz, const char* function, size_t functionSz, const char* name, size_t nameSz, bool active) tracy_force_inline D3D11ZoneScope(D3D11Ctx* ctx, uint32_t line, const char* source, size_t sourceSz, const char* function, size_t functionSz, const char* name, size_t nameSz, bool active)
#ifdef TRACY_ON_DEMAND #ifdef TRACY_ON_DEMAND
@ -333,6 +335,7 @@ public:
Profiler::QueueSerialFinish(); Profiler::QueueSerialFinish();
} }
#ifdef TRACY_HAS_CALLSTACK
tracy_force_inline D3D11ZoneScope(D3D11Ctx* ctx, uint32_t line, const char* source, size_t sourceSz, const char* function, size_t functionSz, const char* name, size_t nameSz, int depth, bool active) tracy_force_inline D3D11ZoneScope(D3D11Ctx* ctx, uint32_t line, const char* source, size_t sourceSz, const char* function, size_t functionSz, const char* name, size_t nameSz, int depth, bool active)
#ifdef TRACY_ON_DEMAND #ifdef TRACY_ON_DEMAND
: m_active(active&& GetProfiler().IsConnected()) : m_active(active&& GetProfiler().IsConnected())
@ -361,6 +364,7 @@ public:
Profiler::QueueSerialFinish(); Profiler::QueueSerialFinish();
} }
#endif
tracy_force_inline ~D3D11ZoneScope() tracy_force_inline ~D3D11ZoneScope()
{ {

4
public/tracy/TracyD3D12.hpp
View File

@ -345,6 +345,7 @@ namespace tracy
Profiler::QueueSerialFinish(); Profiler::QueueSerialFinish();
} }
#ifdef TRACY_HAS_CALLSTACK
tracy_force_inline D3D12ZoneScope(D3D12QueueCtx* ctx, ID3D12GraphicsCommandList* cmdList, const SourceLocationData* srcLocation, int depth, bool active) tracy_force_inline D3D12ZoneScope(D3D12QueueCtx* ctx, ID3D12GraphicsCommandList* cmdList, const SourceLocationData* srcLocation, int depth, bool active)
#ifdef TRACY_ON_DEMAND #ifdef TRACY_ON_DEMAND
: m_active(active&& GetProfiler().IsConnected()) : m_active(active&& GetProfiler().IsConnected())
@ -370,6 +371,7 @@ namespace tracy
Profiler::QueueSerialFinish(); Profiler::QueueSerialFinish();
} }
#endif
tracy_force_inline D3D12ZoneScope(D3D12QueueCtx* ctx, uint32_t line, const char* source, size_t sourceSz, const char* function, size_t functionSz, const char* name, size_t nameSz, ID3D12GraphicsCommandList* cmdList, bool active) tracy_force_inline D3D12ZoneScope(D3D12QueueCtx* ctx, uint32_t line, const char* source, size_t sourceSz, const char* function, size_t functionSz, const char* name, size_t nameSz, ID3D12GraphicsCommandList* cmdList, bool active)
#ifdef TRACY_ON_DEMAND #ifdef TRACY_ON_DEMAND
@ -399,6 +401,7 @@ namespace tracy
Profiler::QueueSerialFinish(); Profiler::QueueSerialFinish();
} }
#ifdef TRACY_HAS_CALLSTACK
tracy_force_inline D3D12ZoneScope(D3D12QueueCtx* ctx, uint32_t line, const char* source, size_t sourceSz, const char* function, size_t functionSz, const char* name, size_t nameSz, ID3D12GraphicsCommandList* cmdList, int depth, bool active) tracy_force_inline D3D12ZoneScope(D3D12QueueCtx* ctx, uint32_t line, const char* source, size_t sourceSz, const char* function, size_t functionSz, const char* name, size_t nameSz, ID3D12GraphicsCommandList* cmdList, int depth, bool active)
#ifdef TRACY_ON_DEMAND #ifdef TRACY_ON_DEMAND
: m_active(active&& GetProfiler().IsConnected()) : m_active(active&& GetProfiler().IsConnected())
@ -426,6 +429,7 @@ namespace tracy
Profiler::QueueSerialFinish(); Profiler::QueueSerialFinish();
} }
#endif
tracy_force_inline ~D3D12ZoneScope() tracy_force_inline ~D3D12ZoneScope()
{ {

4
public/tracy/TracyOpenCL.hpp
View File

@ -255,6 +255,7 @@ namespace tracy {
Profiler::QueueSerialFinish(); Profiler::QueueSerialFinish();
} }
#ifdef TRACY_HAS_CALLSTACK
tracy_force_inline OpenCLCtxScope(OpenCLCtx* ctx, const SourceLocationData* srcLoc, int depth, bool is_active) tracy_force_inline OpenCLCtxScope(OpenCLCtx* ctx, const SourceLocationData* srcLoc, int depth, bool is_active)
#ifdef TRACY_ON_DEMAND #ifdef TRACY_ON_DEMAND
: m_active(is_active&& GetProfiler().IsConnected()) : m_active(is_active&& GetProfiler().IsConnected())
@ -279,6 +280,7 @@ namespace tracy {
MemWrite(&item->gpuZoneBegin.context, ctx->GetId()); MemWrite(&item->gpuZoneBegin.context, ctx->GetId());
Profiler::QueueSerialFinish(); Profiler::QueueSerialFinish();
} }
#endif
tracy_force_inline OpenCLCtxScope(OpenCLCtx* ctx, uint32_t line, const char* source, size_t sourceSz, const char* function, size_t functionSz, const char* name, size_t nameSz, bool is_active) tracy_force_inline OpenCLCtxScope(OpenCLCtx* ctx, uint32_t line, const char* source, size_t sourceSz, const char* function, size_t functionSz, const char* name, size_t nameSz, bool is_active)
#ifdef TRACY_ON_DEMAND #ifdef TRACY_ON_DEMAND
@ -304,6 +306,7 @@ namespace tracy {
Profiler::QueueSerialFinish(); Profiler::QueueSerialFinish();
} }
#ifdef TRACY_HAS_CALLSTACK
tracy_force_inline OpenCLCtxScope(OpenCLCtx* ctx, uint32_t line, const char* source, size_t sourceSz, const char* function, size_t functionSz, const char* name, size_t nameSz, int depth, bool is_active) tracy_force_inline OpenCLCtxScope(OpenCLCtx* ctx, uint32_t line, const char* source, size_t sourceSz, const char* function, size_t functionSz, const char* name, size_t nameSz, int depth, bool is_active)
#ifdef TRACY_ON_DEMAND #ifdef TRACY_ON_DEMAND
: m_active(is_active && GetProfiler().IsConnected()) : m_active(is_active && GetProfiler().IsConnected())
@ -327,6 +330,7 @@ namespace tracy {
MemWrite(&item->gpuZoneBegin.context, ctx->GetId()); MemWrite(&item->gpuZoneBegin.context, ctx->GetId());
Profiler::QueueSerialFinish(); Profiler::QueueSerialFinish();
} }
#endif
tracy_force_inline void SetEvent(cl_event event) tracy_force_inline void SetEvent(cl_event event)
{ {

4
public/tracy/TracyVulkan.hpp
View File

@ -360,6 +360,7 @@ public:
Profiler::QueueSerialFinish(); Profiler::QueueSerialFinish();
} }
#ifdef TRACY_HAS_CALLSTACK
tracy_force_inline VkCtxScope( VkCtx* ctx, const SourceLocationData* srcloc, VkCommandBuffer cmdbuf, int depth, bool is_active ) tracy_force_inline VkCtxScope( VkCtx* ctx, const SourceLocationData* srcloc, VkCommandBuffer cmdbuf, int depth, bool is_active )
#ifdef TRACY_ON_DEMAND #ifdef TRACY_ON_DEMAND
: m_active( is_active && GetProfiler().IsConnected() ) : m_active( is_active && GetProfiler().IsConnected() )
@ -383,6 +384,7 @@ public:
MemWrite( &item->gpuZoneBegin.context, ctx->GetId() ); MemWrite( &item->gpuZoneBegin.context, ctx->GetId() );
Profiler::QueueSerialFinish(); Profiler::QueueSerialFinish();
} }
#endif
tracy_force_inline VkCtxScope( VkCtx* ctx, uint32_t line, const char* source, size_t sourceSz, const char* function, size_t functionSz, const char* name, size_t nameSz, VkCommandBuffer cmdbuf, bool is_active ) tracy_force_inline VkCtxScope( VkCtx* ctx, uint32_t line, const char* source, size_t sourceSz, const char* function, size_t functionSz, const char* name, size_t nameSz, VkCommandBuffer cmdbuf, bool is_active )
#ifdef TRACY_ON_DEMAND #ifdef TRACY_ON_DEMAND
@ -409,6 +411,7 @@ public:
Profiler::QueueSerialFinish(); Profiler::QueueSerialFinish();
} }
#ifdef TRACY_HAS_CALLSTACK
tracy_force_inline VkCtxScope( VkCtx* ctx, uint32_t line, const char* source, size_t sourceSz, const char* function, size_t functionSz, const char* name, size_t nameSz, VkCommandBuffer cmdbuf, int depth, bool is_active ) tracy_force_inline VkCtxScope( VkCtx* ctx, uint32_t line, const char* source, size_t sourceSz, const char* function, size_t functionSz, const char* name, size_t nameSz, VkCommandBuffer cmdbuf, int depth, bool is_active )
#ifdef TRACY_ON_DEMAND #ifdef TRACY_ON_DEMAND
: m_active( is_active && GetProfiler().IsConnected() ) : m_active( is_active && GetProfiler().IsConnected() )
@ -433,6 +436,7 @@ public:
MemWrite( &item->gpuZoneBegin.context, ctx->GetId() ); MemWrite( &item->gpuZoneBegin.context, ctx->GetId() );
Profiler::QueueSerialFinish(); Profiler::QueueSerialFinish();
} }
#endif
tracy_force_inline ~VkCtxScope() tracy_force_inline ~VkCtxScope()
{ {