Skip to content

Commit 87bf160

Browse files
committed
minor adjustments and example
1 parent 076128f commit 87bf160

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,36 +49,35 @@ bool rayQueryProceedKHR([[vk::ext_reference]] RayQueryKHR query);
4949
[[vk::ext_capability(spv::CapabilityRayQueryKHR)]]
5050
[[vk::ext_extension("SPV_KHR_ray_query")]]
5151
[[vk::ext_instruction(spv::OpRayQueryGetIntersectionTypeKHR)]]
52-
int rayQueryGetIntersectionTypeKHR([[vk::ext_reference]] RayQueryKHR query, uint32_t intersection);
52+
int rayQueryGetIntersectionTypeKHR([[vk::ext_reference]] RayQueryKHR query, uint32_t committed);
5353

5454
[[vk::ext_capability(spv::CapabilityRayQueryKHR)]]
5555
[[vk::ext_extension("SPV_KHR_ray_query")]]
5656
[[vk::ext_instruction(spv::OpRayQueryGetIntersectionInstanceIdKHR)]]
57-
int rayQueryGetIntersectionInstanceIdKHR([[vk::ext_reference]] RayQueryKHR query, uint32_t intersection);
57+
int rayQueryGetIntersectionInstanceIdKHR([[vk::ext_reference]] RayQueryKHR query, uint32_t committed);
5858

5959
[[vk::ext_capability(spv::CapabilityRayQueryKHR)]]
6060
[[vk::ext_extension("SPV_KHR_ray_query")]]
6161
[[vk::ext_instruction(spv::OpRayQueryGetIntersectionPrimitiveIndexKHR)]]
62-
int rayQueryGetIntersectionPrimitiveIndexKHR([[vk::ext_reference]] RayQueryKHR query, uint32_t intersection);
62+
int rayQueryGetIntersectionPrimitiveIndexKHR([[vk::ext_reference]] RayQueryKHR query, uint32_t committed);
6363

6464
[[vk::ext_capability(spv::CapabilityRayQueryKHR)]]
6565
[[vk::ext_extension("SPV_KHR_ray_query")]]
6666
[[vk::ext_instruction(spv::OpRayQueryGetIntersectionBarycentricsKHR)]]
67-
float2 rayQueryGetIntersectionBarycentricsKHR([[vk::ext_reference]] RayQueryKHR query, uint32_t intersection);
67+
float2 rayQueryGetIntersectionBarycentricsKHR([[vk::ext_reference]] RayQueryKHR query, uint32_t committed);
6868

6969
// position fetch for ray tracing uses gl_HitTriangleVertexPositionsEXT -> HitTriangleVertexPositionsKHR decorated OpVariable
7070
[[vk::ext_builtin_input(spv::BuiltInHitTriangleVertexPositionsKHR)]]
7171
static const float32_t3 HitTriangleVertexPositionsKHR[3];
7272

73-
using __arr3_float3 = float32_t3[3];
74-
73+
// ray query version
7574
[[vk::ext_capability(spv::CapabilityRayQueryPositionFetchKHR)]]
7675
[[vk::ext_extension("SPV_KHR_ray_tracing_position_fetch")]]
77-
[[vk::ext_instruction(spv::OpRayQueryGetIntersectionTriangleVertexPositionsKHR)]] // ray query version
78-
__arr3_float3 rayQueryGetIntersectionTriangleVertexPositionsKHR([[vk::ext_reference]] RayQueryKHR query, uint32_t intersection);
76+
[[vk::ext_instruction(spv::OpRayQueryGetIntersectionTriangleVertexPositionsKHR)]]
77+
float3 rayQueryGetIntersectionTriangleVertexPositionsKHR([[vk::ext_reference]] RayQueryKHR query, uint32_t committed)[3];
7978

8079
}
8180
}
8281
}
8382

84-
#endif // _NBL_BUILTIN_HLSL_SPIRV_INTRINSICS_RAYTRACING_INCLUDED_
83+
#endif

0 commit comments

Comments
 (0)