From 20aab31cdd955b15b26f4be42d46a965008d980f Mon Sep 17 00:00:00 2001 From: AiraYumi Date: Fri, 5 Apr 2024 22:13:16 -0400 Subject: [PATCH] Revert "enable tracy for linux64" --- indra/llcommon/llprofiler.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/indra/llcommon/llprofiler.h b/indra/llcommon/llprofiler.h index 82cbcde76fb..428702e0e75 100644 --- a/indra/llcommon/llprofiler.h +++ b/indra/llcommon/llprofiler.h @@ -74,10 +74,6 @@ #define LL_PROFILER_CONFIGURATION LL_PROFILER_CONFIG_FAST_TIMER #endif -#if LL_PROFILER_CONFIGURATION == LL_PROFILER_CONFIG_TRACY || LL_PROFILER_CONFIGURATION == LL_PROFILER_CONFIG_TRACY_FAST_TIMER - #include "Tracy.hpp" -#endif - extern thread_local bool gProfilerEnabled; // This is being used to control memory allocations // We use the active flag to control deferred profiling. // It is functionally separate to the (poorly named) gProfilerEnabled flag @@ -95,6 +91,7 @@ namespace LLProfiler // #define TRACY_NO_BROADCAST 1 // #define TRACY_ONLY_LOCALHOST 1 #define TRACY_ONLY_IPV4 1 + #include "Tracy.hpp" // Fixed mutual exclusion issues with RAM and GPU. NOTE: This might still break on Apple in which case we'll need to restrict that platform //// GPU Mutually exclusive with detailed memory tracing // #define LL_PROFILER_ENABLE_TRACY_OPENGL 0