diff options
| author | Runitai Linden <davep@lindenlab.com> | 2021-09-22 16:50:20 -0500 |
|---|---|---|
| committer | Runitai Linden <davep@lindenlab.com> | 2021-09-22 16:50:20 -0500 |
| commit | 9cff7ebc0cf7850b603ef4a4fb1435f72b678735 (patch) | |
| tree | cd3c2a86f38f5d218e253e17b0c32e0b9603cf8d /indra/llcommon | |
| parent | b4bb74c5def3175d99d672b0b26f941b756f5f45 (diff) | |
| parent | b1c32db37f74de715b4d6f9e98653f482e05df51 (diff) | |
Merge remote-tracking branch 'remotes/origin/DRTVWR-541' into DRTVWR-546
# Conflicts:
# indra/llcommon/linden_common.h
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/linden_common.h | 4 | ||||
| -rw-r--r-- | indra/llcommon/llprofiler.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/indra/llcommon/linden_common.h b/indra/llcommon/linden_common.h index b2c5be6b76..a228fd22be 100644 --- a/indra/llcommon/linden_common.h +++ b/indra/llcommon/linden_common.h @@ -28,7 +28,7 @@ #define LL_LINDEN_COMMON_H #include "llprofiler.h" -#if (TRACY_ENABLE) // hooks for memory profiling +#if TRACY_ENABLE && !defined(LL_PROFILER_ENABLE_TRACY_OPENGL) // hooks for memory profiling void *tracy_aligned_malloc(size_t size, size_t alignment); void tracy_aligned_free(void *memblock); #define _aligned_malloc(X, Y) tracy_aligned_malloc((X), (Y)) @@ -68,6 +68,4 @@ void tracy_aligned_free(void *memblock); #include "llerror.h" #include "llfile.h" -#include "llprofiler.h" // must be before fast timer; needed due to LLThreads potentially needing access to tracy - #endif diff --git a/indra/llcommon/llprofiler.h b/indra/llcommon/llprofiler.h index 62e649913b..62ec20fa44 100644 --- a/indra/llcommon/llprofiler.h +++ b/indra/llcommon/llprofiler.h @@ -45,6 +45,9 @@ // #define TRACY_ONLY_LOCALHOST 1 #define TRACY_ONLY_IPV4 1 #include "Tracy.hpp" + + // Mutually exclusive with detailed memory tracing + #define LL_PROFILER_ENABLE_TRACY_OPENGL 0 #endif #if LL_PROFILER_CONFIGURATION == LL_PROFILER_CONFIG_TRACY |