Merge remote-tracking branch 'origin/master' into hw

server/TracyFileRead.hpp

@@ -22,7 +22,7 @@
 
 #include "TracyFileHeader.hpp"
 #include "TracyMmap.hpp"
-#include "TracyYield.hpp"
+#include "../common/TracyYield.hpp"
 #include "../common/tracy_lz4.hpp"
 #include "../common/TracyForceInline.hpp"
 #include "../zstd/zstd.h"

server/TracyWorker.cpp

@@ -26,14 +26,14 @@
 
 #include "../common/TracyProtocol.hpp"
 #include "../common/TracySystem.hpp"
+#include "../common/TracyYield.hpp"
+#include "../common/TracyStackFrames.hpp"
 #include "TracyFileRead.hpp"
 #include "TracyFileWrite.hpp"
 #include "TracySort.hpp"
 #include "TracyTaskDispatch.hpp"
 #include "TracyVersion.hpp"
 #include "TracyWorker.hpp"
-#include "TracyYield.hpp"
-#include "../common/TracyStackFrames.hpp"
 
 namespace tracy
 {

server/TracyYield.hpp

@@ -1,26 +0,0 @@
-#ifndef __TRACYYIELD_HPP__
-#define __TRACYYIELD_HPP__
-
-#if defined __SSE2__ || defined _M_AMD64 || _M_IX86_FP == 2
-#  include <emmintrin.h>
-#else
-#  include <thread>
-#endif
-
-#include "../common/TracyForceInline.hpp"
-
-namespace tracy
-{
-
-static tracy_force_inline void YieldThread()
-{
-#if defined __SSE2__ || defined _M_AMD64 || _M_IX86_FP == 2
-    _mm_pause();
-#else
-    std::this_thread::yield();
-#endif
-}
-
-}
-
-#endif