diff --git a/Vulkan-Docs b/Vulkan-Docs index b972597..368b08a 160000 --- a/Vulkan-Docs +++ b/Vulkan-Docs @@ -1 +1 @@ -Subproject commit b97259786d817bfda38a3b0374782949011e51db +Subproject commit 368b08a7b2add6db489d0af766bd74854e1c87d4 diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp index 11f6379..9ca0c9d 100644 --- a/VulkanHppGenerator.cpp +++ b/VulkanHppGenerator.cpp @@ -309,20 +309,20 @@ std::string const versionCheckHeader = ( ); std::string const inlineHeader = {R"( -#if !defined(VULKAN_HPP_INLINE) -# if defined(__clang___) -# if __has_attribute(always_inline) -# define VULKAN_HPP_INLINE __attribute__((always_inline)) __inline__ -# else -# define VULKAN_HPP_INLINE inline -# endif -# elif defined(__GNUC__) -# define VULKAN_HPP_INLINE __attribute__((always_inline)) __inline__ -# elif defined(_MSC_VER) -# define VULKAN_HPP_INLINE __forceinline -# else -# define VULKAN_HPP_INLINE inline -# endif +#if !defined(VULKAN_HPP_INLINE) +# if defined(__clang___) +# if __has_attribute(always_inline) +# define VULKAN_HPP_INLINE __attribute__((always_inline)) __inline__ +# else +# define VULKAN_HPP_INLINE inline +# endif +# elif defined(__GNUC__) +# define VULKAN_HPP_INLINE __attribute__((always_inline)) __inline__ +# elif defined(_MSC_VER) +# define VULKAN_HPP_INLINE __forceinline +# else +# define VULKAN_HPP_INLINE inline +# endif #endif )" diff --git a/vulkan/vulkan.hpp b/vulkan/vulkan.hpp index 69b83a7..dc94858 100644 --- a/vulkan/vulkan.hpp +++ b/vulkan/vulkan.hpp @@ -41,7 +41,7 @@ # include #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ -static_assert( VK_HEADER_VERSION == 31 , "Wrong VK_HEADER_VERSION!" ); +static_assert( VK_HEADER_VERSION == 32 , "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