TheCloud/Vulkan-Hpp
1
0
Fork 0
mirror of https://github.com/KhronosGroup/Vulkan-Hpp.git synced 2025-09-11 04:50:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactor trivial functions returning a VkResult.

Browse Source
This commit is contained in:
asuessenbach 2020-10-12 23:09:07 +02:00
parent c3f83db9d1
commit c77158525b
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
VulkanHppGenerator.cpp
View File

@ -1200,10 +1200,9 @@ void VulkanHppGenerator::appendCommand( std::string & str,
appendCommandTrivialVoid( str, name, commandData, definition ); appendCommandTrivialVoid( str, name, commandData, definition );
appendedFunction = true; appendedFunction = true;
} }
else if ( commandData.successCodes.size() == 1 ) else if (commandData.returnType == "VkResult")
{ {
assert( commandData.returnType == "VkResult" ); // function returning a result
// function returning something
appendCommandTrivial( str, name, commandData, definition ); appendCommandTrivial( str, name, commandData, definition );
appendedFunction = true; appendedFunction = true;
} }

23
vulkan/vulkan.hpp
View File

@ -95710,7 +95710,9 @@ namespace VULKAN_HPP_NAMESPACE
static_cast<Result>( d.vkDeferredOperationJoinKHR( m_device, static_cast<VkDeferredOperationKHR>( operation ) ) ); static_cast<Result>( d.vkDeferredOperationJoinKHR( m_device, static_cast<VkDeferredOperationKHR>( operation ) ) );
return createResultValue( result, return createResultValue( result,
VULKAN_HPP_NAMESPACE_STRING "::Device::deferredOperationJoinKHR", 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 /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
#endif /*VK_ENABLE_BETA_EXTENSIONS*/ #endif /*VK_ENABLE_BETA_EXTENSIONS*/
@ -97700,7 +97702,7 @@ namespace VULKAN_HPP_NAMESPACE
d.vkGetDeferredOperationResultKHR( m_device, static_cast<VkDeferredOperationKHR>( operation ) ) ); d.vkGetDeferredOperationResultKHR( m_device, static_cast<VkDeferredOperationKHR>( operation ) ) );
return createResultValue( result, return createResultValue( result,
VULKAN_HPP_NAMESPACE_STRING "::Device::getDeferredOperationResultKHR", 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 /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
#endif /*VK_ENABLE_BETA_EXTENSIONS*/ #endif /*VK_ENABLE_BETA_EXTENSIONS*/
@ -98070,8 +98072,9 @@ namespace VULKAN_HPP_NAMESPACE
Dispatch const & d ) const Dispatch const & d ) const
{ {
Result result = static_cast<Result>( d.vkGetEventStatus( m_device, static_cast<VkEvent>( event ) ) ); Result result = static_cast<Result>( d.vkGetEventStatus( m_device, static_cast<VkEvent>( event ) ) );
return createResultValue( return createResultValue( result,
result, VULKAN_HPP_NAMESPACE_STRING "::Device::getEventStatus", { Result::eEventSet, Result::eEventReset } ); VULKAN_HPP_NAMESPACE_STRING "::Device::getEventStatus",
{ VULKAN_HPP_NAMESPACE::Result::eEventSet, VULKAN_HPP_NAMESPACE::Result::eEventReset } );
} }
#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
@ -98110,8 +98113,9 @@ namespace VULKAN_HPP_NAMESPACE
Dispatch const & d ) const Dispatch const & d ) const
{ {
Result result = static_cast<Result>( d.vkGetFenceStatus( m_device, static_cast<VkFence>( fence ) ) ); Result result = static_cast<Result>( d.vkGetFenceStatus( m_device, static_cast<VkFence>( fence ) ) );
return createResultValue( return createResultValue( result,
result, VULKAN_HPP_NAMESPACE_STRING "::Device::getFenceStatus", { Result::eSuccess, Result::eNotReady } ); VULKAN_HPP_NAMESPACE_STRING "::Device::getFenceStatus",
{ VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eNotReady } );
} }
#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
@ -99915,9 +99919,10 @@ namespace VULKAN_HPP_NAMESPACE
{ {
Result result = Result result =
static_cast<Result>( d.vkGetSwapchainStatusKHR( m_device, static_cast<VkSwapchainKHR>( swapchain ) ) ); static_cast<Result>( d.vkGetSwapchainStatusKHR( m_device, static_cast<VkSwapchainKHR>( swapchain ) ) );
return createResultValue( result, return createResultValue(
VULKAN_HPP_NAMESPACE_STRING "::Device::getSwapchainStatusKHR", result,
{ Result::eSuccess, Result::eSuboptimalKHR } ); VULKAN_HPP_NAMESPACE_STRING "::Device::getSwapchainStatusKHR",
{ VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eSuboptimalKHR } );
} }
#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/