From 813f392fdf205cbe555355a7f2c5c37856533c7a Mon Sep 17 00:00:00 2001 From: mklefrancois <38076163+mklefrancois@users.noreply.github.com> Date: Mon, 22 Jun 2020 15:40:32 +0200 Subject: [PATCH] Make creation of pipeline backward compatible with previous SDK --- ray_tracing__advance/raytrace.cpp | 3 ++- ray_tracing__simple/hello_vulkan.cpp | 3 ++- ray_tracing_animation/hello_vulkan.cpp | 6 ++++-- ray_tracing_callable/hello_vulkan.cpp | 3 ++- ray_tracing_instances/hello_vulkan.cpp | 3 ++- ray_tracing_intersection/hello_vulkan.cpp | 3 ++- ray_tracing_jitter_cam/hello_vulkan.cpp | 3 ++- ray_tracing_manyhits/hello_vulkan.cpp | 3 ++- ray_tracing_reflections/hello_vulkan.cpp | 3 ++- 9 files changed, 20 insertions(+), 10 deletions(-) diff --git a/ray_tracing__advance/raytrace.cpp b/ray_tracing__advance/raytrace.cpp index c8dd470..6d6e07a 100644 --- a/ray_tracing__advance/raytrace.cpp +++ b/ray_tracing__advance/raytrace.cpp @@ -395,7 +395,8 @@ void Raytracer::createRtPipeline(vk::DescriptorSetLayout& sceneDescLayout) rayPipelineInfo.setMaxRecursionDepth(2); // Ray depth rayPipelineInfo.setLayout(m_rtPipelineLayout); - m_rtPipeline = m_device.createRayTracingPipelineKHR({}, rayPipelineInfo).value; + m_rtPipeline = + static_cast(m_device.createRayTracingPipelineKHR({}, rayPipelineInfo)); m_device.destroy(raygenSM); m_device.destroy(missSM); diff --git a/ray_tracing__simple/hello_vulkan.cpp b/ray_tracing__simple/hello_vulkan.cpp index 5235d56..157cd9e 100644 --- a/ray_tracing__simple/hello_vulkan.cpp +++ b/ray_tracing__simple/hello_vulkan.cpp @@ -836,7 +836,8 @@ void HelloVulkan::createRtPipeline() rayPipelineInfo.setMaxRecursionDepth(2); // Ray depth rayPipelineInfo.setLayout(m_rtPipelineLayout); - m_rtPipeline = m_device.createRayTracingPipelineKHR({}, rayPipelineInfo).value; + m_rtPipeline = + static_cast(m_device.createRayTracingPipelineKHR({}, rayPipelineInfo)); m_device.destroy(raygenSM); m_device.destroy(missSM); diff --git a/ray_tracing_animation/hello_vulkan.cpp b/ray_tracing_animation/hello_vulkan.cpp index 5a80c6e..16239a8 100644 --- a/ray_tracing_animation/hello_vulkan.cpp +++ b/ray_tracing_animation/hello_vulkan.cpp @@ -832,7 +832,8 @@ void HelloVulkan::createRtPipeline() rayPipelineInfo.setMaxRecursionDepth(2); // Ray depth rayPipelineInfo.setLayout(m_rtPipelineLayout); - m_rtPipeline = m_device.createRayTracingPipelineKHR({}, rayPipelineInfo).value; + m_rtPipeline = + static_cast(m_device.createRayTracingPipelineKHR({}, rayPipelineInfo)); m_device.destroy(raygenSM); m_device.destroy(missSM); @@ -1016,6 +1017,7 @@ void HelloVulkan::createCompPipelines() nvvk::createShaderStageInfo(m_device, nvh::loadFile("shaders/anim.comp.spv", true, defaultSearchPaths), VK_SHADER_STAGE_COMPUTE_BIT); - m_compPipeline = m_device.createComputePipeline({}, computePipelineCreateInfo).value; + m_compPipeline = static_cast( + m_device.createComputePipeline({}, computePipelineCreateInfo)); m_device.destroy(computePipelineCreateInfo.stage.module); } diff --git a/ray_tracing_callable/hello_vulkan.cpp b/ray_tracing_callable/hello_vulkan.cpp index 8e66a8f..f46d1b3 100644 --- a/ray_tracing_callable/hello_vulkan.cpp +++ b/ray_tracing_callable/hello_vulkan.cpp @@ -849,7 +849,8 @@ void HelloVulkan::createRtPipeline() rayPipelineInfo.setMaxRecursionDepth(2); // Ray depth rayPipelineInfo.setLayout(m_rtPipelineLayout); - m_rtPipeline = m_device.createRayTracingPipelineKHR({}, rayPipelineInfo).value; + m_rtPipeline = + static_cast(m_device.createRayTracingPipelineKHR({}, rayPipelineInfo)); m_device.destroy(raygenSM); m_device.destroy(missSM); diff --git a/ray_tracing_instances/hello_vulkan.cpp b/ray_tracing_instances/hello_vulkan.cpp index 5df3b7a..5b70f19 100644 --- a/ray_tracing_instances/hello_vulkan.cpp +++ b/ray_tracing_instances/hello_vulkan.cpp @@ -845,7 +845,8 @@ void HelloVulkan::createRtPipeline() rayPipelineInfo.setMaxRecursionDepth(2); // Ray depth rayPipelineInfo.setLayout(m_rtPipelineLayout); - m_rtPipeline = m_device.createRayTracingPipelineKHR({}, rayPipelineInfo).value; + m_rtPipeline = + static_cast(m_device.createRayTracingPipelineKHR({}, rayPipelineInfo)); m_device.destroy(raygenSM); m_device.destroy(missSM); diff --git a/ray_tracing_intersection/hello_vulkan.cpp b/ray_tracing_intersection/hello_vulkan.cpp index fcc46ca..c26fd7d 100644 --- a/ray_tracing_intersection/hello_vulkan.cpp +++ b/ray_tracing_intersection/hello_vulkan.cpp @@ -982,7 +982,8 @@ void HelloVulkan::createRtPipeline() rayPipelineInfo.setMaxRecursionDepth(2); // Ray depth rayPipelineInfo.setLayout(m_rtPipelineLayout); - m_rtPipeline = m_device.createRayTracingPipelineKHR({}, rayPipelineInfo).value; + m_rtPipeline = + static_cast(m_device.createRayTracingPipelineKHR({}, rayPipelineInfo)); m_device.destroy(raygenSM); m_device.destroy(missSM); diff --git a/ray_tracing_jitter_cam/hello_vulkan.cpp b/ray_tracing_jitter_cam/hello_vulkan.cpp index 1c4e7bf..dd1d3a8 100644 --- a/ray_tracing_jitter_cam/hello_vulkan.cpp +++ b/ray_tracing_jitter_cam/hello_vulkan.cpp @@ -823,7 +823,8 @@ void HelloVulkan::createRtPipeline() rayPipelineInfo.setMaxRecursionDepth(2); // Ray depth rayPipelineInfo.setLayout(m_rtPipelineLayout); - m_rtPipeline = m_device.createRayTracingPipelineKHR({}, rayPipelineInfo).value; + m_rtPipeline = + static_cast(m_device.createRayTracingPipelineKHR({}, rayPipelineInfo)); m_device.destroy(raygenSM); m_device.destroy(missSM); diff --git a/ray_tracing_manyhits/hello_vulkan.cpp b/ray_tracing_manyhits/hello_vulkan.cpp index 4b4e37e..ec0e23d 100644 --- a/ray_tracing_manyhits/hello_vulkan.cpp +++ b/ray_tracing_manyhits/hello_vulkan.cpp @@ -834,7 +834,8 @@ void HelloVulkan::createRtPipeline() rayPipelineInfo.setMaxRecursionDepth(2); // Ray depth rayPipelineInfo.setLayout(m_rtPipelineLayout); - m_rtPipeline = m_device.createRayTracingPipelineKHR({}, rayPipelineInfo).value; + m_rtPipeline = + static_cast(m_device.createRayTracingPipelineKHR({}, rayPipelineInfo)); m_device.destroy(raygenSM); m_device.destroy(missSM); diff --git a/ray_tracing_reflections/hello_vulkan.cpp b/ray_tracing_reflections/hello_vulkan.cpp index 48a8782..69f954e 100644 --- a/ray_tracing_reflections/hello_vulkan.cpp +++ b/ray_tracing_reflections/hello_vulkan.cpp @@ -823,7 +823,8 @@ void HelloVulkan::createRtPipeline() rayPipelineInfo.setMaxRecursionDepth(2); // Ray depth rayPipelineInfo.setLayout(m_rtPipelineLayout); - m_rtPipeline = m_device.createRayTracingPipelineKHR({}, rayPipelineInfo).value; + m_rtPipeline = + static_cast(m_device.createRayTracingPipelineKHR({}, rayPipelineInfo)); m_device.destroy(raygenSM); m_device.destroy(missSM);