Skip to content

Commit

Permalink
Merge pull request #842 from asuessenbach/165
Browse files Browse the repository at this point in the history
Update to VK_HEADER_VERSION 165
  • Loading branch information
asuessenbach authored Dec 14, 2020
2 parents 79ad327 + a0f6203 commit b02354a
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Vulkan-Headers
9 changes: 0 additions & 9 deletions VulkanHppGenerator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 <descriptorSetCount> in structure <VkDescriptorSetAllocateInfo>" );
it->second.members[4].len = { it->second.members[3].name };
}
it->second.subStruct = determineSubStruct( *it );

m_extendedStructs.insert( structExtends.begin(), structExtends.end() );
Expand Down
2 changes: 1 addition & 1 deletion vulkan/vulkan.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ extern "C" __declspec( dllimport ) FARPROC __stdcall GetProcAddress( HINSTANCE h
# include <compare>
#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
Expand Down

0 comments on commit b02354a

Please sign in to comment.