Skip to content
Snippets Groups Projects
Commit d84055ce authored by Lars Hoerttrich's avatar Lars Hoerttrich
Browse files

Merge branch '92-rtx-module' of...

Merge branch '92-rtx-module' of https://gitlab.uni-koblenz.de/vulkan2021/vkcv-framework into 92-rtx-module
parents 33e5cfea 5be6aff5
No related branches found
No related tags found
1 merge request!75Resolve "RTX-Module"
Pipeline #27270 passed
...@@ -265,21 +265,25 @@ namespace vkcv::rtx { ...@@ -265,21 +265,25 @@ namespace vkcv::rtx {
m_pipelineLayout // vk::PipelineLayout layout_ = {} m_pipelineLayout // vk::PipelineLayout layout_ = {}
); );
m_pipeline = vk::Pipeline(m_core->getContext().getDevice().createRayTracingPipelineKHR(vk::DeferredOperationKHR(), vk::PipelineCache(), rtxPipelineInfo, nullptr, m_asManager->getDispatcher())); auto pipelineResult = m_core->getContext().getDevice().createRayTracingPipelineKHR(
if (!m_pipeline) { vk::DeferredOperationKHR(),
vk::PipelineCache(),
rtxPipelineInfo,
nullptr,
m_asManager->getDispatcher()
);
if (pipelineResult.result != vk::Result::eSuccess) {
vkcv_log(LogLevel::ERROR, "The RTX Pipeline could not be created!"); vkcv_log(LogLevel::ERROR, "The RTX Pipeline could not be created!");
} }
m_pipeline = pipelineResult.value;
m_core->getContext().getDevice().destroy(rayGenShaderModule); m_core->getContext().getDevice().destroy(rayGenShaderModule);
m_core->getContext().getDevice().destroy(rayMissShaderModule); m_core->getContext().getDevice().destroy(rayMissShaderModule);
m_core->getContext().getDevice().destroy(rayClosestHitShaderModule); m_core->getContext().getDevice().destroy(rayClosestHitShaderModule);
createShaderBindingTable(descriptorSetLayouts.size()); createShaderBindingTable(descriptorSetLayouts.size());
} }
vk::Pipeline RTXModule::getPipeline() { vk::Pipeline RTXModule::getPipeline() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment