Remove warning on "ratified" and "supported" being different for an e…

…xtension.
KhronosGroup · Nov 13, 2023 · b6d55b1 · b6d55b1
1 parent 4cb522c
commit b6d55b1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp
@@ -13271,7 +13271,6 @@ void VulkanHppGenerator::readExtension( tinyxml2::XMLElement const * element )
   checkElements( line, children, { { "require", false } } );
 
   ExtensionData            extensionData{ .xmlLine = line };
-  std::vector<std::string> ratified, supported;
   for ( auto const & attribute : attributes )
   {
     if ( attribute.first == "depends" )
@@ -13363,30 +13362,28 @@ void VulkanHppGenerator::readExtension( tinyxml2::XMLElement const * element )
     }
     else if ( attribute.first == "ratified" )
     {
-      ratified = tokenize( attribute.second, "," );
+      extensionData.ratified = tokenize( attribute.second, "," );
     }
     else if ( attribute.first == "supported" )
     {
-      supported = tokenize( attribute.second, "," );
+      extensionData.supported = tokenize( attribute.second, "," );
     }
     else if ( attribute.first == "type" )
     {
       extensionData.type = attribute.second;
     }
   }
 
-  checkForWarning( std::any_of( supported.begin(), supported.end(), []( std::string const & s ) { return s == "disabled"; } ) || extensionData.isDeprecated ||
-                     ratified.empty() || ( supported == ratified ),
-                   line,
-                   "attribute \"ratified\" differs from attribute \"supported\"" );
-  bool extensionSupported = supported.empty() || std::any_of( supported.begin(), supported.end(), [this]( std::string const & s ) { return s == m_api; } );
+  bool extensionSupported =
+    extensionData.supported.empty() ||
+    std::any_of( extensionData.supported.begin(), extensionData.supported.end(), [this]( std::string const & s ) { return s == m_api; } );
   checkForError( !extensionSupported || !extensionData.type.empty(), line, "missing attribute \"type\" for supported extension <" + extensionData.name + ">" );
   for ( auto child : children )
   {
     readExtensionRequire( child, extensionData, extensionSupported );
   }
 
-  if ( std::none_of( supported.begin(), supported.end(), []( std::string const & s ) { return s == "disabled"; } ) )
+  if ( std::none_of( extensionData.supported.begin(), extensionData.supported.end(), []( std::string const & s ) { return s == "disabled"; } ) )
   {
     // extract the tag from the name, which is supposed to look like VK_<tag>_<other>
     size_t tagStart = extensionData.name.find( '_' );

diff --git a/VulkanHppGenerator.hpp b/VulkanHppGenerator.hpp
@@ -238,7 +238,9 @@ class VulkanHppGenerator
     std::string                                                  platform     = {};
     std::string                                                  promotedTo   = {};
     std::map<std::string, std::vector<std::vector<std::string>>> depends      = {};
+    std::vector<std::string>                                     ratified     = {};
     std::vector<RequireData>                                     requireData  = {};
+    std::vector<std::string>                                     supported    = {};
     std::string                                                  type         = {};
     int                                                          xmlLine      = 0;
   };