diff options
author | Erik Kundiman <erik@megapahit.org> | 2024-12-15 12:34:37 +0800 |
---|---|---|
committer | Erik Kundiman <erik@megapahit.org> | 2024-12-15 12:34:37 +0800 |
commit | 3316ffb3b571b8730d26d6e8b2ee00fc9cbdf7c0 (patch) | |
tree | 200cd8497a4fdd782ac4dbfd2ad5fb1632e03275 /indra/llcommon/llcommon.cpp | |
parent | d4e433b37af94ee11880deeede74a87a728f4775 (diff) | |
parent | 5b77436cf0ad749d36e8f0c60077eeb24698d644 (diff) |
Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into 2024.09-ExtraFPS
Diffstat (limited to 'indra/llcommon/llcommon.cpp')
-rw-r--r-- | indra/llcommon/llcommon.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llcommon/llcommon.cpp b/indra/llcommon/llcommon.cpp index f1f3958fe0..84b35749cc 100644 --- a/indra/llcommon/llcommon.cpp +++ b/indra/llcommon/llcommon.cpp @@ -54,7 +54,7 @@ void* ll_tracy_new(size_t size) { throw std::bad_alloc(); } - TracyAlloc(ptr, size); + LL_PROFILE_ALLOC(ptr, size); return ptr; } @@ -70,7 +70,7 @@ void* operator new[](std::size_t count) void ll_tracy_delete(void* ptr) { - TracyFree(ptr); + LL_PROFILE_FREE(ptr); if (gProfilerEnabled) { //LL_PROFILE_ZONE_SCOPED_CATEGORY_MEMORY; @@ -102,13 +102,13 @@ void operator delete[](void* ptr) noexcept void *tracy_aligned_malloc(size_t size, size_t alignment) { auto ptr = ll_aligned_malloc_fallback(size, alignment); - if (ptr) TracyAlloc(ptr, size); + if (ptr) LL_PROFILE_ALLOC(ptr, size); return ptr; } void tracy_aligned_free(void *memblock) { - TracyFree(memblock); + LL_PROFILE_FREE(memblock); ll_aligned_free_fallback(memblock); } |