diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp index c088233..6ee23a0 100644 --- a/VulkanHppGenerator.cpp +++ b/VulkanHppGenerator.cpp @@ -1258,8 +1258,7 @@ void VulkanHppGenerator::appendCommand( std::string & str, appendCommandSimpleVoid( str, name, commandData, definition, vectorParamIndices ); appendedFunction = true; } - else if ( ( commandData.returnType == "VkResult" ) && ( commandData.successCodes.size() == 1 ) && - ( vectorParamIndices.size() < 2 ) ) + else if ( ( commandData.returnType == "VkResult" ) && ( vectorParamIndices.size() < 2 ) ) { // returns VkResult, but there's just one success code appendCommandSimple( str, name, commandData, definition, vectorParamIndices ); @@ -4526,7 +4525,7 @@ std::string VulkanHppGenerator::constructCommandSimple( std::string const & ${nodiscard}VULKAN_HPP_INLINE ${returnType} ${className}::${commandName}( ${argumentList} ) const { Result result = static_cast( d.${vkCommand}( ${callArguments} ) ); - return createResultValue( result, VULKAN_HPP_NAMESPACE_STRING "::${className}::${commandName}" ); + return createResultValue( result, VULKAN_HPP_NAMESPACE_STRING "::${className}::${commandName}"${successCodeList} ); })"; str = @@ -4538,6 +4537,7 @@ std::string VulkanHppGenerator::constructCommandSimple( std::string const & { "commandName", commandName }, { "nodiscard", nodiscard }, { "returnType", returnType }, + { "successCodeList", constructSuccessCodeList( commandData.successCodes ) }, { "vkCommand", name } } ) ); } else diff --git a/vulkan/vulkan.hpp b/vulkan/vulkan.hpp index 41d350f..cbdfe6e 100644 --- a/vulkan/vulkan.hpp +++ b/vulkan/vulkan.hpp @@ -92474,6 +92474,7 @@ namespace VULKAN_HPP_NAMESPACE return static_cast( d.vkCopyAccelerationStructureKHR( m_device, reinterpret_cast( pInfo ) ) ); } + # ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE template VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result @@ -92497,6 +92498,7 @@ namespace VULKAN_HPP_NAMESPACE return static_cast( d.vkCopyAccelerationStructureToMemoryKHR( m_device, reinterpret_cast( pInfo ) ) ); } + # ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE template VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::copyAccelerationStructureToMemoryKHR( @@ -92520,6 +92522,7 @@ namespace VULKAN_HPP_NAMESPACE return static_cast( d.vkCopyMemoryToAccelerationStructureKHR( m_device, reinterpret_cast( pInfo ) ) ); } + # ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE template VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::copyMemoryToAccelerationStructureKHR( @@ -100040,6 +100043,7 @@ namespace VULKAN_HPP_NAMESPACE return static_cast( d.vkWaitForFences( m_device, fenceCount, reinterpret_cast( pFences ), static_cast( waitAll ), timeout ) ); } + #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE template VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result @@ -100067,6 +100071,7 @@ namespace VULKAN_HPP_NAMESPACE return static_cast( d.vkWaitSemaphores( m_device, reinterpret_cast( pWaitInfo ), timeout ) ); } + #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE template VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::waitSemaphores( const SemaphoreWaitInfo & waitInfo, @@ -100089,6 +100094,7 @@ namespace VULKAN_HPP_NAMESPACE return static_cast( d.vkWaitSemaphoresKHR( m_device, reinterpret_cast( pWaitInfo ), timeout ) ); } + #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE template VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::waitSemaphoresKHR( const SemaphoreWaitInfo & waitInfo, @@ -104720,6 +104726,7 @@ namespace VULKAN_HPP_NAMESPACE return static_cast( d.vkQueuePresentKHR( m_queue, reinterpret_cast( pPresentInfo ) ) ); } + #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE template VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Queue::presentKHR( const PresentInfoKHR & presentInfo,