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

Add support of new extension attribute "ratified". (#1563)

Browse Source
This commit is contained in:
Andreas Süßenbach 2023-04-17 13:51:24 +02:00 committed by GitHub
parent 698dea9e50
commit 20cb37e39f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
VulkanHppGenerator.cpp
View File

@ -5722,14 +5722,15 @@ std::string VulkanHppGenerator::generateExtensionDependencies() const
std::string VulkanHppGenerator::generateExtensionDependsByVersion( bool definition ) const std::string VulkanHppGenerator::generateExtensionDependsByVersion( bool definition ) const
{ {
if (m_api != "vulkan") if ( m_api != "vulkan" )
{ {
return ""; return "";
} }
if ( definition ) if ( definition )
{ {
const std::string generateExtensionDependsTemplate = R"( VULKAN_HPP_INLINE std::pair<bool, std::vector<std::string> const &> getExtensionDepends( std::string const & version, std::string const & extension ) const std::string generateExtensionDependsTemplate =
R"( VULKAN_HPP_INLINE std::pair<bool, std::vector<std::string> const &> getExtensionDepends( std::string const & version, std::string const & extension )
{ {
#if !defined( NDEBUG ) #if !defined( NDEBUG )
static std::set<std::string> versions = { ${versions} }; static std::set<std::string> versions = { ${versions} };
@ -5759,7 +5760,7 @@ std::string VulkanHppGenerator::generateExtensionDependsByVersion( bool definiti
)"; )";
std::string versions; std::string versions;
for (auto const& feature : m_features) for ( auto const & feature : m_features )
{ {
versions += "\"" + feature.name + "\", "; versions += "\"" + feature.name + "\", ";
} }
@ -11810,13 +11811,14 @@ void VulkanHppGenerator::readExtension( tinyxml2::XMLElement const * element )
{ "platform", {} }, { "platform", {} },
{ "promotedto", {} }, { "promotedto", {} },
{ "provisional", { "true" } }, { "provisional", { "true" } },
{ "ratified", { "vulkan", "vulkansc" } },
{ "sortorder", { "1" } }, { "sortorder", { "1" } },
{ "specialuse", { "cadsupport", "d3demulation", "debugging", "devtools", "glemulation" } }, { "specialuse", { "cadsupport", "d3demulation", "debugging", "devtools", "glemulation" } },
{ "type", { "device", "instance" } } } ); { "type", { "device", "instance" } } } );
checkElements( line, children, { { "require", false } } ); checkElements( line, children, { { "require", false } } );
ExtensionData extensionData{ .xmlLine = line }; ExtensionData extensionData{ .xmlLine = line };
std::vector<std::string> supported; std::vector<std::string> ratified, supported;
for ( auto const & attribute : attributes ) for ( auto const & attribute : attributes )
{ {
if ( attribute.first == "depends" ) if ( attribute.first == "depends" )
@ -11900,6 +11902,10 @@ void VulkanHppGenerator::readExtension( tinyxml2::XMLElement const * element )
"while attribute <provisional> is set to \"true\", attribute <platform> is not set to \"provisional\" but to \"" + extensionData.platform + "while attribute <provisional> is set to \"true\", attribute <platform> is not set to \"provisional\" but to \"" + extensionData.platform +
"\"" ); "\"" );
} }
else if ( attribute.first == "ratified" )
{
ratified = tokenize( attribute.second, "," );
}
else if ( attribute.first == "supported" ) else if ( attribute.first == "supported" )
{ {
supported = tokenize( attribute.second, "," ); supported = tokenize( attribute.second, "," );
@ -11910,6 +11916,10 @@ void VulkanHppGenerator::readExtension( tinyxml2::XMLElement const * element )
} }
} }
checkForWarning( ( std::find( supported.begin(), supported.end(), "disabled" ) != supported.end() ) || extensionData.isDeprecated || ratified.empty() ||
( supported == ratified ),
line,
"attribute \"ratified\" differs from attribute \"supported\"" );
bool extensionSupported = supported.empty() || ( std::find( supported.begin(), supported.end(), m_api ) != supported.end() ); bool extensionSupported = supported.empty() || ( std::find( supported.begin(), supported.end(), m_api ) != supported.end() );
checkForError( !extensionSupported || !extensionData.type.empty(), line, "missing attribute \"type\" for supported extension <" + extensionData.name + ">" ); checkForError( !extensionSupported || !extensionData.type.empty(), line, "missing attribute \"type\" for supported extension <" + extensionData.name + ">" );
for ( auto child : children ) for ( auto child : children )