Implement Intersection Shader

kevyuu · kevyuu · commit c41848f6a5e9 · 2025-01-21T13:37:09.000+07:00
diff --git a/src/nbl/video/CVulkanLogicalDevice.cpp b/src/nbl/video/CVulkanLogicalDevice.cpp
@@ -1472,7 +1472,8 @@ void CVulkanLogicalDevice::createRayTracingPipelines_impl(
         return  {
             .sType = VK_STRUCTURE_TYPE_RAY_TRACING_SHADER_GROUP_CREATE_INFO_KHR,
             .pNext = nullptr,
-            .type = VK_RAY_TRACING_SHADER_GROUP_TYPE_TRIANGLES_HIT_GROUP_KHR,
+            .type = group.intersectionShaderIndex == asset::SShaderGroupsParams::ShaderUnused ? 
+              VK_RAY_TRACING_SHADER_GROUP_TYPE_TRIANGLES_HIT_GROUP_KHR : VK_RAY_TRACING_SHADER_GROUP_TYPE_PROCEDURAL_HIT_GROUP_KHR,
             .generalShader = VK_SHADER_UNUSED_KHR,
             .closestHitShader = getVkShaderIndex(group.closestHitShaderIndex),
             .anyHitShader = getVkShaderIndex(group.anyHitShaderIndex),
diff --git a/src/nbl/video/IGPUCommandBuffer.cpp b/src/nbl/video/IGPUCommandBuffer.cpp
@@ -1813,9 +1813,6 @@ bool IGPUCommandBuffer::traceRays(const asset::SStridedBufferRegion<IGPUBuffer>&
         return false;
     }
 
-    // TODO(kevinyu) : add more validation
-
-
     if (!m_cmdpool->m_commandListPool.emplace<IGPUCommandPool::CTraceRaysCmd>(m_commandList, 
         core::smart_refctd_ptr<const IGPUBuffer>(raygenGroupRegion.buffer),
         core::smart_refctd_ptr<const IGPUBuffer>(missGroupsRegion.buffer),

Original file line number	Diff line number	Diff line change
`@@ -1813,9 +1813,6 @@ bool IGPUCommandBuffer::traceRays(const asset::SStridedBufferRegion<IGPUBuffer>&`
`1813`	`1813`	`return false;`
`1814`	`1814`	`}`
`1815`	`1815`
`1816`		`- // TODO(kevinyu) : add more validation`
`1817`		`-`
`1818`		`-`
`1819`	`1816`	`if (!m_cmdpool->m_commandListPool.emplace<IGPUCommandPool::CTraceRaysCmd>(m_commandList,`
`1820`	`1817`	`core::smart_refctd_ptr<const IGPUBuffer>(raygenGroupRegion.buffer),`
`1821`	`1818`	`core::smart_refctd_ptr<const IGPUBuffer>(missGroupsRegion.buffer),`