From 4ac6dc4760c6b6f86e96f779991c9598fc1c9691 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20S=C3=BC=C3=9Fenbach?= <asuessenbach@nvidia.com>
Date: Thu, 15 Aug 2019 09:50:26 +0200
Subject: [PATCH] Fix wrong naming of complex union member types. (#371)

---
 VulkanHppGenerator.cpp | 12 ++++++------
 vulkan/vulkan.hpp      |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp
index c917ded..b1476d7 100644
--- a/VulkanHppGenerator.cpp
+++ b/VulkanHppGenerator.cpp
@@ -4231,18 +4231,18 @@ void VulkanHppGenerator::writeUnion(std::ostream & os, std::pair<std::string, St
   if (needsUnrestrictedUnions)
   {
     os << "#ifdef VULKAN_HPP_HAS_UNRESTRICTED_UNIONS" << std::endl;
-    for (auto const& member : structure.second.members)
-    {
-      os << "    " << member.type.compose() << " " << member.name << (member.arraySize.empty() ? "" : ("[" + member.arraySize + "]")) << ";" << std::endl;
-    }
-    os << "#else" << std::endl;
   }
   for (auto const& member : structure.second.members)
   {
-    os << "    " << (beginsWith(member.type.type, "Vk") ? "Vk" : "") << member.type.compose() << " " << member.name << (member.arraySize.empty() ? "" : ("[" + member.arraySize + "]")) << ";" << std::endl;
+    os << "    " << member.type.compose() << " " << member.name << (member.arraySize.empty() ? "" : ("[" + member.arraySize + "]")) << ";" << std::endl;
   }
   if (needsUnrestrictedUnions)
   {
+    os << "#else" << std::endl;
+    for (auto const& member : structure.second.members)
+    {
+      os << "    " << member.type.prefix + (member.type.prefix.empty() ? "" : " ") + member.type.type + member.type.postfix << " " << member.name << (member.arraySize.empty() ? "" : ("[" + member.arraySize + "]")) << ";" << std::endl;
+    }
     os << "#endif  /*VULKAN_HPP_HAS_UNRESTRICTED_UNIONS*/" << std::endl;
   }
   os << "  };" << std::endl;
diff --git a/vulkan/vulkan.hpp b/vulkan/vulkan.hpp
index e69867c..38b17b9 100644
--- a/vulkan/vulkan.hpp
+++ b/vulkan/vulkan.hpp
@@ -100,7 +100,7 @@ static_assert( VK_HEADER_VERSION ==  116 , "Wrong VK_HEADER_VERSION!" );
 #endif
 
 #if !defined(VULKAN_HPP_INLINE)
-# if defined(__clang___)
+# if defined(__clang__)
 #  if __has_attribute(always_inline)
 #   define VULKAN_HPP_INLINE __attribute__((always_inline)) __inline__
 #  else
@@ -22818,8 +22818,8 @@ namespace VULKAN_HPP_NAMESPACE
     vk::ClearColorValue color;
     vk::ClearDepthStencilValue depthStencil;
 #else
-    Vkvk::ClearColorValue color;
-    Vkvk::ClearDepthStencilValue depthStencil;
+    VkClearColorValue color;
+    VkClearDepthStencilValue depthStencil;
 #endif  /*VULKAN_HPP_HAS_UNRESTRICTED_UNIONS*/
   };
 
@@ -42361,7 +42361,7 @@ namespace VULKAN_HPP_NAMESPACE
     uint32_t value32;
     uint64_t value64;
     float valueFloat;
-    Vkvk::Bool32 valueBool;
+    VkBool32 valueBool;
     const char* valueString;
 #endif  /*VULKAN_HPP_HAS_UNRESTRICTED_UNIONS*/
   };