mirror/VulkanMemoryAllocator
1
0
Fork 0
mirror of https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git synced 2024-11-10 10:41:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #185 from HindrikStegenga/master

Browse Source 
Disable aligned_alloc on macOS 11.0+ and revert behaviour.
This commit is contained in:
Adam Sawicki 2021-07-22 16:20:41 +02:00 committed by GitHub
commit 272ce716c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
include/vk_mem_alloc.h
View File

@ -4182,18 +4182,21 @@ static void* vma_aligned_alloc(size_t alignment, size_t size)
static void* vma_aligned_alloc(size_t alignment, size_t size) static void* vma_aligned_alloc(size_t alignment, size_t size)
{ {
#if defined(__APPLE__) && (defined(MAC_OS_X_VERSION_10_16) || defined(__IPHONE_14_0)) // Unfortunately, aligned_alloc causes VMA to crash due to it returning null pointers. (At least under 11.4)
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_16 || __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_14_0 // Therefore, for now disable this specific exception until a proper solution is found.
// For C++14, usr/include/malloc/_malloc.h declares aligned_alloc()) only //#if defined(__APPLE__) && (defined(MAC_OS_X_VERSION_10_16) || defined(__IPHONE_14_0))
// with the MacOSX11.0 SDK in Xcode 12 (which is what adds //#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_16 || __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_14_0
// MAC_OS_X_VERSION_10_16), even though the function is marked // // For C++14, usr/include/malloc/_malloc.h declares aligned_alloc()) only
// availabe for 10.15. That's why the preprocessor checks for 10.16 but // // with the MacOSX11.0 SDK in Xcode 12 (which is what adds
// the __builtin_available checks for 10.15. // // MAC_OS_X_VERSION_10_16), even though the function is marked
// People who use C++17 could call aligned_alloc with the 10.15 SDK already. // // availabe for 10.15. That's why the preprocessor checks for 10.16 but
if (__builtin_available(macOS 10.15, iOS 13, *)) // // the __builtin_available checks for 10.15.
return aligned_alloc(alignment, size); // // People who use C++17 could call aligned_alloc with the 10.15 SDK already.
#endif // if (__builtin_available(macOS 10.15, iOS 13, *))
#endif // return aligned_alloc(alignment, size);
//#endif
//#endif
// alignment must be >= sizeof(void*) // alignment must be >= sizeof(void*)
if(alignment < sizeof(void*)) if(alignment < sizeof(void*))
{ {