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 requirements on FlagBits types. (#1817)

Browse Source
This commit is contained in:
Andreas Süßenbach 2024-02-29 08:26:01 +01:00 committed by GitHub
parent 73f210a604
commit 85daa22a04
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
VulkanHppGenerator.cpp
View File

@ -901,9 +901,6 @@ void VulkanHppGenerator::addMissingFlagBits( std::vector<RequireData> & requireD
assert( pos != std::string::npos ); assert( pos != std::string::npos );
std::string flagBits = bitmaskIt->first.substr( 0, pos + 4 ) + "Bit" + bitmaskIt->first.substr( pos + 4 ); std::string flagBits = bitmaskIt->first.substr( 0, pos + 4 ) + "Bit" + bitmaskIt->first.substr( pos + 4 );
// as the bitmask's requirement is still empty, this flagBits should not be listed in the require list!
assert( std::none_of( require.types.begin(), require.types.end(), [&flagBits]( std::string const & type ) { return ( type == flagBits ); } ) );
bitmaskIt->second.require = flagBits; bitmaskIt->second.require = flagBits;
// some flagsBits are specified but never listed as required for any flags! // some flagsBits are specified but never listed as required for any flags!
@ -921,10 +918,8 @@ void VulkanHppGenerator::addMissingFlagBits( std::vector<RequireData> & requireD
assert( m_types.contains( flagBits ) ); assert( m_types.contains( flagBits ) );
enumIt->second.isBitmask = true; enumIt->second.isBitmask = true;
} }
newTypes.push_back( flagBits );
} }
else if ( std::find( require.types.begin(), require.types.end(), bitmaskIt->second.require ) == require.types.end() ) if ( std::find( require.types.begin(), require.types.end(), bitmaskIt->second.require ) == require.types.end() )
{ {
// this bitmask requires a flags type that is not listed in here, so add it // this bitmask requires a flags type that is not listed in here, so add it
newTypes.push_back( bitmaskIt->second.require ); newTypes.push_back( bitmaskIt->second.require );
@ -1289,9 +1284,9 @@ void VulkanHppGenerator::checkEnumCorrectness( std::vector<RequireData> const &
auto enumIt = m_enums.find( type ); auto enumIt = m_enums.find( type );
if ( enumIt != m_enums.end() ) if ( enumIt != m_enums.end() )
{ {
if ( enumIt->second.isBitmask ) if ( enumIt->second.isBitmask && !enumIt->second.values.empty() )
{ {
// check that any enum of a bitmask is listed as "require" or "bitvalues" for a bitmask // check that any non-empty enum of a bitmask is listed as "require" or "bitvalues" for a bitmask
auto bitmaskIt = auto bitmaskIt =
std::find_if( m_bitmasks.begin(), m_bitmasks.end(), [&enumIt]( auto const & bitmask ) { return bitmask.second.require == enumIt->first; } ); std::find_if( m_bitmasks.begin(), m_bitmasks.end(), [&enumIt]( auto const & bitmask ) { return bitmask.second.require == enumIt->first; } );
checkForError( bitmaskIt != m_bitmasks.end(), checkForError( bitmaskIt != m_bitmasks.end(),