Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into 2024.09-ExtraFPS

2 files changed, 5 insertions, 5 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);
 }
 
diff --git a/indra/llcommon/llmemory.h b/indra/llcommon/llmemory.h
index 671ebc38e2..4a9359f8e2 100644
--- a/indra/llcommon/llmemory.h
+++ b/indra/llcommon/llmemory.h
@@ -226,7 +226,7 @@ inline void* ll_aligned_realloc_16(void* ptr, size_t size, size_t old_size) // r
         ll_aligned_free_16(ptr);
     }
 #endif
-    LL_PROFILE_ALLOC(ptr, size);
+    LL_PROFILE_ALLOC(ret, size);
     return ret;
 }