diff options
| author | Mark Lobodzinski <mark@lunarg.com> | 2016-08-26 10:19:57 -0600 |
|---|---|---|
| committer | Mark Lobodzinski <mark@lunarg.com> | 2016-08-26 15:02:53 -0600 |
| commit | 32eb0c343d9da7c736d64ea2090bc88e3e9daf1a (patch) | |
| tree | e4e70f4a93d5ffa74020181da849a69a74acbd02 | |
| parent | c116f6e7a49759038d07e10a334709df96bfdbb0 (diff) | |
| download | usermoji-32eb0c343d9da7c736d64ea2090bc88e3e9daf1a.tar.xz | |
header: Update vk_platform.h to 1.0.24
Change-Id: Ic256fc2ae1214b26b32a3f61459235359cfd8249
| -rw-r--r-- | include/vulkan/vk_platform.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/vulkan/vk_platform.h b/include/vulkan/vk_platform.h index 5d0fc766..c2232ec8 100644 --- a/include/vulkan/vk_platform.h +++ b/include/vulkan/vk_platform.h @@ -51,13 +51,13 @@ extern "C" #define VKAPI_ATTR #define VKAPI_CALL __stdcall #define VKAPI_PTR VKAPI_CALL -#elif defined(__ANDROID__) && defined(__ARM_EABI__) && !defined(__ARM_ARCH_7A__) - // Android does not support Vulkan in native code using the "armeabi" ABI. - #error "Vulkan requires the 'armeabi-v7a' or 'armeabi-v7a-hard' ABI on 32-bit ARM CPUs" -#elif defined(__ANDROID__) && defined(__ARM_ARCH_7A__) - // On Android/ARMv7a, Vulkan functions use the armeabi-v7a-hard calling - // convention, even if the application's native code is compiled with the - // armeabi-v7a calling convention. +#elif defined(__ANDROID__) && defined(__ARM_ARCH) && __ARM_ARCH < 7 + #error "Vulkan isn't supported for the 'armeabi' NDK ABI" +#elif defined(__ANDROID__) && __ARM_ARCH >= 7 && __ARM_32BIT_STATE + // On Android 32-bit ARM targets, Vulkan functions use the "hardfloat" + // calling convention, i.e. float parameters are passed in registers. This + // is true even if the rest of the application passes floats on the stack, + // as it does by default when compiling for the armeabi-v7a NDK ABI. #define VKAPI_ATTR __attribute__((pcs("aapcs-vfp"))) #define VKAPI_CALL #define VKAPI_PTR VKAPI_ATTR |