From 891e1ac2802907e8f4af2acae50775c662aef012 Mon Sep 17 00:00:00 2001
From: Bartosz Taudul <wolf@nereid.pl>
Date: Tue, 15 Jun 2021 01:33:43 +0200
Subject: [PATCH] Read combine samples flag on server.

---
 server/TracyWorker.cpp | 1 +
 server/TracyWorker.hpp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp
index 4e010aec..3ff776d7 100644
--- a/server/TracyWorker.cpp
+++ b/server/TracyWorker.cpp
@@ -2843,6 +2843,7 @@ void Worker::Exec()
         m_ignoreMemFreeFaults = ( welcome.flags & WelcomeFlag::OnDemand ) || ( welcome.flags & WelcomeFlag::IsApple );
         m_data.cpuArch = (CpuArchitecture)welcome.cpuArch;
         m_codeTransfer = welcome.flags & WelcomeFlag::CodeTransfer;
+        m_combineSamples = welcome.flags & WelcomeFlag::CombineSamples;
         m_data.cpuId = welcome.cpuId;
         memcpy( m_data.cpuManufacturer, welcome.cpuManufacturer, 12 );
         m_data.cpuManufacturer[12] = '\0';
diff --git a/server/TracyWorker.hpp b/server/TracyWorker.hpp
index 13b0b7cf..81c23926 100644
--- a/server/TracyWorker.hpp
+++ b/server/TracyWorker.hpp
@@ -884,6 +884,7 @@ private:
     bool m_onDemand;
     bool m_ignoreMemFreeFaults;
     bool m_codeTransfer;
+    bool m_combineSamples;
 
     short_ptr<GpuCtxData> m_gpuCtxMap[256];
     uint32_t m_pendingCallstackId = 0;