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

Relax check for constants as array size: also allow potentially externally defined constants (#1652)

Browse Source
This commit is contained in:
Andreas Süßenbach 2023-09-04 12:31:50 +02:00 committed by GitHub
parent f51dac9f18
commit a2e240c7e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
VulkanHppGenerator.cpp
View File

@ -46,6 +46,7 @@ std::string generateStandardArrayWrapper( std::s
std::map<std::string, std::string> getAttributes( tinyxml2::XMLElement const * element ); std::map<std::string, std::string> getAttributes( tinyxml2::XMLElement const * element );
template <typename ElementContainer> template <typename ElementContainer>
std::vector<tinyxml2::XMLElement const *> getChildElements( ElementContainer const * element ); std::vector<tinyxml2::XMLElement const *> getChildElements( ElementContainer const * element );
bool isAllUpper( std::string const & name );
bool isNumber( std::string const & name ); bool isNumber( std::string const & name );
std::pair<std::vector<std::string>, std::string> readModifiers( tinyxml2::XMLNode const * node ); std::pair<std::vector<std::string>, std::string> readModifiers( tinyxml2::XMLNode const * node );
std::string readSnippet( std::string const & snippetFile ); std::string readSnippet( std::string const & snippetFile );
@ -1485,12 +1486,16 @@ void VulkanHppGenerator::checkStructMemberCorrectness( std::string const &
// check that each member type is known // check that each member type is known
checkForError( m_types.contains( member.type.type ), member.xmlLine, "struct member uses unknown type <" + member.type.type + ">" ); checkForError( m_types.contains( member.type.type ), member.xmlLine, "struct member uses unknown type <" + member.type.type + ">" );
// check that any used constant is a known constant // check that any used constant is a known constant or some potentially externally defined constant
for ( auto const & arraySize : member.arraySizes ) for ( auto const & arraySize : member.arraySizes )
{ {
checkForError( ( arraySize.find_first_not_of( "0123456789" ) == std::string::npos ) || m_constants.contains( arraySize ), if ( !isNumber( arraySize ) && !m_constants.contains( arraySize ) )
member.xmlLine, {
"struct member array size uses unknown constant <" + arraySize + ">" ); auto typeIt = m_types.find( arraySize );
checkForError( ( typeIt != m_types.end() ) && isAllUpper( arraySize ) && ( typeIt->second.category == TypeCategory::ExternalType ),
member.xmlLine,
"struct member array size uses unknown constant <" + arraySize + ">" );
}
} }
// checks if a value is specified // checks if a value is specified
@ -1516,8 +1521,7 @@ void VulkanHppGenerator::checkStructMemberCorrectness( std::string const &
} }
else if ( member.type.type == "uint32_t" ) else if ( member.type.type == "uint32_t" )
{ {
// check that a value for a uint32_t is all digits checkForError( isNumber( member.value ),
checkForError( member.value.find_first_not_of( "0123456789" ) == std::string::npos,
member.xmlLine, member.xmlLine,
"value <" + member.value + "> for member <" + member.name + "> in structure <" + structureName + "> of type <" + member.type.type + "value <" + member.value + "> for member <" + member.name + "> in structure <" + structureName + "> of type <" + member.type.type +
"> is not a number" ); "> is not a number" );
@ -15047,6 +15051,11 @@ std::string generateStandardArray( std::string const & type, std::vector<std::st
return arrayString; return arrayString;
} }
bool isAllUpper(std::string const& name)
{
return std::none_of( name.begin(), name.end(), []( auto const & c ) { return c != toupper( c ); } );
}
bool isNumber( std::string const & name ) bool isNumber( std::string const & name )
{ {
return name.find_first_not_of( "0123456789" ) == std::string::npos; return name.find_first_not_of( "0123456789" ) == std::string::npos;