izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Make MB3 default for Mac, move MB2/MB3 defines to common Apple Platform code

Browse Source 
#jira UE-215605
#rb zack.neyland

[CL 34019625 by florin pascu in ue5-main branch]
This commit is contained in:
florin pascu
2024-05-30 19:26:55 -04:00
parent ee86e6c607
commit 94f48a4f36
3 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Engine/Source/Runtime/Core/Private/Apple/ApplePlatformMemory.cpp
View File

@@ -288,17 +288,6 @@ void FApplePlatformMemory::Init()
}
// if USE_MALLOC_BINNED3 isn't configured enable it by default
#ifndef USE_MALLOC_BINNED3
#define USE_MALLOC_BINNED3 1
#endif // USE_MALLOC_BINNED3
// if USE_MALLOC_BINNED2 isn't configured enable it if USE_MALLOC_BINNED3 isn't true
#ifndef USE_MALLOC_BINNED2
#define USE_MALLOC_BINNED2 !USE_MALLOC_BINNED3
#endif // USE_MALLOC_BINNED2
void FApplePlatformMemory::SetAllocatorToUse()
{
// force Ansi allocator in particular cases

12
Engine/Source/Runtime/Core/Private/Mac/MacPlatformMemory.cpp
View File

@@ -11,6 +11,7 @@
#include "HAL/MallocMimalloc.h"
#include "HAL/MallocBinned.h"
#include "HAL/MallocBinned2.h"
#include "HAL/MallocBinned3.h"
#include "HAL/MallocStomp.h"
#include "Misc/AssertionMacros.h"
#include "Misc/CoreStats.h"
@@ -26,9 +27,6 @@ extern "C"
#include <crt_externs.h> // Needed for _NSGetArgc & _NSGetArgv
}
// Set rather to use BinnedMalloc2 for binned malloc, can be overridden below
#define USE_MALLOC_BINNED2 (1)
#if PLATFORM_MAC_X86
void* CFNetwork_CFAllocatorOperatorNew_Replacement(unsigned long Size, CFAllocatorRef Alloc)
{
@@ -97,6 +95,10 @@ FMalloc* FMacPlatformMemory::BaseAllocator()
{
AllocatorToUse = EMemoryAllocatorToUse::Binned2;
}
else if (USE_MALLOC_BINNED3)
{
AllocatorToUse = EMemoryAllocatorToUse::Binned3;
}
else
{
AllocatorToUse = EMemoryAllocatorToUse::Binned;
@@ -151,6 +153,10 @@ FMalloc* FMacPlatformMemory::BaseAllocator()
Instance = new FMallocBinned2();
break;
case EMemoryAllocatorToUse::Binned3:
Instance = new FMallocBinned3();
break;
default: // intentional fall-through
case EMemoryAllocatorToUse::Binned:
// [RCL] 2017-03-06 FIXME: perhaps BinnedPageSize should be used here, but leaving this change to the Mac platform owner.

14
Engine/Source/Runtime/Core/Public/Apple/ApplePlatformMemory.h
View File

@@ -14,6 +14,20 @@
NS_ASSUME_NONNULL_BEGIN
// if USE_MALLOC_BINNED3 isn't configured enable it by default
#ifndef USE_MALLOC_BINNED3
#define USE_MALLOC_BINNED3 1
#if PLATFORM_IOS
#define USE_512MB_MAX_MEMORY_PER_BLOCK_SIZE 1
#endif
#endif // USE_MALLOC_BINNED3
// if USE_MALLOC_BINNED2 isn't configured enable it if USE_MALLOC_BINNED3 isn't true
#ifndef USE_MALLOC_BINNED2
#define USE_MALLOC_BINNED2 !USE_MALLOC_BINNED3
#endif // USE_MALLOC_BINNED2
/**
* NSObject subclass that can be used to override the allocation functions to go through UE4's memory allocator.
* This ensures that memory allocated by custom Objective-C types can be tracked by UE4's tools and