Skip to content

Commit cca5e09

Browse files
author
devsh
committed
try to use inline SPIR-V for termination instructions but run into microsoft/DirectXShaderCompiler#7279
1 parent f23f32f commit cca5e09

File tree

2 files changed

+16
-3
lines changed

2 files changed

+16
-3
lines changed

include/nbl/builtin/hlsl/spirv_intrinsics/raytracing.hlsl

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,19 @@ namespace hlsl
1313
namespace spirv
1414
{
1515

16-
//[[vk::ext_capability(spv::CapabilityRayQueryKHR)]] https://github.com/microsoft/DirectXShaderCompiler/issues/6958
17-
using RayQueryKHR = vk::SpirvOpaqueType<spv::OpTypeRayQueryKHR>;
1816

1917
//[[vk::ext_capability(spv::CapabilityAccelerationStructureKHR)]]
2018
using AccelerationStructureKHR = vk::SpirvOpaqueType<spv::OpTypeAccelerationStructureKHR>;
2119

2220
[[vk::ext_instruction(spv::OpConvertUToAccelerationStructureKHR)]]
2321
AccelerationStructureKHR accelerationStructureKHR(uint64_t u);
2422

23+
24+
//! Ray Query stuff
25+
26+
//[[vk::ext_capability(spv::CapabilityRayQueryKHR)]] https://github.com/microsoft/DirectXShaderCompiler/issues/6958
27+
using RayQueryKHR = vk::SpirvOpaqueType<spv::OpTypeRayQueryKHR>;
28+
2529
[[vk::ext_capability(spv::CapabilityRayQueryKHR)]]
2630
[[vk::ext_extension("SPV_KHR_ray_query")]]
2731
[[vk::ext_instruction(spv::OpRayQueryInitializeKHR)]]
@@ -67,6 +71,15 @@ static const float32_t3 HitTriangleVertexPositionsKHR[3];
6771
[[vk::ext_instruction(spv::OpRayQueryGetIntersectionTriangleVertexPositionsKHR)]]
6872
float3 rayQueryGetIntersectionTriangleVertexPositionsKHR([[vk::ext_reference]] RayQueryKHR query, uint32_t committed)[3];
6973

74+
75+
76+
//! Ray Tracing Pipeline stuff (TODO: @kevyu)
77+
78+
[[vk::ext_capability(spv::CapabilityRayTracingKHR)]]
79+
[[vk::ext_extension("SPV_KHR_ray_tracing")]]
80+
[[vk::ext_instruction(spv::OpTerminateRayKHR)]]
81+
void terminateRay();
82+
7083
}
7184
}
7285
}

0 commit comments

Comments
 (0)