Merge branch 'detour_alloc' into 'master'

Use RecastGlobalAllocator for Detour See merge request OpenMW/openmw!3678
OpenMW · Dec 26, 2023 · c3dfc8c · c3dfc8c
2 parents 5d53eb7 + 329500b
commit c3dfc8c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/components/detournavigator/recastglobalallocator.hpp b/components/detournavigator/recastglobalallocator.hpp
@@ -3,6 +3,7 @@
 
 #include "recasttempallocator.hpp"
 
+#include <DetourAlloc.h>
 #include <RecastAlloc.h>
 
 #include <cstdlib>
@@ -14,10 +15,14 @@ namespace DetourNavigator
     public:
         static void init() { instance(); }
 
-        static void* alloc(size_t size, rcAllocHint hint)
+        static void* recastAlloc(size_t size, rcAllocHint hint) { return alloc(size, hint == RC_ALLOC_TEMP); }
+
+        static void* detourAlloc(size_t size, dtAllocHint hint) { return alloc(size, hint == DT_ALLOC_TEMP); }
+
+        static void* alloc(size_t size, bool temp)
         {
             void* result = nullptr;
-            if (rcLikely(hint == RC_ALLOC_TEMP))
+            if (rcLikely(temp))
                 result = tempAllocator().alloc(size);
             if (rcUnlikely(!result))
                 result = allocPerm(size);
@@ -38,7 +43,11 @@ namespace DetourNavigator
         }
 
     private:
-        RecastGlobalAllocator() { rcAllocSetCustom(&RecastGlobalAllocator::alloc, &RecastGlobalAllocator::free); }
+        RecastGlobalAllocator()
+        {
+            rcAllocSetCustom(&RecastGlobalAllocator::recastAlloc, &RecastGlobalAllocator::free);
+            dtAllocSetCustom(&RecastGlobalAllocator::detourAlloc, &RecastGlobalAllocator::free);
+        }
 
         static RecastGlobalAllocator& instance()
         {

diff --git a/components/detournavigator/recasttempallocator.hpp b/components/detournavigator/recasttempallocator.hpp
@@ -52,7 +52,6 @@ namespace DetourNavigator
                 mTop = mPrev;
                 mPrev = getTempPtrPrev(mTop);
             }
-            return;
         }
 
     private:
-Original file line number
+Diff line change
@@ Expand Up / @@ -52,7 +52,6 @@ namespace DetourNavigator @@
                     mTop = mPrev;
                     mPrev = getTempPtrPrev(mTop);
                 }
-                return;
             }
         private:
@@ Expand Down @@