Turn InstanceID() and PrimitiveIndex() to inline spirv

Author: kevyuu

71_RayTracingPipeline/app_resources/raytrace.rahit.hlsl

@@ -9,7 +9,7 @@ using namespace nbl::hlsl;
 [shader("anyhit")]
 void main(inout PrimaryPayload payload, in BuiltInTriangleIntersectionAttributes attribs)
 {
-    const int instID = InstanceID();
+    const int instID = spirv::InstanceCustomIndexKHR;
     const STriangleGeomInfo geom = vk::RawBufferLoad < STriangleGeomInfo > (pc.triangleGeomInfoBuffer + instID * sizeof(STriangleGeomInfo));
 
     const uint32_t bitpattern = payload.pcg();

71_RayTracingPipeline/app_resources/raytrace.rchit.hlsl

@@ -1,5 +1,6 @@
 #include "common.hlsl"
 
+#include "nbl/builtin/hlsl/spirv_intrinsics/core.hlsl"
 #include "nbl/builtin/hlsl/spirv_intrinsics/raytracing.hlsl"
 #include "nbl/builtin/hlsl/bda/__ptr.hlsl"
 
@@ -77,7 +78,7 @@ float3 calculateNormals(int primID, STriangleGeomInfo geom, float2 bary)
 [shader("closesthit")]
 void main(inout PrimaryPayload payload, in BuiltInTriangleIntersectionAttributes attribs)
 {
-    const int primID = PrimitiveIndex();
+    const int primID = spirv::PrimitiveId;
     const int instanceCustomIndex = spirv::InstanceCustomIndexKHR;
     const int geometryIndex = spirv::RayGeometryIndexKHR;
     const STriangleGeomInfo geom = vk::RawBufferLoad < STriangleGeomInfo > (pc.triangleGeomInfoBuffer + (instanceCustomIndex + geometryIndex) * sizeof(STriangleGeomInfo));

71_RayTracingPipeline/app_resources/raytrace.rint.hlsl

@@ -1,5 +1,6 @@
 #include "common.hlsl"
 
+#include "nbl/builtin/hlsl/spirv_intrinsics/core.hlsl"
 #include "nbl/builtin/hlsl/spirv_intrinsics/raytracing.hlsl"
 
 using namespace nbl::hlsl;
@@ -33,7 +34,7 @@ void main()
     ray.origin = spirv::WorldRayOriginKHR;
     ray.direction = spirv::WorldRayDirectionKHR;
 
-    const int primID = PrimitiveIndex();
+    const int primID = spirv::PrimitiveId;
 
     // Sphere data
     SProceduralGeomInfo sphere = vk::RawBufferLoad<SProceduralGeomInfo>(pc.proceduralGeomInfoBuffer + primID * sizeof(SProceduralGeomInfo));

71_RayTracingPipeline/app_resources/raytrace_shadow.rahit.hlsl

@@ -9,7 +9,7 @@ using namespace nbl::hlsl;
 [shader("anyhit")]
 void main(inout OcclusionPayload payload, in BuiltInTriangleIntersectionAttributes attribs)
 {
-    const int instID = InstanceID();
+    const int instID = spirv::InstanceCustomIndexKHR;
     const STriangleGeomInfo geom = vk::RawBufferLoad < STriangleGeomInfo > (pc.triangleGeomInfoBuffer + instID * sizeof(STriangleGeomInfo));
     const Material material = nbl::hlsl::_static_cast<Material>(geom.material);