From dc6501456ac53699f5ac63b93f013e5a42d43db4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20S=C3=BC=C3=9Fenbach?= <asuessenbach@nvidia.com>
Date: Wed, 12 Jun 2024 16:36:03 +0200
Subject: [PATCH] Add support for commands with three return parameters, two of
 them representing a vector. (#1897)

---
 VulkanHppGenerator.cpp | 36 ++++++++++++++++++++++++++++++++++++
 VulkanHppGenerator.hpp |  6 ++++++
 2 files changed, 42 insertions(+)

diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp
index e4f2154..9a26a6d 100644
--- a/VulkanHppGenerator.cpp
+++ b/VulkanHppGenerator.cpp
@@ -4237,6 +4237,7 @@ std::string VulkanHppGenerator::generateCommandResultSingleSuccessWithErrors(
     case 0: return generateCommandResultWithErrors0Return( name, commandData, initialSkipCount, definition, raii );
     case 1: return generateCommandResultSingleSuccessWithErrors1Return( name, commandData, initialSkipCount, definition, returnParams[0], raii );
     case 2: return generateCommandResultSingleSuccessWithErrors2Return( name, commandData, initialSkipCount, definition, returnParams, raii );
+    case 3: return generateCommandResultSingleSuccessWithErrors3Return( name, commandData, initialSkipCount, definition, returnParams, raii );
     default: break;
   }
   return "";
@@ -4523,6 +4524,41 @@ std::string VulkanHppGenerator::generateCommandResultSingleSuccessWithErrors2Ret
   return "";
 }
 
+std::string VulkanHppGenerator::generateCommandResultSingleSuccessWithErrors3Return( std::string const &         name,
+                                                                                     CommandData const &         commandData,
+                                                                                     size_t                      initialSkipCount,
+                                                                                     bool                        definition,
+                                                                                     std::vector<size_t> const & returnParams,
+                                                                                     bool                        raii ) const
+{
+  if ( ( commandData.params[returnParams[0]].type.type != "void" ) && !isHandleType( commandData.params[returnParams[0]].type.type ) &&
+       !isStructureChainAnchor( commandData.params[returnParams[0]].type.type ) && commandData.params[returnParams[0]].lenParams.empty() &&
+       ( commandData.params[returnParams[1]].type.type == "size_t" ) && commandData.params[returnParams[1]].lenParams.empty() &&
+       ( commandData.params[returnParams[2]].type.type == "void" ) &&
+       ( commandData.params[returnParams[2]].lenExpression == commandData.params[returnParams[1]].name ) )
+  {
+    std::map<size_t, VectorParamData> vectorParams = determineVectorParams( commandData.params );
+    if ( vectorParams.size() == 1 )
+    {
+      if ( ( returnParams[2] == vectorParams.begin()->first ) && ( returnParams[1] == vectorParams.begin()->second.lenParam ) )
+      {
+        return generateCommandSetInclusive( name,
+                                            commandData,
+                                            initialSkipCount,
+                                            definition,
+                                            returnParams,
+                                            vectorParams,
+                                            false,
+                                            { CommandFlavourFlagBits::enhanced, CommandFlavourFlagBits::withAllocator },
+                                            raii,
+                                            false,
+                                            { CommandFlavourFlagBits::enhanced } );
+      }
+    }
+  }
+  return "";
+}
+
 std::string VulkanHppGenerator::generateCommandResultWithErrors0Return(
   std::string const & name, CommandData const & commandData, size_t initialSkipCount, bool definition, bool raii ) const
 {
diff --git a/VulkanHppGenerator.hpp b/VulkanHppGenerator.hpp
index e10d01a..1329bda 100644
--- a/VulkanHppGenerator.hpp
+++ b/VulkanHppGenerator.hpp
@@ -612,6 +612,12 @@ private:
                                                                    bool                        definition,
                                                                    std::vector<size_t> const & returnParamIndices,
                                                                    bool                        raii ) const;
+  std::string generateCommandResultSingleSuccessWithErrors3Return( std::string const &         name,
+                                                                   CommandData const &         commandData,
+                                                                   size_t                      initialSkipCount,
+                                                                   bool                        definition,
+                                                                   std::vector<size_t> const & returnParamIndices,
+                                                                   bool                        raii ) const;
   std::string generateCommandResultWithErrors0Return(
     std::string const & name, CommandData const & commandData, size_t initialSkipCount, bool definition, bool raii ) const;
   std::string generateCommandSet( bool                             definition,