diff --git a/Source/ThirdParty/tracy/client/TracyProfiler.cpp b/Source/ThirdParty/tracy/client/TracyProfiler.cpp index c96fc5beb..837b36cc3 100644 --- a/Source/ThirdParty/tracy/client/TracyProfiler.cpp +++ b/Source/ThirdParty/tracy/client/TracyProfiler.cpp @@ -1480,7 +1480,7 @@ Profiler::Profiler() m_safeSendBuffer = (char*)tracy_malloc( SafeSendBufferSize ); -#ifndef _WIN32 +#ifndef TRACY_NO_PIPE pipe(m_pipe); # if defined __APPLE__ || defined BSD // FreeBSD/XNU don't have F_SETPIPE_SZ, so use the default @@ -1642,7 +1642,7 @@ Profiler::~Profiler() tracy_free( m_kcore ); #endif -#ifndef _WIN32 +#ifndef TRACY_NO_PIPE close( m_pipe[0] ); close( m_pipe[1] ); #endif @@ -3139,6 +3139,8 @@ char* Profiler::SafeCopyProlog( const char* data, size_t size ) { success = false; } +#elif !defined(TRACY_NO_PIPE) + memcpy(buf, data, size); #else // Send through the pipe to ensure safe reads for( size_t offset = 0; offset != size; /*in loop*/ ) diff --git a/Source/ThirdParty/tracy/tracy.Build.cs b/Source/ThirdParty/tracy/tracy.Build.cs index 9d54ca688..beb0e9f89 100644 --- a/Source/ThirdParty/tracy/tracy.Build.cs +++ b/Source/ThirdParty/tracy/tracy.Build.cs @@ -47,11 +47,15 @@ public class tracy : ThirdPartyModule switch (options.Platform.Target) { case TargetPlatform.Windows: + case TargetPlatform.XboxOne: + case TargetPlatform.XboxScarlett: options.PrivateDefinitions.Add("TRACY_DBGHELP_LOCK=FlaxDbgHelp"); + options.PrivateDefinitions.Add("TRACY_NO_PIPE"); break; case TargetPlatform.Switch: options.PrivateDefinitions.Add("TRACY_USE_MALLOC"); options.PrivateDefinitions.Add("TRACY_ONLY_IPV4"); + options.PrivateDefinitions.Add("TRACY_NO_PIPE"); break; } }