From 3b0400577643f957cb68e3bc356fc7981da8b891 Mon Sep 17 00:00:00 2001 From: asuessenbach Date: Tue, 30 Mar 2021 08:32:39 +0200 Subject: [PATCH] Update to VK_HEADER_VERSION 174. --- Vulkan-Headers | 2 +- VulkanHppGenerator.cpp | 2 +- vulkan/vulkan.hpp | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Vulkan-Headers b/Vulkan-Headers index a8d6ab1..e1d8c49 160000 --- a/Vulkan-Headers +++ b/Vulkan-Headers @@ -1 +1 @@ -Subproject commit a8d6ab19d197400be34422813c5edc7e4cbde552 +Subproject commit e1d8c4931d8e4b6c4a8e633c163ed3aa82d6ac1c diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp index 543d26b..1eab5c8 100644 --- a/VulkanHppGenerator.cpp +++ b/VulkanHppGenerator.cpp @@ -11735,7 +11735,7 @@ void VulkanHppGenerator::readDefine( tinyxml2::XMLElement const * // filter out the check for the different types of VK_DEFINE_NON_DISPATCHABLE_HANDLE if ( name == "VK_USE_64_BIT_PTR_DEFINES" ) { - m_typesafeCheck = "#if defined( VK_USE_64_BIT_PTR_DEFINES )\n"; + m_typesafeCheck = "#if ( VK_USE_64_BIT_PTR_DEFINES == 1 )"; } else if ( ( name == "VK_DEFINE_NON_DISPATCHABLE_HANDLE" ) && ( m_typesafeCheck.empty() ) ) { diff --git a/vulkan/vulkan.hpp b/vulkan/vulkan.hpp index 9f05079..5ad54d2 100644 --- a/vulkan/vulkan.hpp +++ b/vulkan/vulkan.hpp @@ -93,12 +93,11 @@ extern "C" __declspec( dllimport ) FARPROC __stdcall GetProcAddress( HINSTANCE h # include #endif -static_assert( VK_HEADER_VERSION == 173, "Wrong VK_HEADER_VERSION!" ); +static_assert( VK_HEADER_VERSION == 174, "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( __LP64__ ) || defined( _WIN64 ) || ( defined( __x86_64__ ) && !defined( __ILP32__ ) ) || \ - defined( _M_X64 ) || defined( __ia64 ) || defined( _M_IA64 ) || defined( __aarch64__ ) || defined( __powerpc64__ ) +#if ( VK_USE_64_BIT_PTR_DEFINES == 1 ) # if !defined( VULKAN_HPP_TYPESAFE_CONVERSION ) # define VULKAN_HPP_TYPESAFE_CONVERSION # endif