From a0f6203570d9e85a9b611f027bb035c93cc0092f Mon Sep 17 00:00:00 2001 From: asuessenbach Date: Mon, 14 Dec 2020 13:26:02 +0100 Subject: [PATCH] Update to VK_HEADER_VERSION 165 --- Vulkan-Headers | 2 +- VulkanHppGenerator.cpp | 9 --------- vulkan/vulkan.hpp | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/Vulkan-Headers b/Vulkan-Headers index fe9850767..85470b32a 160000 --- a/Vulkan-Headers +++ b/Vulkan-Headers @@ -1 +1 @@ -Subproject commit fe9850767d00e46b230da6cfbc15eb86636017bd +Subproject commit 85470b32ad5d0d7d67fdf411b6e7b502c09c9c52 diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp index 547c8aaf9..d2af0a62d 100644 --- a/VulkanHppGenerator.cpp +++ b/VulkanHppGenerator.cpp @@ -9161,15 +9161,6 @@ void VulkanHppGenerator::readStruct( tinyxml2::XMLElement const * readStructMember( child, it->second.members, isUnion ); } } - if ( name == "VkDescriptorSetAllocateInfo" ) - { - // some very very very special handling for this struct: the "len" attribute for pSetLayouts has gone! - assert( ( it->second.members.size() == 5 ) && ( it->second.members[3].name == "descriptorSetCount" ) && ( it->second.members[4].name == "pSetLayouts" )); - warn( !it->second.members[4].len.empty(), - line, - "Missing attribute \"len\" for member in structure " ); - it->second.members[4].len = { it->second.members[3].name }; - } it->second.subStruct = determineSubStruct( *it ); m_extendedStructs.insert( structExtends.begin(), structExtends.end() ); diff --git a/vulkan/vulkan.hpp b/vulkan/vulkan.hpp index a0081ecf0..c6d57b675 100644 --- a/vulkan/vulkan.hpp +++ b/vulkan/vulkan.hpp @@ -93,7 +93,7 @@ extern "C" __declspec( dllimport ) FARPROC __stdcall GetProcAddress( HINSTANCE h # include #endif -static_assert( VK_HEADER_VERSION == 164, "Wrong VK_HEADER_VERSION!" ); +static_assert( VK_HEADER_VERSION == 165, "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