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

Improved some checks on structures/aliases

Browse Source
This commit is contained in:
asuessenbach 2021-08-04 15:28:59 +02:00
parent b557d9b527
commit 35a43611f8
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
VulkanHppGenerator.cpp
View File

@ -1098,7 +1098,7 @@ void VulkanHppGenerator::checkCommandCorrectness() const
} }
} }
void VulkanHppGenerator::checkCorrectness() const void VulkanHppGenerator::checkCorrectness()
{ {
check( !m_vulkanLicenseHeader.empty(), -1, "missing license header" ); check( !m_vulkanLicenseHeader.empty(), -1, "missing license header" );
checkBitmaskCorrectness(); checkBitmaskCorrectness();
@ -1366,7 +1366,7 @@ void VulkanHppGenerator::checkHandleCorrectness() const
} }
} }
void VulkanHppGenerator::checkStructCorrectness() const void VulkanHppGenerator::checkStructCorrectness()
{ {
std::set<std::string> sTypeValues; std::set<std::string> sTypeValues;
for ( auto const & structure : m_structures ) for ( auto const & structure : m_structures )
@ -1382,7 +1382,12 @@ void VulkanHppGenerator::checkStructCorrectness() const
// check for existence of all structs that are extended by this struct // check for existence of all structs that are extended by this struct
for ( auto const & extend : structure.second.structExtends ) for ( auto const & extend : structure.second.structExtends )
{ {
check( m_structures.find( extend ) != m_structures.end(), check( m_structures.find( extend ) != m_structures.end() ||
( std::find_if( m_structures.begin(),
m_structures.end(),
[&extend]( std::pair<std::string, StructureData> const & sd ) {
return sd.second.aliases.find( extend ) != sd.second.aliases.end();
} ) != m_structures.end() ),
structure.second.xmlLine, structure.second.xmlLine,
"struct <" + structure.first + "> extends unknown <" + extend + ">" ); "struct <" + structure.first + "> extends unknown <" + extend + ">" );
} }
@ -1411,6 +1416,15 @@ void VulkanHppGenerator::checkStructCorrectness() const
} }
} }
assert( sTypeValues.empty() ); assert( sTypeValues.empty() );
for ( auto const & structAlias : m_structureAliases )
{
auto structIt = m_structures.find( structAlias.second.alias );
check( structIt != m_structures.end(), structAlias.second.xmlLine, "unknown struct alias <" + structAlias.second.alias + ">" );
check( structIt->second.aliases.insert( structAlias.first ).second,
structIt->second.xmlLine,
"struct <" + structIt->first + "> already uses alias <" + structAlias.first + ">" );
}
} }
void VulkanHppGenerator::checkStructMemberCorrectness( std::string const & structureName, void VulkanHppGenerator::checkStructMemberCorrectness( std::string const & structureName,
@ -1451,7 +1465,7 @@ void VulkanHppGenerator::checkStructMemberCorrectness( std::string const &
unionIt->second.members.end(), unionIt->second.members.end(),
[selectorValue]( MemberData const & md ) [selectorValue]( MemberData const & md )
{ return md.selection == selectorValue.name; } ) != unionIt->second.members.end(), { return md.selection == selectorValue.name; } ) != unionIt->second.members.end(),
selectorEnumIt->second.xmlLine, selectorValue.xmlLine,
"enum <" + selectorEnumIt->first + "> has value <" + selectorValue.name + "enum <" + selectorEnumIt->first + "> has value <" + selectorValue.name +
"> that is not used by corresponding union <" + unionIt->first + ">" ); "> that is not used by corresponding union <" + unionIt->first + ">" );
} }
@ -12994,8 +13008,8 @@ void VulkanHppGenerator::readEnum( tinyxml2::XMLElement const * el
std::string prefix = generateEnumSuffixes( enumIt->first, enumIt->second.isBitmask, m_tags ).first; std::string prefix = generateEnumSuffixes( enumIt->first, enumIt->second.isBitmask, m_tags ).first;
check( beginsWith( name, prefix ), check( beginsWith( name, prefix ),
line, line,
"encountered enum value <" + name + "> that does not begin with expected prefix <" + prefix + ">" ); "encountered enum value <" + name + "> that does not begin with expected prefix <" + prefix + ">" );
check( bitpos.empty() ^ value.empty(), line, "invalid set of attributes for enum <" + name + ">" ); check( bitpos.empty() ^ value.empty(), line, "invalid set of attributes for enum <" + name + ">" );
enumIt->second.addEnumValue( line, name, protect, !bitpos.empty(), "" ); enumIt->second.addEnumValue( line, name, protect, !bitpos.empty(), "" );
@ -14442,11 +14456,6 @@ void VulkanHppGenerator::readStructAlias( tinyxml2::XMLElement const *
check( m_structureAliases.insert( std::make_pair( name, StructureAliasData( alias, line ) ) ).second, check( m_structureAliases.insert( std::make_pair( name, StructureAliasData( alias, line ) ) ).second,
line, line,
"structure alias <" + name + "> already used" ); "structure alias <" + name + "> already used" );
auto structIt = m_structures.find( alias );
check( structIt != m_structures.end(), line, "unknown struct alias <" + alias + ">" );
check( structIt->second.aliases.insert( name ).second,
structIt->second.xmlLine,
"struct <" + alias + "> already uses alias <" + name + ">" );
check( m_types.insert( std::make_pair( name, TypeCategory::Struct ) ).second, check( m_types.insert( std::make_pair( name, TypeCategory::Struct ) ).second,
line, line,
"struct <" + name + "> already specified as a type" ); "struct <" + name + "> already specified as a type" );

4
VulkanHppGenerator.hpp
View File

@ -350,7 +350,7 @@ private:
std::string & instanceMembers ) const; std::string & instanceMembers ) const;
void checkBitmaskCorrectness() const; void checkBitmaskCorrectness() const;
void checkCommandCorrectness() const; void checkCommandCorrectness() const;
void checkCorrectness() const; void checkCorrectness();
void checkEnumCorrectness() const; void checkEnumCorrectness() const;
void checkEnumCorrectness( std::vector<RequireData> const & requireData ) const; void checkEnumCorrectness( std::vector<RequireData> const & requireData ) const;
bool checkEquivalentSingularConstructor( bool checkEquivalentSingularConstructor(
@ -360,7 +360,7 @@ private:
void checkExtensionCorrectness() const; void checkExtensionCorrectness() const;
void checkFuncPointerCorrectness() const; void checkFuncPointerCorrectness() const;
void checkHandleCorrectness() const; void checkHandleCorrectness() const;
void checkStructCorrectness() const; void checkStructCorrectness();
void checkStructMemberCorrectness( std::string const & structureName, void checkStructMemberCorrectness( std::string const & structureName,
std::vector<MemberData> const & members, std::vector<MemberData> const & members,
std::set<std::string> & sTypeValues ) const; std::set<std::string> & sTypeValues ) const;