AuroraMiddleware/VulkanMemoryAllocator
1
0
Fork 0
mirror of https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator synced 2024-11-05 12:20:07 +00:00
Code Issues Projects Releases Wiki Activity

mac: Only call system aligned_alloc() with the 11.0+ SDK.

Browse Source 
The 10.15 SDK only declares it for C++17 and C11.  In Chromium, we only
call this from .cc files, and these are C++14 still for now.

The 11.0 SDK declares it independent of language version (as long as
__DARWIN_C_LEVEL >= __DARWIN_C_FULL, which it is by default, at least
on macOS).

So this calls the system version in fewer scenarios than possible,
but it keeps the preprocessor checks fairly small.

Bug: chromium:1098741
Change-Id: I1e30f88bb040876bca2b59adee0a1cff33b9ff03
This commit is contained in:
Nico Weber 2020-06-25 18:43:09 -04:00 committed by Peng Huang
parent c331971b30
commit 08bce5328b
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/vk_mem_alloc.h
View File

@ -3962,8 +3962,14 @@ void *vma_aligned_alloc(size_t alignment, size_t size)
void *vma_aligned_alloc(size_t alignment, size_t size)
{
#if defined(__APPLE__) && (defined(MAC_OS_X_VERSION_10_15) || defined(__IPHONE_13_0))
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_15 || __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_13_0
#if defined(__APPLE__) && (defined(MAC_OS_X_VERSION_10_16) || defined(__IPHONE_14_0))
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_16 || __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_14_0
// 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), even though the function is marked
// availabe for 10.15. That's why the preprocessor checks for 10.16 but
// the __builtin_available checks for 10.15.
// People who use C++17 could call aligned_alloc with the 10.15 SDK already.
if (__builtin_available(macOS 10.15, iOS 13, *))
return aligned_alloc(alignment, size);
#endif