diff options
| author | Endre Oma <endre.88.oma@gmail.com> | 2016-09-01 17:56:41 +0200 |
|---|---|---|
| committer | Lenny Komow <lenny@lunarg.com> | 2016-09-01 11:29:32 -0600 |
| commit | 6794ba52cfba99b7dabf1c68cfe46d309602ecdd (patch) | |
| tree | 11ebc98561caea4f7672477bf46e5d441c31bf7a /include | |
| parent | 04586bce819f636fff644801c72739460413bb2b (diff) | |
| download | usermoji-6794ba52cfba99b7dabf1c68cfe46d309602ecdd.tar.xz | |
header: fix vulkan.hpp detection of 64-bit arch
The generator that produced vulkan.hpp for 1.0.25 seemed to ignore the 64-bit architecture test, thereby breaking 64-bit builds.
The macro VK_DEFINE_NON_DISPATCHABLE_HANDLE is always defined according to vulkan.h.
Diffstat (limited to 'include')
| -rw-r--r-- | include/vulkan/vulkan.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/vulkan/vulkan.hpp b/include/vulkan/vulkan.hpp index 473143bd..61e2f8e0 100644 --- a/include/vulkan/vulkan.hpp +++ b/include/vulkan/vulkan.hpp @@ -44,7 +44,7 @@ static_assert( VK_HEADER_VERSION == 25 , "Wrong VK_HEADER_VERSION!" ); // 32-bit vulkan is not typesafe for handles, so don't allow copy constructors on this platform by default. // To enable this feature on 32-bit platforms please define VULKAN_HPP_TYPESAFE_CONVERSION -#if !defined(VK_DEFINE_NON_DISPATCHABLE_HANDLE) +#if defined(__LP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__) ) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(__powerpc64__) #define VULKAN_HPP_TYPESAFE_CONVERSION 1 #endif |