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 #958 from asuessenbach/check

Browse Source 
Add check for multiple listing of types in a feature.
This commit is contained in:
Andreas Süßenbach 2021-05-06 16:13:57 +02:00 committed by GitHub
commit 518ebd3ea7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 76 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
VulkanHppGenerator.cpp
View File

@ -18,30 +18,29 @@
#include <fstream> #include <fstream>
#include <regex> #include <regex>
void appendTypesafeStuff( std::string & str, std::string const & typesafeCheck ); void appendVersionCheck( std::string & str, std::string const & version );
void appendVersionCheck( std::string & str, std::string const & version ); bool beginsWith( std::string const & text, std::string const & prefix );
bool beginsWith( std::string const & text, std::string const & prefix ); bool endsWith( std::string const & text, std::string const & postfix );
bool endsWith( std::string const & text, std::string const & postfix ); void check( bool condition, int line, std::string const & message );
void check( bool condition, int line, std::string const & message ); void checkAttributes( int line,
void checkAttributes( int line, std::map<std::string, std::string> const & attributes,
std::map<std::string, std::string> const & attributes, std::map<std::string, std::set<std::string>> const & required,
std::map<std::string, std::set<std::string>> const & required, std::map<std::string, std::set<std::string>> const & optional );
std::map<std::string, std::set<std::string>> const & optional ); void checkElements( int line,
void checkElements( int line, std::vector<tinyxml2::XMLElement const *> const & elements,
std::vector<tinyxml2::XMLElement const *> const & elements, std::map<std::string, bool> const & required,
std::map<std::string, bool> const & required, std::set<std::string> const & optional = {} );
std::set<std::string> const & optional = {} ); std::string constructStandardArray( std::string const & type, std::vector<std::string> const & sizes );
std::string constructStandardArray( std::string const & type, std::vector<std::string> const & sizes ); std::string createEnumValueName( std::string const & name,
std::string createEnumValueName( std::string const & name, std::string const & prefix,
std::string const & prefix, std::string const & postfix,
std::string const & postfix, bool bitmask,
bool bitmask, std::string const & tag );
std::string const & tag ); std::string createSuccessCode( std::string const & code, std::set<std::string> const & tags );
std::string createSuccessCode( std::string const & code, std::set<std::string> const & tags ); std::string determineCommandName( std::string const & vulkanCommandName,
std::string determineCommandName( std::string const & vulkanCommandName, std::string const & argumentType,
std::string const & argumentType, std::set<std::string> const & tags );
std::set<std::string> const & tags ); std::string determineNoDiscard( bool multiSuccessCodes, bool multiErrorCodes );
std::string determineNoDiscard( bool multiSuccessCodes, bool multiErrorCodes );
std::set<size_t> determineSingularParams( size_t returnParamIndex, std::set<size_t> determineSingularParams( size_t returnParamIndex,
std::map<size_t, size_t> const & vectorParamIndices ); std::map<size_t, size_t> const & vectorParamIndices );
std::set<size_t> determineSkippedParams( size_t returnParamIndex, std::map<size_t, size_t> const & vectorParamIndices ); std::set<size_t> determineSkippedParams( size_t returnParamIndex, std::map<size_t, size_t> const & vectorParamIndices );
@ -85,19 +84,6 @@ const std::set<std::string> specialPointerTypes = {
"Display", "IDirectFB", "wl_display", "xcb_connection_t", "_screen_window" "Display", "IDirectFB", "wl_display", "xcb_connection_t", "_screen_window"
}; };
void appendTypesafeStuff( std::string & str, std::string const & typesafeCheck )
{
str +=
"// 32-bit vulkan is not typesafe for handles, so don't allow copy constructors on this platform by default.\n"
"// To enable this feature on 32-bit platforms please define VULKAN_HPP_TYPESAFE_CONVERSION\n" +
typesafeCheck +
"\n"
"# if !defined( VULKAN_HPP_TYPESAFE_CONVERSION )\n"
"# define VULKAN_HPP_TYPESAFE_CONVERSION\n"
"# endif\n"
"#endif\n";
}
void appendVersionCheck( std::string & str, std::string const & version ) void appendVersionCheck( std::string & str, std::string const & version )
{ {
str += "static_assert( VK_HEADER_VERSION == " + version + str += "static_assert( VK_HEADER_VERSION == " + version +
@ -912,11 +898,11 @@ void VulkanHppGenerator::appendBitmasks( std::string & str ) const
str += "\n //=== " + feature.first + " ===\n"; str += "\n //=== " + feature.first + " ===\n";
for ( auto const & type : feature.second.types ) for ( auto const & type : feature.second.types )
{ {
auto bitmaskIt = m_bitmasks.find( type ); auto bitmaskIt = m_bitmasks.find( type.first );
if ( bitmaskIt != m_bitmasks.end() ) if ( bitmaskIt != m_bitmasks.end() )
{ {
assert( listedBitmasks.find( type ) == listedBitmasks.end() ); assert( listedBitmasks.find( type.first ) == listedBitmasks.end() );
listedBitmasks.insert( type ); listedBitmasks.insert( type.first );
appendBitmask( str, bitmaskIt ); appendBitmask( str, bitmaskIt );
} }
} }
@ -2711,11 +2697,11 @@ void VulkanHppGenerator::appendEnums( std::string & str ) const
str += "\n //=== " + feature.first + " ===\n"; str += "\n //=== " + feature.first + " ===\n";
for ( auto const & type : feature.second.types ) for ( auto const & type : feature.second.types )
{ {
auto enumIt = m_enums.find( type ); auto enumIt = m_enums.find( type.first );
if ( enumIt != m_enums.end() ) if ( enumIt != m_enums.end() )
{ {
assert( listedEnums.find( type ) == listedEnums.end() ); assert( listedEnums.find( type.first ) == listedEnums.end() );
listedEnums.insert( type ); listedEnums.insert( type.first );
str += "\n"; str += "\n";
appendEnum( str, *enumIt ); appendEnum( str, *enumIt );
@ -13332,7 +13318,17 @@ void VulkanHppGenerator::readFeatureRequireType( tinyxml2::XMLElement const *
std::map<std::string, std::string> attributes = getAttributes( element ); std::map<std::string, std::string> attributes = getAttributes( element );
checkAttributes( line, attributes, {}, { { "comment", {} }, { "name", {} } } ); checkAttributes( line, attributes, {}, { { "comment", {} }, { "name", {} } } );
checkElements( line, getChildElements( element ), {} ); checkElements( line, getChildElements( element ), {} );
std::string name = attributes.find( "name" )->second;
std::string name = attributes.find( "name" )->second;
auto featureTypeIt = std::find_if( featureIt->second.types.begin(),
featureIt->second.types.end(),
[&name]( std::pair<std::string, int> const & typeLine )
{ return ( typeLine.first == name ) && ( typeLine.second != 0 ); } );
check( featureTypeIt == featureIt->second.types.end(),
line,
"type <" + name + "> already listed for this feature on line " +
( ( featureTypeIt == featureIt->second.types.end() ) ? "" : std::to_string( featureTypeIt->second ) ) +
" !" );
// some types are in fact includes (like vk_platform) or defines (like VK_API_VERSION) // some types are in fact includes (like vk_platform) or defines (like VK_API_VERSION)
if ( ( m_defines.find( name ) == m_defines.end() ) && ( m_includes.find( name ) == m_includes.end() ) ) if ( ( m_defines.find( name ) == m_defines.end() ) && ( m_includes.find( name ) == m_includes.end() ) )
@ -13349,13 +13345,16 @@ void VulkanHppGenerator::readFeatureRequireType( tinyxml2::XMLElement const *
{ {
assert( !featureIt->second.types.empty() ); assert( !featureIt->second.types.empty() );
std::string flagBits = name.substr( 0, name.length() - 5 ) + "FlagBits"; std::string flagBits = name.substr( 0, name.length() - 5 ) + "FlagBits";
if ( featureIt->second.types.back() != flagBits ) if ( featureIt->second.types.back().first != flagBits )
{ {
assert( std::find( featureIt->second.types.begin(), featureIt->second.types.end(), flagBits ) == assert( std::find_if( featureIt->second.types.begin(),
featureIt->second.types.end() ); featureIt->second.types.end(),
featureIt->second.types.push_back( flagBits ); [&flagBits]( std::pair<std::string, int> const & typeLine )
{ return ( typeLine.first == flagBits ); } ) == featureIt->second.types.end() );
featureIt->second.types.push_back( std::make_pair( flagBits, 0 ) );
} }
} }
// filter out FlagBits that are listed after their Flags! // filter out FlagBits that are listed after their Flags!
// (and therefore have been added right before that Flags, above) // (and therefore have been added right before that Flags, above)
bool skipIt = false; bool skipIt = false;
@ -13363,18 +13362,28 @@ void VulkanHppGenerator::readFeatureRequireType( tinyxml2::XMLElement const *
{ {
assert( !featureIt->second.types.empty() ); assert( !featureIt->second.types.empty() );
std::string flags = name.substr( 0, name.length() - 4 ) + "s"; std::string flags = name.substr( 0, name.length() - 4 ) + "s";
if ( featureIt->second.types.back() == flags ) if ( featureIt->second.types.back().first == flags )
{ {
assert( std::find( featureIt->second.types.begin(), featureIt->second.types.end(), flags ) != skipIt = true;
featureIt->second.types.end() ); auto flagBitsIt = std::find_if( featureIt->second.types.begin(),
skipIt = true; featureIt->second.types.end(),
[&name]( std::pair<std::string, int> const & typeLine )
{ return ( typeLine.first == name ); } );
assert( flagBitsIt != featureIt->second.types.end() );
assert( flagBitsIt->second == 0 );
flagBitsIt->second = line;
}
else
{
assert( std::find_if( featureIt->second.types.begin(),
featureIt->second.types.end(),
[&flags]( std::pair<std::string, int> const & typeLine )
{ return ( typeLine.first == flags ); } ) == featureIt->second.types.end() );
} }
} }
if ( !skipIt ) if ( !skipIt )
{ {
assert( std::find( featureIt->second.types.begin(), featureIt->second.types.end(), name ) == featureIt->second.types.push_back( std::make_pair( name, line ) );
featureIt->second.types.end() );
featureIt->second.types.push_back( name );
} }
} }
} }
@ -16589,7 +16598,15 @@ namespace std
str.reserve( estimatedLength ); str.reserve( estimatedLength );
str += generator.getVulkanLicenseHeader() + includes + "\n"; str += generator.getVulkanLicenseHeader() + includes + "\n";
appendVersionCheck( str, generator.getVersion() ); appendVersionCheck( str, generator.getVersion() );
appendTypesafeStuff( str, generator.getTypesafeCheck() ); str +=
"// 32-bit vulkan is not typesafe for handles, so don't allow copy constructors on this platform by default.\n"
"// To enable this feature on 32-bit platforms please define VULKAN_HPP_TYPESAFE_CONVERSION\n" +
generator.getTypesafeCheck() +
"\n"
"# if !defined( VULKAN_HPP_TYPESAFE_CONVERSION )\n"
"# define VULKAN_HPP_TYPESAFE_CONVERSION\n"
"# endif\n"
"#endif\n";
str += defines + "\n" + "namespace VULKAN_HPP_NAMESPACE\n" + "{" + classArrayProxy + classArrayWrapper + str += defines + "\n" + "namespace VULKAN_HPP_NAMESPACE\n" + "{" + classArrayProxy + classArrayWrapper +
classFlags + classOptional + classStructureChain + classUniqueHandle; classFlags + classOptional + classStructureChain + classUniqueHandle;
generator.appendDispatchLoaderStatic( str ); generator.appendDispatchLoaderStatic( str );

6
VulkanHppGenerator.hpp
View File

@ -177,9 +177,9 @@ private:
{ {
FeatureData( std::string const & number_ ) : number( number_ ) {} FeatureData( std::string const & number_ ) : number( number_ ) {}
std::vector<std::string> commands; std::vector<std::string> commands;
std::string number; std::string number;
std::vector<std::string> types; std::vector<std::pair<std::string, int>> types;
}; };
struct ExtensionData struct ExtensionData