Add support for feature element in deprecate element of extensions (#2609)

Author: asuessenbach

generator/VkXMLParser.cpp

@@ -86,10 +86,10 @@ void checkExtensionOrStructAndMember( std::string const & depends, int xmlLine,
   {
     auto structIt = structs.find( tokens[0] );
     checkForError( "vk.xml", structIt != structs.end(), xmlLine, prefix + " an unknown struct <" + tokens[0] + ">" );
-    checkForWarning( "vk.xml",
-                     containsByName( structIt->second.members, tokens[1] ),
-                     xmlLine,
-                     prefix + " an unknown member <" + tokens[1] + "> of structure <" + tokens[0] + ">" );
+    checkForError( "vk.xml",
+                   containsByName( structIt->second.members, tokens[1] ),
+                   xmlLine,
+                   prefix + " an unknown member <" + tokens[1] + "> of structure <" + tokens[0] + ">" );
   }
   // CHECK: after extensions: tokens.size() == 1 -> is extension
 }

generator/VulkanHppGenerator.cpp

@@ -5882,7 +5882,8 @@ std::string VulkanHppGenerator::generateDispatchLoaderDynamicDeviceCommandAssign
                           [&]( NameLine const & command, auto const & commandData )
                           {
                             // ignore vkGetDeviceProcAddr as it is already part of instance command assignments
-                            if ( !listedCommands.contains( command.name ) && ( command.name != "vkGetDeviceProcAddr" ) && !commandData.second.handle.empty() && isDeviceCommand( commandData.second ) )
+                            if ( !listedCommands.contains( command.name ) && ( command.name != "vkGetDeviceProcAddr" ) && !commandData.second.handle.empty() &&
+                                 isDeviceCommand( commandData.second ) )
                             {
                               deviceCommandAssignments += generateDispatchLoaderDynamicCommandAssignment( command.name, commandData.first, "device" );
                             }
@@ -13069,6 +13070,30 @@ VulkanHppGenerator::DeprecatedCommandData VulkanHppGenerator::readDeprecatedComm
   return { name, supersededBy };
 }
 
+VulkanHppGenerator::DeprecatedFeatureData VulkanHppGenerator::readDeprecatedFeature( tinyxml2::XMLElement const * element ) const
+{
+  int const                          line       = element->GetLineNum();
+  std::map<std::string, std::string> attributes = getAttributes( element );
+  checkAttributes( line, attributes, { { "name", {} } }, { { "struct", {} } } );
+  checkElements( line, getChildElements( element ), {} );
+
+  std::string name, structure;
+  for ( auto const & attribute : attributes )
+  {
+    if ( attribute.first == "name" )
+    {
+      name = attribute.second;
+    }
+    else
+    {
+      assert( attribute.first == "struct" );
+      structure = attribute.second;
+    }
+  }
+
+  return { name, structure };
+}
+
 VulkanHppGenerator::DeprecatedTypeData VulkanHppGenerator::readDeprecatedType( tinyxml2::XMLElement const * element ) const
 {
   int const                          line       = element->GetLineNum();
@@ -13099,7 +13124,7 @@ VulkanHppGenerator::DeprecateData VulkanHppGenerator::readDeprecateData( tinyxml
   std::map<std::string, std::string> attributes = getAttributes( element );
   checkAttributes( line, attributes, { { "explanationlink", {} } }, {} );
   std::vector<tinyxml2::XMLElement const *> children = getChildElements( element );
-  checkElements( line, children, {}, { { "command", MultipleAllowed::Yes }, { "type", MultipleAllowed::Yes } } );
+  checkElements( line, children, {}, { { "command", MultipleAllowed::Yes }, { "feature", MultipleAllowed::Yes }, { "type", MultipleAllowed::Yes } } );
 
   DeprecateData deprecateData;
   deprecateData.xmlLine = line;
@@ -13126,6 +13151,19 @@ VulkanHppGenerator::DeprecateData VulkanHppGenerator::readDeprecateData( tinyxml
                      "command <" + deprecateData.commands.back().supersededBy + ">, superseding command <" + deprecateData.commands.back().name +
                        "> is not listed as a command" );
     }
+    else if ( value == "feature" )
+    {
+      deprecateData.features.push_back( readDeprecatedFeature( child ) );
+      auto structIt = m_structs.find( deprecateData.features.back().structure );
+      checkForError( structIt != m_structs.end(),
+                     childLine,
+                     "deprecated feature <" + deprecateData.features.back().name + "> specifies unknown struct <" + deprecateData.features.back().structure +
+                       "> is unknown" );
+      checkForError( containsByName( structIt->second.members, deprecateData.features.back().name ),
+                     childLine,
+                     "deprecated feature <" + deprecateData.features.back().name + "> is not a member of the specified struct <" +
+                       deprecateData.features.back().structure );
+    }
     else if ( value == "type" )
     {
       deprecateData.types.push_back( readDeprecatedType( child ) );

generator/VulkanHppGenerator.hpp

@@ -259,6 +259,12 @@ class VulkanHppGenerator
     std::string supersededBy = {};
   };
 
+  struct DeprecatedFeatureData
+  {
+    std::string name      = {};
+    std::string structure = {};
+  };
+
   struct DeprecatedTypeData
   {
     std::string name         = {};
@@ -269,6 +275,7 @@ class VulkanHppGenerator
   {
     std::string                        explanationLink = {};
     std::vector<DeprecatedCommandData> commands        = {};
+    std::vector<DeprecatedFeatureData> features        = {};
     std::vector<DeprecatedTypeData>    types           = {};
     int                                xmlLine         = 0;
   };
@@ -797,8 +804,8 @@ class VulkanHppGenerator
   std::string generateEnumsToString() const;
   std::string generateEnumsToString( std::vector<RequireData> const & requireData, std::set<std::string> & listedEnums, std::string const & title ) const;
   std::string generateEnumToString( std::pair<std::string, EnumData> const & enumData ) const;
-  std::string                         generateEnumValueName( std::string const & enumName, std::string const & valueName, bool bitmask ) const;
-  std::string                         generateExtensionDependencies() const;
+  std::string generateEnumValueName( std::string const & enumName, std::string const & valueName, bool bitmask ) const;
+  std::string generateExtensionDependencies() const;
   template <class Predicate, class Extraction>
   std::string generateExtensionReplacedBy( Predicate p, Extraction e ) const;
   template <class Predicate>
@@ -1085,6 +1092,7 @@ class VulkanHppGenerator
                                                                                std::set<size_t> const &                  skippedParams ) const;
   std::string                                            readComment( tinyxml2::XMLElement const * element ) const;
   DeprecatedCommandData                                  readDeprecatedCommand( tinyxml2::XMLElement const * element ) const;
+  DeprecatedFeatureData                                  readDeprecatedFeature( tinyxml2::XMLElement const * element ) const;
   DeprecatedTypeData                                     readDeprecatedType( tinyxml2::XMLElement const * element ) const;
   DeprecateData                                          readDeprecateData( tinyxml2::XMLElement const * element ) const;
   void                                                   readExtension( tinyxml2::XMLElement const * element );