TheCloud/Vulkan-Hpp
1
0
Fork 0
mirror of https://github.com/KhronosGroup/Vulkan-Hpp.git synced 2025-09-13 05:50:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Minor code cleanup (#2275)

Browse Source
This commit is contained in:
Andreas Süßenbach 2025-09-04 12:00:55 +02:00 committed by GitHub
parent df7099a77e
commit 8f2955ba0d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 38 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
VulkanHppGenerator.cpp
View File

@ -661,41 +661,28 @@ void VulkanHppGenerator::checkExtensionCorrectness() const
{ {
checkForError( isExtension( d ), extension.xmlLine, "extension <" + extension.name + "> lists an unknown extension dependency <" + d + ">" ); checkForError( isExtension( d ), extension.xmlLine, "extension <" + extension.name + "> lists an unknown extension dependency <" + d + ">" );
} }
for ( auto nextDepsIt = std::next( depsIt ); nextDepsIt != dep.second.end(); ++nextDepsIt ) checkForError( std::none_of( std::next( depsIt ), dep.second.end(), [&depsIt]( auto const & d ) { return *depsIt == d; } ),
{ extension.xmlLine,
checkForError( *depsIt != *nextDepsIt, extension.xmlLine, "extension <" + extension.name + "> lists multiple identical dependencies" ); "extension <" + extension.name + "> lists multiple identical dependencies" );
}
} }
} }
if ( !extension.deprecatedBy.empty() ) checkForError( extension.deprecatedBy.empty() || isFeature( extension.deprecatedBy ) || isExtension( extension.deprecatedBy ),
{ extension.xmlLine,
checkForError( isFeature( extension.deprecatedBy ) || isExtension( extension.deprecatedBy ), "extension <" + extension.name + "> is deprecated by unknown extension/version <" + extension.deprecatedBy + ">" );
extension.xmlLine, checkForError( extension.obsoletedBy.empty() || isFeature( extension.obsoletedBy ) || isExtension( extension.obsoletedBy ),
"extension <" + extension.name + "> is deprecated by unknown extension/version <" + extension.deprecatedBy + ">" ); extension.xmlLine,
} "extension <" + extension.name + "> is obsoleted by unknown extension/version <" + extension.obsoletedBy + ">" );
if ( !extension.obsoletedBy.empty() ) checkForError( extension.promotedTo.empty() || isFeature( extension.promotedTo ) || isExtension( extension.promotedTo ),
{ extension.xmlLine,
checkForError( isFeature( extension.obsoletedBy ) || isExtension( extension.obsoletedBy ), "extension <" + extension.name + "> is promoted to unknown extension/version <" + extension.promotedTo + ">" );
extension.xmlLine,
"extension <" + extension.name + "> is obsoleted by unknown extension/version <" + extension.obsoletedBy + ">" );
}
if ( !extension.promotedTo.empty() )
{
checkForError( isFeature( extension.promotedTo ) || isExtension( extension.promotedTo ),
extension.xmlLine,
"extension <" + extension.name + "> is promoted to unknown extension/version <" + extension.promotedTo + ">" );
}
// check for existence of any requirement // check for existence of any requirement
for ( auto const & require : extension.requireData ) for ( auto const & require : extension.requireData )
{ {
if ( !require.depends.empty() ) std::vector<std::string> requireDepends = tokenizeAny( require.depends, ",+()" );
for ( auto const & dep : requireDepends )
{ {
std::vector<std::string> requireDepends = tokenizeAny( require.depends, ",+()" ); checkForError( isFeature( dep ) || isExtension( dep ), require.xmlLine, "extension <" + extension.name + "> lists an unknown depends <" + dep + ">" );
for ( auto const & dep : requireDepends )
{
checkForError( isFeature( dep ) || isExtension( dep ), require.xmlLine, "extension <" + extension.name + "> lists an unknown depends <" + dep + ">" );
}
} }
} }
} }
@ -715,11 +702,9 @@ void VulkanHppGenerator::checkFuncPointerCorrectness() const
{ {
for ( auto const & funcPointer : m_funcPointers ) for ( auto const & funcPointer : m_funcPointers )
{ {
if ( !funcPointer.second.require.empty() ) checkForError( funcPointer.second.require.empty() || m_types.contains( funcPointer.second.require ),
{ funcPointer.second.xmlLine,
checkForError( "funcpointer requires unknown <" + funcPointer.second.require + ">" );
m_types.contains( funcPointer.second.require ), funcPointer.second.xmlLine, "funcpointer requires unknown <" + funcPointer.second.require + ">" );
}
for ( auto const & argument : funcPointer.second.arguments ) for ( auto const & argument : funcPointer.second.arguments )
{ {
checkForError( m_types.contains( argument.type.type ), argument.xmlLine, "funcpointer argument of unknown type <" + argument.type.type + ">" ); checkForError( m_types.contains( argument.type.type ), argument.xmlLine, "funcpointer argument of unknown type <" + argument.type.type + ">" );
@ -734,35 +719,33 @@ void VulkanHppGenerator::checkHandleCorrectness() const
assert( objectTypeIt != m_enums.end() ); assert( objectTypeIt != m_enums.end() );
// handle checks // handle checks
for ( auto const & handle : m_handles ) assert( m_handles.begin()->first.empty() );
for ( auto handleIt = std::next( m_handles.begin() ); handleIt != m_handles.end(); ++handleIt )
{ {
assert( !handleIt->first.empty() );
// check the existence of the parent // check the existence of the parent
checkForError( checkForError( m_handles.contains( handleIt->second.parent ),
m_handles.contains( handle.second.parent ), handle.second.xmlLine, "handle <" + handle.first + "> with unknown parent <" + handle.second.parent + ">" ); handleIt->second.xmlLine,
"handle <" + handleIt->first + "> with unknown parent <" + handleIt->second.parent + ">" );
// check existence of objTypeEnum used with this handle type // check existence of objTypeEnum used with this handle type
if ( !handle.first.empty() ) checkForError(
{ !handleIt->second.objTypeEnum.empty(), handleIt->second.xmlLine, "handle <" + handleIt->first + "> missing required \"objtypeenum\" attribute" );
assert( !handle.second.objTypeEnum.empty() ); checkForError( !isTypeUsed( handleIt->first ) || contains( objectTypeIt->second.values, handleIt->second.objTypeEnum ),
handleIt->second.xmlLine,
// only check with used handles! "handle <" + handleIt->first + "> specifies unknown \"objtypeenum\" <" + handleIt->second.objTypeEnum + ">" );
checkForError( !isTypeUsed( handle.first ) || contains( objectTypeIt->second.values, handle.second.objTypeEnum ),
handle.second.xmlLine,
"handle <" + handle.first + "> specifies unknown \"objtypeenum\" <" + handle.second.objTypeEnum + ">" );
}
} }
// check that all specified objectType values are used with a handle type // check that all specified objectType values are used with a handle type
for ( auto const & objectTypeValue : objectTypeIt->second.values ) for ( auto const & objectTypeValue : objectTypeIt->second.values )
{ {
if ( objectTypeValue.name != "VK_OBJECT_TYPE_UNKNOWN" ) checkForError( ( objectTypeValue.name == "VK_OBJECT_TYPE_UNKNOWN" ) ||
{ std::ranges::any_of( m_handles,
checkForError( std::ranges::any_of( m_handles,
[&objectTypeValue]( std::pair<std::string, HandleData> const & hd ) [&objectTypeValue]( std::pair<std::string, HandleData> const & hd )
{ return hd.second.objTypeEnum == objectTypeValue.name; } ), { return hd.second.objTypeEnum == objectTypeValue.name; } ),
objectTypeValue.xmlLine, objectTypeValue.xmlLine,
"VkObjectType value <" + objectTypeValue.name + "> not specified as \"objtypeenum\" for any handle" ); "VkObjectType value <" + objectTypeValue.name + "> not specified as \"objtypeenum\" for any handle" );
}
} }
} }
@ -928,9 +911,9 @@ void VulkanHppGenerator::checkStructCorrectness() const
} }
else else
{ {
checkForWarning( !enumValue.supported || ( sTypeValues.erase( enumValue.name ) == 1 ), checkForError( !enumValue.supported || ( sTypeValues.erase( enumValue.name ) == 1 ),
enumValue.xmlLine, enumValue.xmlLine,
"VkStructureType enum value <" + enumValue.name + "> never used" ); "VkStructureType enum value <" + enumValue.name + "> never used" );
} }
} }
assert( sTypeValues.empty() ); assert( sTypeValues.empty() );

2
vulkan/vulkan.hpp
View File

@ -150,7 +150,7 @@ namespace VULKAN_HPP_NAMESPACE
private: private:
VULKAN_HPP_CONSTEXPR_14 void copy( char const * data, size_t len ) VULKAN_HPP_NOEXCEPT VULKAN_HPP_CONSTEXPR_14 void copy( char const * data, size_t len ) VULKAN_HPP_NOEXCEPT
{ {
size_t n = (std::min)( N - 1, len ); size_t n = ( std::min )( N - 1, len );
for ( size_t i = 0; i < n; ++i ) for ( size_t i = 0; i < n; ++i )
{ {
( *this )[i] = data[i]; ( *this )[i] = data[i];