Make creation of pipeline backward compatible with previous SDK

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

View file

@ -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<const vk::Pipeline&>(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<const vk::Pipeline&>(
m_device.createComputePipeline({}, computePipelineCreateInfo));
m_device.destroy(computePipelineCreateInfo.stage.module);
}