clara/bluenoise-raytracer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make creation of pipeline backward compatible with previous SDK

Browse source
This commit is contained in:
mklefrancois 2020-06-22 15:40:32 +02:00
parent 90dc65f220
commit 813f392fdf
9 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ray_tracing__advance/raytrace.cpp
View file

@ -395,7 +395,8 @@ void Raytracer::createRtPipeline(vk::DescriptorSetLayout& sceneDescLayout)
rayPipelineInfo.setMaxRecursionDepth(2); // Ray depth rayPipelineInfo.setMaxRecursionDepth(2); // Ray depth
rayPipelineInfo.setLayout(m_rtPipelineLayout); rayPipelineInfo.setLayout(m_rtPipelineLayout);
m_rtPipeline = m_device.createRayTracingPipelineKHR({}, rayPipelineInfo).value; m_rtPipeline =
static_cast<const vk::Pipeline&>(m_device.createRayTracingPipelineKHR({}, rayPipelineInfo));
m_device.destroy(raygenSM); m_device.destroy(raygenSM);
m_device.destroy(missSM); m_device.destroy(missSM);

3
ray_tracing__simple/hello_vulkan.cpp
View file

@ -836,7 +836,8 @@ void HelloVulkan::createRtPipeline()
rayPipelineInfo.setMaxRecursionDepth(2); // Ray depth rayPipelineInfo.setMaxRecursionDepth(2); // Ray depth
rayPipelineInfo.setLayout(m_rtPipelineLayout); rayPipelineInfo.setLayout(m_rtPipelineLayout);
m_rtPipeline = m_device.createRayTracingPipelineKHR({}, rayPipelineInfo).value; m_rtPipeline =
static_cast<const vk::Pipeline&>(m_device.createRayTracingPipelineKHR({}, rayPipelineInfo));
m_device.destroy(raygenSM); m_device.destroy(raygenSM);
m_device.destroy(missSM); m_device.destroy(missSM);

6
ray_tracing_animation/hello_vulkan.cpp
View file

@ -832,7 +832,8 @@ void HelloVulkan::createRtPipeline()
rayPipelineInfo.setMaxRecursionDepth(2); // Ray depth rayPipelineInfo.setMaxRecursionDepth(2); // Ray depth
rayPipelineInfo.setLayout(m_rtPipelineLayout); rayPipelineInfo.setLayout(m_rtPipelineLayout);
m_rtPipeline = m_device.createRayTracingPipelineKHR({}, rayPipelineInfo).value; m_rtPipeline =
static_cast<const vk::Pipeline&>(m_device.createRayTracingPipelineKHR({}, rayPipelineInfo));
m_device.destroy(raygenSM); m_device.destroy(raygenSM);
m_device.destroy(missSM); m_device.destroy(missSM);
@ -1016,6 +1017,7 @@ void HelloVulkan::createCompPipelines()
nvvk::createShaderStageInfo(m_device, nvvk::createShaderStageInfo(m_device,
nvh::loadFile("shaders/anim.comp.spv", true, defaultSearchPaths), nvh::loadFile("shaders/anim.comp.spv", true, defaultSearchPaths),
VK_SHADER_STAGE_COMPUTE_BIT); VK_SHADER_STAGE_COMPUTE_BIT);
m_compPipeline = m_device.createComputePipeline({}, computePipelineCreateInfo).value; m_compPipeline = static_cast<const vk::Pipeline&>(
m_device.createComputePipeline({}, computePipelineCreateInfo));
m_device.destroy(computePipelineCreateInfo.stage.module); m_device.destroy(computePipelineCreateInfo.stage.module);
} }

3
ray_tracing_callable/hello_vulkan.cpp
View file

@ -849,7 +849,8 @@ void HelloVulkan::createRtPipeline()
rayPipelineInfo.setMaxRecursionDepth(2); // Ray depth rayPipelineInfo.setMaxRecursionDepth(2); // Ray depth
rayPipelineInfo.setLayout(m_rtPipelineLayout); rayPipelineInfo.setLayout(m_rtPipelineLayout);
m_rtPipeline = m_device.createRayTracingPipelineKHR({}, rayPipelineInfo).value; m_rtPipeline =
static_cast<const vk::Pipeline&>(m_device.createRayTracingPipelineKHR({}, rayPipelineInfo));
m_device.destroy(raygenSM); m_device.destroy(raygenSM);
m_device.destroy(missSM); m_device.destroy(missSM);

3
ray_tracing_instances/hello_vulkan.cpp
View file

@ -845,7 +845,8 @@ void HelloVulkan::createRtPipeline()
rayPipelineInfo.setMaxRecursionDepth(2); // Ray depth rayPipelineInfo.setMaxRecursionDepth(2); // Ray depth
rayPipelineInfo.setLayout(m_rtPipelineLayout); rayPipelineInfo.setLayout(m_rtPipelineLayout);
m_rtPipeline = m_device.createRayTracingPipelineKHR({}, rayPipelineInfo).value; m_rtPipeline =
static_cast<const vk::Pipeline&>(m_device.createRayTracingPipelineKHR({}, rayPipelineInfo));
m_device.destroy(raygenSM); m_device.destroy(raygenSM);
m_device.destroy(missSM); m_device.destroy(missSM);

3
ray_tracing_intersection/hello_vulkan.cpp
View file

@ -982,7 +982,8 @@ void HelloVulkan::createRtPipeline()
rayPipelineInfo.setMaxRecursionDepth(2); // Ray depth rayPipelineInfo.setMaxRecursionDepth(2); // Ray depth
rayPipelineInfo.setLayout(m_rtPipelineLayout); rayPipelineInfo.setLayout(m_rtPipelineLayout);
m_rtPipeline = m_device.createRayTracingPipelineKHR({}, rayPipelineInfo).value; m_rtPipeline =
static_cast<const vk::Pipeline&>(m_device.createRayTracingPipelineKHR({}, rayPipelineInfo));
m_device.destroy(raygenSM); m_device.destroy(raygenSM);
m_device.destroy(missSM); m_device.destroy(missSM);

3
ray_tracing_jitter_cam/hello_vulkan.cpp
View file

@ -823,7 +823,8 @@ void HelloVulkan::createRtPipeline()
rayPipelineInfo.setMaxRecursionDepth(2); // Ray depth rayPipelineInfo.setMaxRecursionDepth(2); // Ray depth
rayPipelineInfo.setLayout(m_rtPipelineLayout); rayPipelineInfo.setLayout(m_rtPipelineLayout);
m_rtPipeline = m_device.createRayTracingPipelineKHR({}, rayPipelineInfo).value; m_rtPipeline =
static_cast<const vk::Pipeline&>(m_device.createRayTracingPipelineKHR({}, rayPipelineInfo));
m_device.destroy(raygenSM); m_device.destroy(raygenSM);
m_device.destroy(missSM); m_device.destroy(missSM);

3
ray_tracing_manyhits/hello_vulkan.cpp
View file

@ -834,7 +834,8 @@ void HelloVulkan::createRtPipeline()
rayPipelineInfo.setMaxRecursionDepth(2); // Ray depth rayPipelineInfo.setMaxRecursionDepth(2); // Ray depth
rayPipelineInfo.setLayout(m_rtPipelineLayout); rayPipelineInfo.setLayout(m_rtPipelineLayout);
m_rtPipeline = m_device.createRayTracingPipelineKHR({}, rayPipelineInfo).value; m_rtPipeline =
static_cast<const vk::Pipeline&>(m_device.createRayTracingPipelineKHR({}, rayPipelineInfo));
m_device.destroy(raygenSM); m_device.destroy(raygenSM);
m_device.destroy(missSM); m_device.destroy(missSM);

3
ray_tracing_reflections/hello_vulkan.cpp
View file

@ -823,7 +823,8 @@ void HelloVulkan::createRtPipeline()
rayPipelineInfo.setMaxRecursionDepth(2); // Ray depth rayPipelineInfo.setMaxRecursionDepth(2); // Ray depth
rayPipelineInfo.setLayout(m_rtPipelineLayout); rayPipelineInfo.setLayout(m_rtPipelineLayout);
m_rtPipeline = m_device.createRayTracingPipelineKHR({}, rayPipelineInfo).value; m_rtPipeline =
static_cast<const vk::Pipeline&>(m_device.createRayTracingPipelineKHR({}, rayPipelineInfo));
m_device.destroy(raygenSM); m_device.destroy(raygenSM);
m_device.destroy(missSM); m_device.destroy(missSM);