mirror of
https://github.com/KhronosGroup/Vulkan-Hpp
synced 2024-11-26 22:00:08 +00:00
Merge pull request #1321 from asuessenbach/function
Combine two types of commands into one generation function
This commit is contained in:
commit
3c80f9a60b
@ -6459,8 +6459,8 @@ std::string VulkanHppGenerator::generateRAIIHandleCommandResultMultiSuccessWithE
|
|||||||
switch ( returnParams.size() )
|
switch ( returnParams.size() )
|
||||||
{
|
{
|
||||||
case 0:
|
case 0:
|
||||||
return generateRAIIHandleCommandResultMultiSuccessWithErrors0Return(
|
return generateRAIIHandleCommandEnhanced(
|
||||||
commandIt, initialSkipCount, determineVectorParams( commandIt->second.params ), definition );
|
commandIt, initialSkipCount, returnParams, determineVectorParams( commandIt->second.params ), definition, false );
|
||||||
break;
|
break;
|
||||||
case 1: return generateRAIIHandleCommandResultMultiSuccessWithErrors1Return( commandIt, initialSkipCount, definition, returnParams[0] ); break;
|
case 1: return generateRAIIHandleCommandResultMultiSuccessWithErrors1Return( commandIt, initialSkipCount, definition, returnParams[0] ); break;
|
||||||
case 2: return generateRAIIHandleCommandResultMultiSuccessWithErrors2Return( commandIt, initialSkipCount, definition, returnParams ); break;
|
case 2: return generateRAIIHandleCommandResultMultiSuccessWithErrors2Return( commandIt, initialSkipCount, definition, returnParams ); break;
|
||||||
@ -6469,69 +6469,6 @@ std::string VulkanHppGenerator::generateRAIIHandleCommandResultMultiSuccessWithE
|
|||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string VulkanHppGenerator::generateRAIIHandleCommandResultMultiSuccessWithErrors0Return( std::map<std::string, CommandData>::const_iterator commandIt,
|
|
||||||
size_t initialSkipCount,
|
|
||||||
std::map<size_t, size_t> const & vectorParams,
|
|
||||||
bool definition ) const
|
|
||||||
{
|
|
||||||
std::set<size_t> skippedParams = determineSkippedParams( commandIt->second.params, initialSkipCount, vectorParams, {}, false );
|
|
||||||
std::set<size_t> templatedParams = determineVoidPointerParams( commandIt->second.params );
|
|
||||||
std::string argumentList =
|
|
||||||
generateArgumentListEnhanced( commandIt->second.params, {}, vectorParams, skippedParams, {}, templatedParams, definition, false, false, false );
|
|
||||||
std::string argumentTemplates = generateArgumentTemplates( commandIt->second.params, {}, vectorParams, templatedParams, false, true );
|
|
||||||
std::string commandName = generateCommandName( commandIt->first, commandIt->second.params, initialSkipCount, m_tags, false, false );
|
|
||||||
|
|
||||||
if ( definition )
|
|
||||||
{
|
|
||||||
std::string const definitionTemplate =
|
|
||||||
R"(
|
|
||||||
${argumentTemplates}
|
|
||||||
VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result ${className}::${commandName}( ${argumentList} ) const
|
|
||||||
{${functionPointerCheck}
|
|
||||||
${vectorSizeCheck}
|
|
||||||
VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->${vkCommand}( ${callArguments} ) );
|
|
||||||
if ( ${failureCheck} )
|
|
||||||
{
|
|
||||||
throwResultException( result, VULKAN_HPP_NAMESPACE_STRING"::${className}::${commandName}" );
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
)";
|
|
||||||
|
|
||||||
std::string callArguments = generateCallArgumentsEnhanced( commandIt->second, initialSkipCount, false, {}, templatedParams, true );
|
|
||||||
std::pair<bool, std::map<size_t, std::vector<size_t>>> vectorSizeCheck = needsVectorSizeCheck( commandIt->second.params, vectorParams, {}, {} );
|
|
||||||
std::string vectorSizeCheckString =
|
|
||||||
vectorSizeCheck.first ? generateRAIIHandleVectorSizeCheck( commandIt->first, commandIt->second, initialSkipCount, vectorSizeCheck.second, skippedParams )
|
|
||||||
: "";
|
|
||||||
|
|
||||||
return replaceWithMap( definitionTemplate,
|
|
||||||
{ { "argumentList", argumentList },
|
|
||||||
{ "argumentTemplates", argumentTemplates },
|
|
||||||
{ "callArguments", callArguments },
|
|
||||||
{ "className", stripPrefix( commandIt->second.params[initialSkipCount - 1].type.type, "Vk" ) },
|
|
||||||
{ "commandName", commandName },
|
|
||||||
{ "failureCheck", generateFailureCheck( commandIt->second.successCodes ) },
|
|
||||||
{ "functionPointerCheck", generateFunctionPointerCheck( commandIt->first, commandIt->second.referencedIn ) },
|
|
||||||
{ "vectorSizeCheck", vectorSizeCheckString },
|
|
||||||
{ "vkCommand", commandIt->first } } );
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
std::string const declarationTemplate =
|
|
||||||
R"(
|
|
||||||
${argumentTemplates}
|
|
||||||
VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result ${commandName}( ${argumentList} ) const;
|
|
||||||
)";
|
|
||||||
|
|
||||||
return replaceWithMap( declarationTemplate,
|
|
||||||
{
|
|
||||||
{ "argumentList", argumentList },
|
|
||||||
{ "argumentTemplates", argumentTemplates },
|
|
||||||
{ "commandName", commandName },
|
|
||||||
} );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string VulkanHppGenerator::generateRAIIHandleCommandResultMultiSuccessWithErrors1Return( std::map<std::string, CommandData>::const_iterator commandIt,
|
std::string VulkanHppGenerator::generateRAIIHandleCommandResultMultiSuccessWithErrors1Return( std::map<std::string, CommandData>::const_iterator commandIt,
|
||||||
size_t initialSkipCount,
|
size_t initialSkipCount,
|
||||||
bool definition,
|
bool definition,
|
||||||
|
@ -707,10 +707,6 @@ private:
|
|||||||
std::string generateRAIIHandleCommandResultMultiSuccessWithErrors( std::map<std::string, CommandData>::const_iterator commandIt,
|
std::string generateRAIIHandleCommandResultMultiSuccessWithErrors( std::map<std::string, CommandData>::const_iterator commandIt,
|
||||||
size_t initialSkipCount,
|
size_t initialSkipCount,
|
||||||
bool definition ) const;
|
bool definition ) const;
|
||||||
std::string generateRAIIHandleCommandResultMultiSuccessWithErrors0Return( std::map<std::string, CommandData>::const_iterator commandIt,
|
|
||||||
size_t initialSkipCount,
|
|
||||||
std::map<size_t, size_t> const & vectorParamIndices,
|
|
||||||
bool definition ) const;
|
|
||||||
std::string generateRAIIHandleCommandResultMultiSuccessWithErrors1Return( std::map<std::string, CommandData>::const_iterator commandIt,
|
std::string generateRAIIHandleCommandResultMultiSuccessWithErrors1Return( std::map<std::string, CommandData>::const_iterator commandIt,
|
||||||
size_t initialSkipCount,
|
size_t initialSkipCount,
|
||||||
bool definition,
|
bool definition,
|
||||||
|
@ -10570,25 +10570,22 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
|
|
||||||
VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result Fence::getStatus() const
|
VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result Fence::getStatus() const
|
||||||
{
|
{
|
||||||
VULKAN_HPP_NAMESPACE::Result result =
|
VkResult result = getDispatcher()->vkGetFenceStatus( static_cast<VkDevice>( m_device ), static_cast<VkFence>( m_fence ) );
|
||||||
static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetFenceStatus( static_cast<VkDevice>( m_device ), static_cast<VkFence>( m_fence ) ) );
|
resultCheck( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ),
|
||||||
if ( ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess ) && ( result != VULKAN_HPP_NAMESPACE::Result::eNotReady ) )
|
VULKAN_HPP_NAMESPACE_STRING "::Fence::getStatus",
|
||||||
{
|
{ VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eNotReady } );
|
||||||
throwResultException( result, VULKAN_HPP_NAMESPACE_STRING "::Fence::getStatus" );
|
return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result
|
VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result
|
||||||
Device::waitForFences( ArrayProxy<const VULKAN_HPP_NAMESPACE::Fence> const & fences, VULKAN_HPP_NAMESPACE::Bool32 waitAll, uint64_t timeout ) const
|
Device::waitForFences( ArrayProxy<const VULKAN_HPP_NAMESPACE::Fence> const & fences, VULKAN_HPP_NAMESPACE::Bool32 waitAll, uint64_t timeout ) const
|
||||||
{
|
{
|
||||||
VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkWaitForFences(
|
VkResult result = getDispatcher()->vkWaitForFences(
|
||||||
static_cast<VkDevice>( m_device ), fences.size(), reinterpret_cast<const VkFence *>( fences.data() ), static_cast<VkBool32>( waitAll ), timeout ) );
|
static_cast<VkDevice>( m_device ), fences.size(), reinterpret_cast<const VkFence *>( fences.data() ), static_cast<VkBool32>( waitAll ), timeout );
|
||||||
if ( ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess ) && ( result != VULKAN_HPP_NAMESPACE::Result::eTimeout ) )
|
resultCheck( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ),
|
||||||
{
|
VULKAN_HPP_NAMESPACE_STRING "::Device::waitForFences",
|
||||||
throwResultException( result, VULKAN_HPP_NAMESPACE_STRING "::Device::waitForFences" );
|
{ VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eTimeout } );
|
||||||
}
|
return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
|
||||||
return result;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_RAII_NAMESPACE::Semaphore
|
VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_RAII_NAMESPACE::Semaphore
|
||||||
@ -10607,13 +10604,11 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
|
|
||||||
VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result Event::getStatus() const
|
VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result Event::getStatus() const
|
||||||
{
|
{
|
||||||
VULKAN_HPP_NAMESPACE::Result result =
|
VkResult result = getDispatcher()->vkGetEventStatus( static_cast<VkDevice>( m_device ), static_cast<VkEvent>( m_event ) );
|
||||||
static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetEventStatus( static_cast<VkDevice>( m_device ), static_cast<VkEvent>( m_event ) ) );
|
resultCheck( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ),
|
||||||
if ( ( result != VULKAN_HPP_NAMESPACE::Result::eEventSet ) && ( result != VULKAN_HPP_NAMESPACE::Result::eEventReset ) )
|
VULKAN_HPP_NAMESPACE_STRING "::Event::getStatus",
|
||||||
{
|
{ VULKAN_HPP_NAMESPACE::Result::eEventSet, VULKAN_HPP_NAMESPACE::Result::eEventReset } );
|
||||||
throwResultException( result, VULKAN_HPP_NAMESPACE_STRING "::Event::getStatus" );
|
return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
VULKAN_HPP_INLINE void Event::set() const
|
VULKAN_HPP_INLINE void Event::set() const
|
||||||
@ -11830,13 +11825,12 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result Device::waitSemaphores( const VULKAN_HPP_NAMESPACE::SemaphoreWaitInfo & waitInfo,
|
VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result Device::waitSemaphores( const VULKAN_HPP_NAMESPACE::SemaphoreWaitInfo & waitInfo,
|
||||||
uint64_t timeout ) const
|
uint64_t timeout ) const
|
||||||
{
|
{
|
||||||
VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
|
VkResult result =
|
||||||
getDispatcher()->vkWaitSemaphores( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkSemaphoreWaitInfo *>( &waitInfo ), timeout ) );
|
getDispatcher()->vkWaitSemaphores( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkSemaphoreWaitInfo *>( &waitInfo ), timeout );
|
||||||
if ( ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess ) && ( result != VULKAN_HPP_NAMESPACE::Result::eTimeout ) )
|
resultCheck( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ),
|
||||||
{
|
VULKAN_HPP_NAMESPACE_STRING "::Device::waitSemaphores",
|
||||||
throwResultException( result, VULKAN_HPP_NAMESPACE_STRING "::Device::waitSemaphores" );
|
{ VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eTimeout } );
|
||||||
}
|
return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
|
||||||
return result;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
VULKAN_HPP_INLINE void Device::signalSemaphore( const VULKAN_HPP_NAMESPACE::SemaphoreSignalInfo & signalInfo ) const
|
VULKAN_HPP_INLINE void Device::signalSemaphore( const VULKAN_HPP_NAMESPACE::SemaphoreSignalInfo & signalInfo ) const
|
||||||
@ -12366,13 +12360,11 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
{
|
{
|
||||||
VULKAN_HPP_ASSERT( getDispatcher()->vkQueuePresentKHR && "Function <vkQueuePresentKHR> needs extension <VK_KHR_swapchain> enabled!" );
|
VULKAN_HPP_ASSERT( getDispatcher()->vkQueuePresentKHR && "Function <vkQueuePresentKHR> needs extension <VK_KHR_swapchain> enabled!" );
|
||||||
|
|
||||||
VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
|
VkResult result = getDispatcher()->vkQueuePresentKHR( static_cast<VkQueue>( m_queue ), reinterpret_cast<const VkPresentInfoKHR *>( &presentInfo ) );
|
||||||
getDispatcher()->vkQueuePresentKHR( static_cast<VkQueue>( m_queue ), reinterpret_cast<const VkPresentInfoKHR *>( &presentInfo ) ) );
|
resultCheck( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ),
|
||||||
if ( ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess ) && ( result != VULKAN_HPP_NAMESPACE::Result::eSuboptimalKHR ) )
|
VULKAN_HPP_NAMESPACE_STRING "::Queue::presentKHR",
|
||||||
{
|
{ VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eSuboptimalKHR } );
|
||||||
throwResultException( result, VULKAN_HPP_NAMESPACE_STRING "::Queue::presentKHR" );
|
return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::DeviceGroupPresentCapabilitiesKHR Device::getGroupPresentCapabilitiesKHR() const
|
VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::DeviceGroupPresentCapabilitiesKHR Device::getGroupPresentCapabilitiesKHR() const
|
||||||
@ -14016,13 +14008,11 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
VULKAN_HPP_ASSERT( getDispatcher()->vkGetSwapchainStatusKHR &&
|
VULKAN_HPP_ASSERT( getDispatcher()->vkGetSwapchainStatusKHR &&
|
||||||
"Function <vkGetSwapchainStatusKHR> needs extension <VK_KHR_shared_presentable_image> enabled!" );
|
"Function <vkGetSwapchainStatusKHR> needs extension <VK_KHR_shared_presentable_image> enabled!" );
|
||||||
|
|
||||||
VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
|
VkResult result = getDispatcher()->vkGetSwapchainStatusKHR( static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( m_swapchain ) );
|
||||||
getDispatcher()->vkGetSwapchainStatusKHR( static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( m_swapchain ) ) );
|
resultCheck( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ),
|
||||||
if ( ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess ) && ( result != VULKAN_HPP_NAMESPACE::Result::eSuboptimalKHR ) )
|
VULKAN_HPP_NAMESPACE_STRING "::SwapchainKHR::getStatus",
|
||||||
{
|
{ VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eSuboptimalKHR } );
|
||||||
throwResultException( result, VULKAN_HPP_NAMESPACE_STRING "::SwapchainKHR::getStatus" );
|
return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//=== VK_KHR_external_fence_capabilities ===
|
//=== VK_KHR_external_fence_capabilities ===
|
||||||
@ -14736,18 +14726,18 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
throw LogicError( VULKAN_HPP_NAMESPACE_STRING "::Device::buildAccelerationStructuresKHR: infos.size() != pBuildRangeInfos.size()" );
|
throw LogicError( VULKAN_HPP_NAMESPACE_STRING "::Device::buildAccelerationStructuresKHR: infos.size() != pBuildRangeInfos.size()" );
|
||||||
}
|
}
|
||||||
|
|
||||||
VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkBuildAccelerationStructuresKHR(
|
VkResult result = getDispatcher()->vkBuildAccelerationStructuresKHR(
|
||||||
static_cast<VkDevice>( m_device ),
|
static_cast<VkDevice>( m_device ),
|
||||||
static_cast<VkDeferredOperationKHR>( deferredOperation ),
|
static_cast<VkDeferredOperationKHR>( deferredOperation ),
|
||||||
infos.size(),
|
infos.size(),
|
||||||
reinterpret_cast<const VkAccelerationStructureBuildGeometryInfoKHR *>( infos.data() ),
|
reinterpret_cast<const VkAccelerationStructureBuildGeometryInfoKHR *>( infos.data() ),
|
||||||
reinterpret_cast<const VkAccelerationStructureBuildRangeInfoKHR * const *>( pBuildRangeInfos.data() ) ) );
|
reinterpret_cast<const VkAccelerationStructureBuildRangeInfoKHR * const *>( pBuildRangeInfos.data() ) );
|
||||||
if ( ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess ) && ( result != VULKAN_HPP_NAMESPACE::Result::eOperationDeferredKHR ) &&
|
resultCheck( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ),
|
||||||
( result != VULKAN_HPP_NAMESPACE::Result::eOperationNotDeferredKHR ) )
|
VULKAN_HPP_NAMESPACE_STRING "::Device::buildAccelerationStructuresKHR",
|
||||||
{
|
{ VULKAN_HPP_NAMESPACE::Result::eSuccess,
|
||||||
throwResultException( result, VULKAN_HPP_NAMESPACE_STRING "::Device::buildAccelerationStructuresKHR" );
|
VULKAN_HPP_NAMESPACE::Result::eOperationDeferredKHR,
|
||||||
}
|
VULKAN_HPP_NAMESPACE::Result::eOperationNotDeferredKHR } );
|
||||||
return result;
|
return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
|
||||||
}
|
}
|
||||||
|
|
||||||
VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result
|
VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result
|
||||||
@ -14757,16 +14747,15 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
VULKAN_HPP_ASSERT( getDispatcher()->vkCopyAccelerationStructureKHR &&
|
VULKAN_HPP_ASSERT( getDispatcher()->vkCopyAccelerationStructureKHR &&
|
||||||
"Function <vkCopyAccelerationStructureKHR> needs extension <VK_KHR_acceleration_structure> enabled!" );
|
"Function <vkCopyAccelerationStructureKHR> needs extension <VK_KHR_acceleration_structure> enabled!" );
|
||||||
|
|
||||||
VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
|
VkResult result = getDispatcher()->vkCopyAccelerationStructureKHR( static_cast<VkDevice>( m_device ),
|
||||||
getDispatcher()->vkCopyAccelerationStructureKHR( static_cast<VkDevice>( m_device ),
|
static_cast<VkDeferredOperationKHR>( deferredOperation ),
|
||||||
static_cast<VkDeferredOperationKHR>( deferredOperation ),
|
reinterpret_cast<const VkCopyAccelerationStructureInfoKHR *>( &info ) );
|
||||||
reinterpret_cast<const VkCopyAccelerationStructureInfoKHR *>( &info ) ) );
|
resultCheck( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ),
|
||||||
if ( ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess ) && ( result != VULKAN_HPP_NAMESPACE::Result::eOperationDeferredKHR ) &&
|
VULKAN_HPP_NAMESPACE_STRING "::Device::copyAccelerationStructureKHR",
|
||||||
( result != VULKAN_HPP_NAMESPACE::Result::eOperationNotDeferredKHR ) )
|
{ VULKAN_HPP_NAMESPACE::Result::eSuccess,
|
||||||
{
|
VULKAN_HPP_NAMESPACE::Result::eOperationDeferredKHR,
|
||||||
throwResultException( result, VULKAN_HPP_NAMESPACE_STRING "::Device::copyAccelerationStructureKHR" );
|
VULKAN_HPP_NAMESPACE::Result::eOperationNotDeferredKHR } );
|
||||||
}
|
return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
|
||||||
return result;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result
|
VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result
|
||||||
@ -14776,16 +14765,16 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
VULKAN_HPP_ASSERT( getDispatcher()->vkCopyAccelerationStructureToMemoryKHR &&
|
VULKAN_HPP_ASSERT( getDispatcher()->vkCopyAccelerationStructureToMemoryKHR &&
|
||||||
"Function <vkCopyAccelerationStructureToMemoryKHR> needs extension <VK_KHR_acceleration_structure> enabled!" );
|
"Function <vkCopyAccelerationStructureToMemoryKHR> needs extension <VK_KHR_acceleration_structure> enabled!" );
|
||||||
|
|
||||||
VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
|
VkResult result =
|
||||||
getDispatcher()->vkCopyAccelerationStructureToMemoryKHR( static_cast<VkDevice>( m_device ),
|
getDispatcher()->vkCopyAccelerationStructureToMemoryKHR( static_cast<VkDevice>( m_device ),
|
||||||
static_cast<VkDeferredOperationKHR>( deferredOperation ),
|
static_cast<VkDeferredOperationKHR>( deferredOperation ),
|
||||||
reinterpret_cast<const VkCopyAccelerationStructureToMemoryInfoKHR *>( &info ) ) );
|
reinterpret_cast<const VkCopyAccelerationStructureToMemoryInfoKHR *>( &info ) );
|
||||||
if ( ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess ) && ( result != VULKAN_HPP_NAMESPACE::Result::eOperationDeferredKHR ) &&
|
resultCheck( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ),
|
||||||
( result != VULKAN_HPP_NAMESPACE::Result::eOperationNotDeferredKHR ) )
|
VULKAN_HPP_NAMESPACE_STRING "::Device::copyAccelerationStructureToMemoryKHR",
|
||||||
{
|
{ VULKAN_HPP_NAMESPACE::Result::eSuccess,
|
||||||
throwResultException( result, VULKAN_HPP_NAMESPACE_STRING "::Device::copyAccelerationStructureToMemoryKHR" );
|
VULKAN_HPP_NAMESPACE::Result::eOperationDeferredKHR,
|
||||||
}
|
VULKAN_HPP_NAMESPACE::Result::eOperationNotDeferredKHR } );
|
||||||
return result;
|
return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
|
||||||
}
|
}
|
||||||
|
|
||||||
VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result
|
VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result
|
||||||
@ -14795,16 +14784,16 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
VULKAN_HPP_ASSERT( getDispatcher()->vkCopyMemoryToAccelerationStructureKHR &&
|
VULKAN_HPP_ASSERT( getDispatcher()->vkCopyMemoryToAccelerationStructureKHR &&
|
||||||
"Function <vkCopyMemoryToAccelerationStructureKHR> needs extension <VK_KHR_acceleration_structure> enabled!" );
|
"Function <vkCopyMemoryToAccelerationStructureKHR> needs extension <VK_KHR_acceleration_structure> enabled!" );
|
||||||
|
|
||||||
VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
|
VkResult result =
|
||||||
getDispatcher()->vkCopyMemoryToAccelerationStructureKHR( static_cast<VkDevice>( m_device ),
|
getDispatcher()->vkCopyMemoryToAccelerationStructureKHR( static_cast<VkDevice>( m_device ),
|
||||||
static_cast<VkDeferredOperationKHR>( deferredOperation ),
|
static_cast<VkDeferredOperationKHR>( deferredOperation ),
|
||||||
reinterpret_cast<const VkCopyMemoryToAccelerationStructureInfoKHR *>( &info ) ) );
|
reinterpret_cast<const VkCopyMemoryToAccelerationStructureInfoKHR *>( &info ) );
|
||||||
if ( ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess ) && ( result != VULKAN_HPP_NAMESPACE::Result::eOperationDeferredKHR ) &&
|
resultCheck( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ),
|
||||||
( result != VULKAN_HPP_NAMESPACE::Result::eOperationNotDeferredKHR ) )
|
VULKAN_HPP_NAMESPACE_STRING "::Device::copyMemoryToAccelerationStructureKHR",
|
||||||
{
|
{ VULKAN_HPP_NAMESPACE::Result::eSuccess,
|
||||||
throwResultException( result, VULKAN_HPP_NAMESPACE_STRING "::Device::copyMemoryToAccelerationStructureKHR" );
|
VULKAN_HPP_NAMESPACE::Result::eOperationDeferredKHR,
|
||||||
}
|
VULKAN_HPP_NAMESPACE::Result::eOperationNotDeferredKHR } );
|
||||||
return result;
|
return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename DataType>
|
template <typename DataType>
|
||||||
@ -15607,13 +15596,12 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
{
|
{
|
||||||
VULKAN_HPP_ASSERT( getDispatcher()->vkWaitSemaphoresKHR && "Function <vkWaitSemaphoresKHR> needs extension <VK_KHR_timeline_semaphore> enabled!" );
|
VULKAN_HPP_ASSERT( getDispatcher()->vkWaitSemaphoresKHR && "Function <vkWaitSemaphoresKHR> needs extension <VK_KHR_timeline_semaphore> enabled!" );
|
||||||
|
|
||||||
VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
|
VkResult result =
|
||||||
getDispatcher()->vkWaitSemaphoresKHR( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkSemaphoreWaitInfo *>( &waitInfo ), timeout ) );
|
getDispatcher()->vkWaitSemaphoresKHR( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkSemaphoreWaitInfo *>( &waitInfo ), timeout );
|
||||||
if ( ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess ) && ( result != VULKAN_HPP_NAMESPACE::Result::eTimeout ) )
|
resultCheck( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ),
|
||||||
{
|
VULKAN_HPP_NAMESPACE_STRING "::Device::waitSemaphoresKHR",
|
||||||
throwResultException( result, VULKAN_HPP_NAMESPACE_STRING "::Device::waitSemaphoresKHR" );
|
{ VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eTimeout } );
|
||||||
}
|
return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
|
||||||
return result;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
VULKAN_HPP_INLINE void Device::signalSemaphoreKHR( const VULKAN_HPP_NAMESPACE::SemaphoreSignalInfo & signalInfo ) const
|
VULKAN_HPP_INLINE void Device::signalSemaphoreKHR( const VULKAN_HPP_NAMESPACE::SemaphoreSignalInfo & signalInfo ) const
|
||||||
@ -15841,14 +15829,12 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
{
|
{
|
||||||
VULKAN_HPP_ASSERT( getDispatcher()->vkWaitForPresentKHR && "Function <vkWaitForPresentKHR> needs extension <VK_KHR_present_wait> enabled!" );
|
VULKAN_HPP_ASSERT( getDispatcher()->vkWaitForPresentKHR && "Function <vkWaitForPresentKHR> needs extension <VK_KHR_present_wait> enabled!" );
|
||||||
|
|
||||||
VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
|
VkResult result =
|
||||||
getDispatcher()->vkWaitForPresentKHR( static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( m_swapchain ), presentId, timeout ) );
|
getDispatcher()->vkWaitForPresentKHR( static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( m_swapchain ), presentId, timeout );
|
||||||
if ( ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess ) && ( result != VULKAN_HPP_NAMESPACE::Result::eTimeout ) &&
|
resultCheck( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ),
|
||||||
( result != VULKAN_HPP_NAMESPACE::Result::eSuboptimalKHR ) )
|
VULKAN_HPP_NAMESPACE_STRING "::SwapchainKHR::waitForPresent",
|
||||||
{
|
{ VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eTimeout, VULKAN_HPP_NAMESPACE::Result::eSuboptimalKHR } );
|
||||||
throwResultException( result, VULKAN_HPP_NAMESPACE_STRING "::SwapchainKHR::waitForPresent" );
|
return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//=== VK_NV_cooperative_matrix ===
|
//=== VK_NV_cooperative_matrix ===
|
||||||
@ -16231,14 +16217,11 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
VULKAN_HPP_ASSERT( getDispatcher()->vkDeferredOperationJoinKHR &&
|
VULKAN_HPP_ASSERT( getDispatcher()->vkDeferredOperationJoinKHR &&
|
||||||
"Function <vkDeferredOperationJoinKHR> needs extension <VK_KHR_deferred_host_operations> enabled!" );
|
"Function <vkDeferredOperationJoinKHR> needs extension <VK_KHR_deferred_host_operations> enabled!" );
|
||||||
|
|
||||||
VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
|
VkResult result = getDispatcher()->vkDeferredOperationJoinKHR( static_cast<VkDevice>( m_device ), static_cast<VkDeferredOperationKHR>( m_operation ) );
|
||||||
getDispatcher()->vkDeferredOperationJoinKHR( static_cast<VkDevice>( m_device ), static_cast<VkDeferredOperationKHR>( m_operation ) ) );
|
resultCheck( static_cast<VULKAN_HPP_NAMESPACE::Result>( result ),
|
||||||
if ( ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess ) && ( result != VULKAN_HPP_NAMESPACE::Result::eThreadDoneKHR ) &&
|
VULKAN_HPP_NAMESPACE_STRING "::DeferredOperationKHR::join",
|
||||||
( result != VULKAN_HPP_NAMESPACE::Result::eThreadIdleKHR ) )
|
{ VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eThreadDoneKHR, VULKAN_HPP_NAMESPACE::Result::eThreadIdleKHR } );
|
||||||
{
|
return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
|
||||||
throwResultException( result, VULKAN_HPP_NAMESPACE_STRING "::DeferredOperationKHR::join" );
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//=== VK_KHR_pipeline_executable_properties ===
|
//=== VK_KHR_pipeline_executable_properties ===
|
||||||
|
Loading…
Reference in New Issue
Block a user