mewin/vulkan-hpp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add filter for identical alias enum values

Browse Source
This commit is contained in:
asuessenbach 2020-04-30 14:28:48 +02:00
parent 6f6a950a30
commit dc1a7ce93e
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
VulkanHppGenerator.cpp
View File

@ -4122,10 +4122,11 @@ void VulkanHppGenerator::EnumData::addEnumAlias( int line,
std::string const & vkName ) std::string const & vkName )
{ {
// check that the aliasName is either a known enum value or at least a known alias // check that the aliasName is either a known enum value or at least a known alias
check( (std::find_if( values.begin(), check( ( std::find_if( values.begin(),
values.end(), values.end(),
[&aliasName]( EnumValueData const & evd ) { return evd.vulkanValue == aliasName; } ) != [&aliasName]( EnumValueData const & evd ) { return evd.vulkanValue == aliasName; } ) !=
values.end()) || (aliases.find(aliasName) != aliases.end()), values.end() ) ||
( aliases.find( aliasName ) != aliases.end() ),
line, line,
"unknown enum alias <" + aliasName + ">" ); "unknown enum alias <" + aliasName + ">" );
@ -4134,7 +4135,16 @@ void VulkanHppGenerator::EnumData::addEnumAlias( int line,
line, line,
"enum alias <" + name + "> already listed for a different enum value" ); "enum alias <" + name + "> already listed for a different enum value" );
// only list aliases that map to different vkNames
aliasIt = std::find_if( aliases.begin(),
aliases.end(),
[&vkName]( std::pair<std::string, std::pair<std::string, std::string>> const & aliasEntry ) {
return vkName == aliasEntry.second.second;
} );
if ( aliasIt == aliases.end() )
{
aliases.insert( std::make_pair( name, std::make_pair( aliasName, vkName ) ) ); aliases.insert( std::make_pair( name, std::make_pair( aliasName, vkName ) ) );
}
} }
void VulkanHppGenerator::EnumData::addEnumValue( int line, void VulkanHppGenerator::EnumData::addEnumValue( int line,