From e05bea9f13e148cdf75ef9a1a55ce7fac2e2f22e Mon Sep 17 00:00:00 2001
From: asuessenbach <asuessenbach@nvidia.com>
Date: Wed, 23 Jun 2021 10:59:55 +0200
Subject: [PATCH] Add support of attribute "values" for struct members of type
 uint32_t.

---
 VulkanHppGenerator.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp
index c8f42b9..34f1e41 100644
--- a/VulkanHppGenerator.cpp
+++ b/VulkanHppGenerator.cpp
@@ -9567,7 +9567,7 @@ ${prefix}{}
     // gather the arguments
     listedArgument = appendStructConstructorArgument( arguments, listedArgument, member, true );
 
-    // gather the initializers; skip member 'pNext' and constant members
+    // gather the initializers; skip member 'pNext' and members with exactly one legal value
     if ( ( member.name != "pNext" ) && ( member.values.size() != 1 ) )
     {
       initializers += ( firstArgument ? ":" : "," ) + std::string( " " ) + member.name + "( " + member.name + "_ )";
@@ -9750,16 +9750,22 @@ std::string VulkanHppGenerator::appendStructMembers( std::string &
     if ( !member.values.empty() )
     {
       // special handling for members with legal value: arbitrarily use the first one as the default
-      auto enumIt = m_enums.find( member.type.type );
-      assert( enumIt != m_enums.end() );
+      str += " = ";
+      if ( member.type.type == "uint32_t" )
       {
+        str += member.values.front();
+      }
+      else
+      {
+        auto enumIt = m_enums.find( member.type.type );
+        assert( enumIt != m_enums.end() );
         std::string enumValue = member.values.front();
         auto        valueIt   = std::find_if( enumIt->second.values.begin(),
                                      enumIt->second.values.end(),
                                      [&enumValue]( EnumValueData const & evd ) { return enumValue == evd.name; } );
         assert( valueIt != enumIt->second.values.end() );
         std::string valueName = generateEnumValueName( enumIt->first, valueIt->name, enumIt->second.isBitmask, m_tags );
-        str += " = " + stripPrefix( member.type.type, "Vk" ) + "::" + valueName;
+        str += stripPrefix( member.type.type, "Vk" ) + "::" + valueName;
         if ( member.name == "sType" )
         {
           sTypeValue = valueName;