Created
May 5, 2020 15:20
-
-
Save tomilov/7f5b4d26e187345ccc740bab02f5ae4d to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- c:/Users/Anatoly/Documents/Projects/Vulkan-Hpp/vulkan/vulkan.hpp 2020-05-05 20:09:03.802924000 +0500 | |
+++ c:/VulkanSDK/1.2.135.0/Include/vulkan/vulkan.hpp 2020-04-24 11:54:44.062122600 +0500 | |
@@ -13150,6 +13150,22 @@ | |
return UniqueHandle<T,D>(data, deleter); | |
#endif | |
} | |
+ | |
+ template <typename T, typename D> | |
+ VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<T,D>>::type createResultValue( Result result, T & data, char const * message, std::initializer_list<Result> successCodes, typename UniqueHandleTraits<T,D>::deleter const& deleter ) | |
+ { | |
+#ifdef VULKAN_HPP_NO_EXCEPTIONS | |
+ ignore(message); | |
+ VULKAN_HPP_ASSERT( result == Result::eSuccess ); | |
+ return ResultValue<UniqueHandle<T,D>>( result, UniqueHandle<T,D>(data, deleter) ); | |
+#else | |
+ if ( std::find( successCodes.begin(), successCodes.end(), result ) == successCodes.end() ) | |
+ { | |
+ throwResultException( result, message ); | |
+ } | |
+ return UniqueHandle<T,D>(data, deleter); | |
+#endif | |
+ } | |
#endif | |
struct AabbPositionsKHR; | |
@@ -17833,7 +17849,7 @@ | |
template<typename Allocator = std::allocator<UniquePipeline>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE> | |
ResultValue<std::vector<UniqueHandle<Pipeline,Dispatch>,Allocator>> createRayTracingPipelinesKHRUnique( VULKAN_HPP_NAMESPACE::PipelineCache pipelineCache, ArrayProxy<const VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoKHR> createInfos, Optional<const AllocationCallbacks> allocator, Allocator const& vectorAllocator, Dispatch const &d ) const; | |
template<typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE> | |
- ResultValue<UniqueHandle<Pipeline,Dispatch>> createRayTracingPipelineKHRUnique( VULKAN_HPP_NAMESPACE::PipelineCache pipelineCache, const RayTracingPipelineCreateInfoKHR & createInfo, Optional<const AllocationCallbacks> allocator = nullptr, Dispatch const &d = VULKAN_HPP_DEFAULT_DISPATCHER ) const; | |
+ typename ResultValueType<UniqueHandle<Pipeline,Dispatch>>::type createRayTracingPipelineKHRUnique( VULKAN_HPP_NAMESPACE::PipelineCache pipelineCache, const RayTracingPipelineCreateInfoKHR & createInfo, Optional<const AllocationCallbacks> allocator = nullptr, Dispatch const &d = VULKAN_HPP_DEFAULT_DISPATCHER ) const; | |
#endif /*VULKAN_HPP_NO_SMART_HANDLE*/ | |
#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ | |
#endif /*VK_ENABLE_BETA_EXTENSIONS*/ | |
@@ -74640,7 +74656,7 @@ | |
return createResultValue( result, pipelines, VULKAN_HPP_NAMESPACE_STRING "::Device::createRayTracingPipelinesKHRUnique", { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eOperationDeferredKHR, VULKAN_HPP_NAMESPACE::Result::eOperationNotDeferredKHR } ); | |
} | |
template<typename Dispatch> | |
- VULKAN_HPP_INLINE ResultValue<UniqueHandle<Pipeline,Dispatch>> Device::createRayTracingPipelineKHRUnique( VULKAN_HPP_NAMESPACE::PipelineCache pipelineCache, const RayTracingPipelineCreateInfoKHR & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const &d ) const | |
+ VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<Pipeline,Dispatch>>::type Device::createRayTracingPipelineKHRUnique( VULKAN_HPP_NAMESPACE::PipelineCache pipelineCache, const RayTracingPipelineCreateInfoKHR & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const &d ) const | |
{ | |
Pipeline pipeline; | |
Result result = static_cast<Result>( d.vkCreateRayTracingPipelinesKHR( m_device, static_cast<VkPipelineCache>( pipelineCache ), 1 , reinterpret_cast<const VkRayTracingPipelineCreateInfoKHR*>( &createInfo ), reinterpret_cast<const VkAllocationCallbacks*>( static_cast<const AllocationCallbacks*>( allocator ) ), reinterpret_cast<VkPipeline*>( &pipeline ) ) ); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment