diff --git a/TracyOpenGL.hpp b/TracyOpenGL.hpp index ae0d59ed..9c0489ea 100644 --- a/TracyOpenGL.hpp +++ b/TracyOpenGL.hpp @@ -122,19 +122,6 @@ public: tail.store( magic + 1, std::memory_order_release ); m_tail = ( m_tail + 1 ) % QueryCount; } - - { - int64_t tgpu; - glGetInteger64v( GL_TIMESTAMP, &tgpu ); - int64_t tcpu = Profiler::GetTime(); - - auto item = token->enqueue_begin( magic ); - MemWrite( &item->hdr.type, QueueType::GpuResync ); - MemWrite( &item->gpuResync.cpuTime, tcpu ); - MemWrite( &item->gpuResync.gpuTime, tgpu ); - MemWrite( &item->gpuResync.context, m_context ); - tail.store( magic + 1, std::memory_order_release ); - } } private: diff --git a/common/TracyQueue.hpp b/common/TracyQueue.hpp index 0f257a85..d91e3154 100644 --- a/common/TracyQueue.hpp +++ b/common/TracyQueue.hpp @@ -34,7 +34,6 @@ enum class QueueType : uint8_t GpuZoneBeginCallstack, GpuZoneEnd, GpuTime, - GpuResync, MemAlloc, MemFree, MemAllocCallstack, @@ -195,13 +194,6 @@ struct QueueGpuTime uint8_t context; }; -struct QueueGpuResync -{ - int64_t cpuTime; - int64_t gpuTime; - uint8_t context; -}; - struct QueueMemAlloc { int64_t time; @@ -267,7 +259,6 @@ struct QueueItem QueueGpuZoneBegin gpuZoneBegin; QueueGpuZoneEnd gpuZoneEnd; QueueGpuTime gpuTime; - QueueGpuResync gpuResync; QueueMemAlloc memAlloc; QueueMemFree memFree; QueueCallstackMemory callstackMemory; @@ -308,7 +299,6 @@ static const size_t QueueDataSize[] = { sizeof( QueueHeader ) + sizeof( QueueGpuZoneBegin ), // callstack sizeof( QueueHeader ) + sizeof( QueueGpuZoneEnd ), sizeof( QueueHeader ) + sizeof( QueueGpuTime ), - sizeof( QueueHeader ) + sizeof( QueueGpuResync ), sizeof( QueueHeader ) + sizeof( QueueMemAlloc ), sizeof( QueueHeader ) + sizeof( QueueMemFree ), sizeof( QueueHeader ) + sizeof( QueueMemAlloc ), // callstack diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp index 75a298fb..adb14500 100644 --- a/server/TracyWorker.cpp +++ b/server/TracyWorker.cpp @@ -1570,9 +1570,6 @@ void Worker::Process( const QueueItem& ev ) case QueueType::GpuTime: ProcessGpuTime( ev.gpuTime ); break; - case QueueType::GpuResync: - ProcessGpuResync( ev.gpuResync ); - break; case QueueType::MemAlloc: ProcessMemAlloc( ev.memAlloc ); break; @@ -2063,42 +2060,6 @@ void Worker::ProcessGpuTime( const QueueGpuTime& ev ) } } -void Worker::ProcessGpuResync( const QueueGpuResync& ev ) -{ - auto ctx = m_gpuCtxMap[ev.context]; - assert( ctx ); - - int64_t gpuTime; - if( ctx->period == 1.f ) - { - gpuTime = ev.gpuTime; - } - else - { - gpuTime = int64_t( double( ctx->period ) * ev.gpuTime ); // precision loss - } - - const auto timeDiff = TscTime( ev.cpuTime ) - gpuTime; - - if( ctx->queue.empty() ) - { - assert( ctx->resync.empty() ); - ctx->timeDiff = timeDiff; - } - else - { - if( ctx->resync.empty() ) - { - ctx->resync.push_back( { timeDiff, uint16_t( ctx->queue.size() ) } ); - } - else - { - const auto last = ctx->resync.back().events; - ctx->resync.push_back( { timeDiff, uint16_t( ctx->queue.size() - last ) } ); - } - } -} - void Worker::ProcessMemAlloc( const QueueMemAlloc& ev ) { const auto time = TscTime( ev.time ); diff --git a/server/TracyWorker.hpp b/server/TracyWorker.hpp index 943c74e0..b914fbc7 100644 --- a/server/TracyWorker.hpp +++ b/server/TracyWorker.hpp @@ -234,7 +234,6 @@ private: tracy_force_inline void ProcessGpuZoneBeginCallstack( const QueueGpuZoneBegin& ev ); tracy_force_inline void ProcessGpuZoneEnd( const QueueGpuZoneEnd& ev ); tracy_force_inline void ProcessGpuTime( const QueueGpuTime& ev ); - tracy_force_inline void ProcessGpuResync( const QueueGpuResync& ev ); tracy_force_inline void ProcessMemAlloc( const QueueMemAlloc& ev ); tracy_force_inline void ProcessMemFree( const QueueMemFree& ev ); tracy_force_inline void ProcessMemAllocCallstack( const QueueMemAlloc& ev );