From a93344b4db2654e91b4daa9f2709daf448c03a8e Mon Sep 17 00:00:00 2001 From: AiraYumi Date: Mon, 1 Apr 2024 21:41:21 -0400 Subject: enable tracy for linux and build fix --- autobuild.xml | 14 ++++++++++++++ indra/llcommon/llprofiler.h | 5 ++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/autobuild.xml b/autobuild.xml index 5fbccd0d4c..612421f8c9 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2616,6 +2616,20 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors name windows64 + linux64 + + archive + + hash + 0cac6af362861d90cdd3dc4adfff95f54e619f4a + hash_algorithm + sha1 + url + https://github.com/secondlife/3p-tracy/releases/download/v0.8.1%2Br1/tracy-v0.8.1.38bf5f3-linux64-38bf5f3.tar.zst + + name + linux64 + license bsd diff --git a/indra/llcommon/llprofiler.h b/indra/llcommon/llprofiler.h index af5e5777bf..0297bbe592 100644 --- a/indra/llcommon/llprofiler.h +++ b/indra/llcommon/llprofiler.h @@ -74,6 +74,10 @@ #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; #if defined(LL_PROFILER_CONFIGURATION) && (LL_PROFILER_CONFIGURATION > LL_PROFILER_CONFIG_NONE) @@ -84,7 +88,6 @@ extern thread_local bool gProfilerEnabled; // #define TRACY_NO_BROADCAST 1 // #define TRACY_ONLY_LOCALHOST 1 #define TRACY_ONLY_IPV4 1 - #include "Tracy.hpp" // Enable OpenGL profiling #define LL_PROFILER_ENABLE_TRACY_OPENGL 0 -- cgit v1.2.3