From c90a5bac97f8a62d66ad7b96836050a90c41d8aa Mon Sep 17 00:00:00 2001
From: Jon Creighton <65668160+creijon@users.noreply.github.com>
Date: Tue, 12 Aug 2025 08:35:01 +0200
Subject: [PATCH] Fix for uninitialised deprecated members in DeviceCreateInfo
 constructor (#2250)

---
 VulkanHppGenerator.cpp    | 22 +++++-----------------
 vulkan/vulkan_structs.hpp |  3 ++-
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp
index e495bc4..ff1f74a 100644
--- a/VulkanHppGenerator.cpp
+++ b/VulkanHppGenerator.cpp
@@ -11591,7 +11591,7 @@ ${byString}
 
     std::vector<std::string> arguments, initializers;
     bool                     arrayListed = false;
-    std::string              ignores, templateHeader, sizeChecks, copyOps;
+    std::string              templateHeader, sizeChecks, copyOps;
     for ( auto mit = structData.second.members.begin(); mit != structData.second.members.end(); ++mit )
     {
       // gather the initializers
@@ -11604,12 +11604,9 @@ ${byString}
         auto litit = lenIts.find( mit );
         if ( litit != lenIts.end() )
         {
-          if ( mit->deprecated.empty() )
-          {
-            // len arguments just have an initalizer, from the array size
-            initializers.push_back( mit->name + "( " + generateLenInitializer( mit, litit, structData.second.mutualExclusiveLens ) + " )" );
-            sizeChecks += generateSizeCheck( litit->second, stripPrefix( structData.first, "Vk" ), structData.second.mutualExclusiveLens );
-          }
+          // len arguments just have an initalizer, from the array size
+          initializers.push_back( mit->name + "( " + generateLenInitializer( mit, litit, structData.second.mutualExclusiveLens ) + " )" );
+          sizeChecks += generateSizeCheck( litit->second, stripPrefix( structData.first, "Vk" ), structData.second.mutualExclusiveLens );
         }
         else if ( hasLen( *mit, structData.second.members ) )
         {
@@ -11654,14 +11651,7 @@ ${byString}
 
           if ( mit->type.isPointer() )
           {
-            if ( mit->deprecated.empty() )
-            {
-              initializers.push_back( mit->name + "( " + argumentName + ".data() )" );
-            }
-            else
-            {
-              ignores += "detail::ignore( " + argumentName + " );\n";
-            }
+            initializers.push_back( mit->name + "( " + argumentName + ".data() )" );
           }
           else
           {
@@ -11722,7 +11712,6 @@ ${byString}
 ${templateHeader}    ${structName}( ${arguments} )
     ${initializers}
     {
-      ${ignores}
       ${sizeChecks}
       ${copyOps}
     }
@@ -11732,7 +11721,6 @@ ${templateHeader}    ${structName}( ${arguments} )
     return replaceWithMap( constructorTemplate,
                            { { "arguments", generateList( arguments, "", ", " ) },
                              { "copyOps", copyOps },
-                             { "ignores", ignores },
                              { "initializers", generateList( initializers, ": ", ", " ) },
                              { "sizeChecks", sizeChecks },
                              { "structName", stripPrefix( structData.first, "Vk" ) },
diff --git a/vulkan/vulkan_structs.hpp b/vulkan/vulkan_structs.hpp
index b0854c1..d0e7f5b 100644
--- a/vulkan/vulkan_structs.hpp
+++ b/vulkan/vulkan_structs.hpp
@@ -35049,11 +35049,12 @@ namespace VULKAN_HPP_NAMESPACE
       , flags( flags_ )
       , queueCreateInfoCount( static_cast<uint32_t>( queueCreateInfos_.size() ) )
       , pQueueCreateInfos( queueCreateInfos_.data() )
+      , enabledLayerCount( static_cast<uint32_t>( pEnabledLayerNames_.size() ) )
+      , ppEnabledLayerNames( pEnabledLayerNames_.data() )
       , enabledExtensionCount( static_cast<uint32_t>( pEnabledExtensionNames_.size() ) )
       , ppEnabledExtensionNames( pEnabledExtensionNames_.data() )
       , pEnabledFeatures( pEnabledFeatures_ )
     {
-      detail::ignore( pEnabledLayerNames_ );
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/