From c77158525b933a84dca8740a8094f49bef27d7f7 Mon Sep 17 00:00:00 2001
From: asuessenbach <asuessenbach@nvidia.com>
Date: Mon, 12 Oct 2020 23:09:07 +0200
Subject: [PATCH] Refactor trivial functions returning a VkResult.

---
 VulkanHppGenerator.cpp |  5 ++---
 vulkan/vulkan.hpp      | 23 ++++++++++++++---------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp
index cdc3fb4..070d347 100644
--- a/VulkanHppGenerator.cpp
+++ b/VulkanHppGenerator.cpp
@@ -1200,10 +1200,9 @@ void VulkanHppGenerator::appendCommand( std::string &       str,
             appendCommandTrivialVoid( str, name, commandData, definition );
             appendedFunction = true;
           }
-          else if ( commandData.successCodes.size() == 1 )
+          else if (commandData.returnType == "VkResult")
           {
-            assert( commandData.returnType == "VkResult" );
-            // function returning something
+            // function returning a result
             appendCommandTrivial( str, name, commandData, definition );
             appendedFunction = true;
           }
diff --git a/vulkan/vulkan.hpp b/vulkan/vulkan.hpp
index b9a4ff0..9324128 100644
--- a/vulkan/vulkan.hpp
+++ b/vulkan/vulkan.hpp
@@ -95710,7 +95710,9 @@ namespace VULKAN_HPP_NAMESPACE
       static_cast<Result>( d.vkDeferredOperationJoinKHR( m_device, static_cast<VkDeferredOperationKHR>( operation ) ) );
     return createResultValue( result,
                               VULKAN_HPP_NAMESPACE_STRING "::Device::deferredOperationJoinKHR",
-                              { Result::eSuccess, Result::eThreadDoneKHR, Result::eThreadIdleKHR } );
+                              { VULKAN_HPP_NAMESPACE::Result::eSuccess,
+                                VULKAN_HPP_NAMESPACE::Result::eThreadDoneKHR,
+                                VULKAN_HPP_NAMESPACE::Result::eThreadIdleKHR } );
   }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif   /*VK_ENABLE_BETA_EXTENSIONS*/
@@ -97700,7 +97702,7 @@ namespace VULKAN_HPP_NAMESPACE
       d.vkGetDeferredOperationResultKHR( m_device, static_cast<VkDeferredOperationKHR>( operation ) ) );
     return createResultValue( result,
                               VULKAN_HPP_NAMESPACE_STRING "::Device::getDeferredOperationResultKHR",
-                              { Result::eSuccess, Result::eNotReady } );
+                              { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eNotReady } );
   }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 #endif   /*VK_ENABLE_BETA_EXTENSIONS*/
@@ -98070,8 +98072,9 @@ namespace VULKAN_HPP_NAMESPACE
                                                                         Dispatch const & d ) const
   {
     Result result = static_cast<Result>( d.vkGetEventStatus( m_device, static_cast<VkEvent>( event ) ) );
-    return createResultValue(
-      result, VULKAN_HPP_NAMESPACE_STRING "::Device::getEventStatus", { Result::eEventSet, Result::eEventReset } );
+    return createResultValue( result,
+                              VULKAN_HPP_NAMESPACE_STRING "::Device::getEventStatus",
+                              { VULKAN_HPP_NAMESPACE::Result::eEventSet, VULKAN_HPP_NAMESPACE::Result::eEventReset } );
   }
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
@@ -98110,8 +98113,9 @@ namespace VULKAN_HPP_NAMESPACE
                                                                         Dispatch const & d ) const
   {
     Result result = static_cast<Result>( d.vkGetFenceStatus( m_device, static_cast<VkFence>( fence ) ) );
-    return createResultValue(
-      result, VULKAN_HPP_NAMESPACE_STRING "::Device::getFenceStatus", { Result::eSuccess, Result::eNotReady } );
+    return createResultValue( result,
+                              VULKAN_HPP_NAMESPACE_STRING "::Device::getFenceStatus",
+                              { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eNotReady } );
   }
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
@@ -99915,9 +99919,10 @@ namespace VULKAN_HPP_NAMESPACE
   {
     Result result =
       static_cast<Result>( d.vkGetSwapchainStatusKHR( m_device, static_cast<VkSwapchainKHR>( swapchain ) ) );
-    return createResultValue( result,
-                              VULKAN_HPP_NAMESPACE_STRING "::Device::getSwapchainStatusKHR",
-                              { Result::eSuccess, Result::eSuboptimalKHR } );
+    return createResultValue(
+      result,
+      VULKAN_HPP_NAMESPACE_STRING "::Device::getSwapchainStatusKHR",
+      { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eSuboptimalKHR } );
   }
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/