id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-03-15 07:00:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use custom _aligned_alloc on macOS for better SDK and runtime portability

Browse source
This commit is contained in:
Stephen Saunders 2021-06-11 11:12:49 -04:00
parent ab9857987c
commit 4c3a9ad3df
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
neo/renderer/Vulkan/vma.h
View file

@ -770,11 +770,9 @@ remove them if not needed.
//SRS - Modified from vkQuake2, to compile with C++11 on OSX versions with no aligned_alloc
#if defined(__APPLE__)
#if !defined(MAC_OS_X_VERSION_10_16) && defined(__cplusplus) && __cplusplus < 201703L
// For C++14, usr/include/malloc/_malloc.h declares aligned_alloc() only with
// the MacOSX11.0 SDK in Xcode 12 (which is what adds MAC_OS_X_VERSION_10_16).
// For C++17 aligned_alloc is available with the 10.15 SDK already.
void* aligned_alloc( size_t alignment, size_t size )
//SRS - aligned_alloc available on macOS starting with C++17 on 10.15 SDK, C++14 on 11.0 SDK
//SRS - Instead, use custom _aligned_alloc for portability across macOS SDK and runtime versions
void* _aligned_alloc( size_t alignment, size_t size )
{
// alignment must be >= sizeof(void*)
if( alignment < sizeof( void* ) )
@ -789,7 +787,6 @@ void* aligned_alloc( size_t alignment, size_t size )
}
return NULL;
}
#endif
#elif !defined(_WIN32)
#include <malloc.h> // for aligned_alloc()
#endif
@ -825,6 +822,8 @@ void* aligned_alloc( size_t alignment, size_t size )
#ifndef VMA_SYSTEM_ALIGNED_MALLOC
#if defined(_WIN32)
#define VMA_SYSTEM_ALIGNED_MALLOC(size, alignment) (_aligned_malloc((size), (alignment)))
#elif defined(__APPLE__)
#define VMA_SYSTEM_ALIGNED_MALLOC(size, alignment) (_aligned_alloc((alignment), (size) ))
#else
#define VMA_SYSTEM_ALIGNED_MALLOC(size, alignment) (aligned_alloc((alignment), (size) ))
#endif