diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2021-09-29 11:09:15 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2021-09-29 11:09:15 +0100 |
| commit | 7868ba0c60ff762f56180121fd117e350767934e (patch) | |
| tree | f5f5148d9c85a79c5be4e962fad77b4986da57a5 /indra/llcommon/linden_common.h | |
| parent | 04e1962d48e36f9055f0d893fc1b7a97d9e334c6 (diff) | |
| parent | 675514bdb372c25b50dd2c42b06633895c86b8ce (diff) | |
Merge branch 'DRTVWR-546' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-546
Diffstat (limited to 'indra/llcommon/linden_common.h')
| -rw-r--r-- | indra/llcommon/linden_common.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/llcommon/linden_common.h b/indra/llcommon/linden_common.h index 45ac43910c..a228fd22be 100644 --- a/indra/llcommon/linden_common.h +++ b/indra/llcommon/linden_common.h @@ -27,6 +27,14 @@ #ifndef LL_LINDEN_COMMON_H #define LL_LINDEN_COMMON_H +#include "llprofiler.h" +#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)) +#define _aligned_free(X) tracy_aligned_free((X)) +#endif + // *NOTE: Please keep includes here to a minimum! // // Files included here are included in every library .cpp file and @@ -60,6 +68,4 @@ #include "llerror.h" #include "llfile.h" -#include "llprofiler.h" // must be before fast timer; needed due to LLThreads potentially needing access to tracy - #endif |