mirror/Vulkan-Hpp
1
0
Fork 0
mirror of https://github.com/KhronosGroup/Vulkan-Hpp.git synced 2024-10-14 16:32:17 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #842 from asuessenbach/165

Browse Source 
Update to VK_HEADER_VERSION 165
This commit is contained in:
Andreas Süßenbach 2020-12-14 16:07:12 +01:00 committed by GitHub
commit b02354a43c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Vulkan-Headers

@ -1 +1 @@
Subproject commit fe9850767d00e46b230da6cfbc15eb86636017bd Subproject commit 85470b32ad5d0d7d67fdf411b6e7b502c09c9c52

9
VulkanHppGenerator.cpp
View File

@ -9161,15 +9161,6 @@ void VulkanHppGenerator::readStruct( tinyxml2::XMLElement const *
readStructMember( child, it->second.members, isUnion ); 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 <descriptorSetCount> in structure <VkDescriptorSetAllocateInfo>" );
it->second.members[4].len = { it->second.members[3].name };
}
it->second.subStruct = determineSubStruct( *it ); it->second.subStruct = determineSubStruct( *it );
m_extendedStructs.insert( structExtends.begin(), structExtends.end() ); m_extendedStructs.insert( structExtends.begin(), structExtends.end() );

2
vulkan/vulkan.hpp
View File

@ -93,7 +93,7 @@ extern "C" __declspec( dllimport ) FARPROC __stdcall GetProcAddress( HINSTANCE h
# include <compare> # include <compare>
#endif #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. // 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 // To enable this feature on 32-bit platforms please define VULKAN_HPP_TYPESAFE_CONVERSION