diff --git a/TracyOpenGL.hpp b/TracyOpenGL.hpp index 4bdb4d07..65444857 100644 --- a/TracyOpenGL.hpp +++ b/TracyOpenGL.hpp @@ -54,8 +54,8 @@ public: auto& tail = token->get_tail_index(); auto item = token->enqueue_begin( magic ); item->hdr.type = QueueType::GpuNewContext; - item->gpuNewContext.cputime = tcpu; - item->gpuNewContext.gputime = tgpu; + item->gpuNewContext.cpuTime = tcpu; + item->gpuNewContext.gpuTime = tgpu; item->gpuNewContext.thread = GetThreadHandle(); item->gpuNewContext.context = m_context; item->gpuNewContext.accuracyBits = bits; diff --git a/common/TracyQueue.hpp b/common/TracyQueue.hpp index 067d5586..c7c68256 100644 --- a/common/TracyQueue.hpp +++ b/common/TracyQueue.hpp @@ -136,8 +136,8 @@ struct QueueMessage struct QueueGpuNewContext { - int64_t cputime; - int64_t gputime; + int64_t cpuTime; + int64_t gpuTime; uint64_t thread; uint16_t context; uint8_t accuracyBits; diff --git a/server/TracyView.cpp b/server/TracyView.cpp index e6c6fc40..5048f015 100644 --- a/server/TracyView.cpp +++ b/server/TracyView.cpp @@ -844,7 +844,7 @@ void View::ProcessGpuNewContext( const QueueGpuNewContext& ev ) assert( m_gpuCtxMap.find( ev.context ) == m_gpuCtxMap.end() ); auto gpu = m_slab.AllocInit(); - gpu->timeDiff = int64_t( ev.cputime * m_timerMul - ev.gputime ); + gpu->timeDiff = int64_t( ev.cpuTime * m_timerMul - ev.gpuTime ); gpu->thread = ev.thread; gpu->accuracyBits = ev.accuracyBits; gpu->count = 0;