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

Merge pull request #968 from asuessenbach/flagBits

Browse Source 
Filter (implicitly) required "FlagBits"-enums that are explicitly listed later on in an extension.
This commit is contained in:
Andreas Süßenbach 2021-05-26 08:20:50 +02:00 committed by GitHub
commit 7253012416
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
VulkanHppGenerator.cpp
View File

@ -2695,7 +2695,9 @@ void VulkanHppGenerator::appendEnums( std::string & str ) const
for ( auto const & type : extIt.second->second.types ) for ( auto const & type : extIt.second->second.types )
{ {
auto enumIt = m_enums.find( type ); auto enumIt = m_enums.find( type );
if ( enumIt != m_enums.end() ) // some "FlagBits"-enums are implicitly added to a feature, as the corresponding "Flags"-enum needs it !!
// => it can happen that a "FlagBits"-enum explicitly listed for an extension is already listed with a feature!
if ( enumIt != m_enums.end() && listedEnums.insert( type ).second )
{ {
enumIts.push_back( enumIt ); enumIts.push_back( enumIt );
} }
@ -2712,9 +2714,6 @@ void VulkanHppGenerator::appendEnums( std::string & str ) const
str += enter + "\n //=== " + extIt.second->first + " ===\n"; str += enter + "\n //=== " + extIt.second->first + " ===\n";
for ( auto enumIt : enumIts ) for ( auto enumIt : enumIts )
{ {
assert( listedEnums.find( enumIt->first ) == listedEnums.end() );
listedEnums.insert( enumIt->first );
str += "\n"; str += "\n";
appendEnum( str, *enumIt ); appendEnum( str, *enumIt );
appendEnumToString( str, *enumIt ); appendEnumToString( str, *enumIt );
@ -5035,7 +5034,7 @@ std::string VulkanHppGenerator::constructCommandResultGetHandleUnique( std::stri
if ( ( name.find( "Acquire" ) != std::string::npos ) || ( name.find( "Get" ) != std::string::npos ) ) if ( ( name.find( "Acquire" ) != std::string::npos ) || ( name.find( "Get" ) != std::string::npos ) )
{ {
if ( ( name == "vkAcquirePerformanceConfigurationINTEL" ) || ( name == "vkGetRandROutputDisplayEXT" ) || if ( ( name == "vkAcquirePerformanceConfigurationINTEL" ) || ( name == "vkGetRandROutputDisplayEXT" ) ||
( name == "vkGetWinrtDisplayNV" ) || ( name == "vkGetDrmDisplayEXT" )) ( name == "vkGetWinrtDisplayNV" ) || ( name == "vkGetDrmDisplayEXT" ) )
{ {
objectDeleter = "ObjectRelease"; objectDeleter = "ObjectRelease";
} }