From 64a43b17a76d7a8269f55cbe67ef708cd464774c Mon Sep 17 00:00:00 2001
From: "Harsh Aggarwal (NVIDIA)" <haaggarwal@nvidia.com>
Date: Mon, 12 May 2025 13:05:34 +0530
Subject: cluster acceleration structure optix 6431 (#7028)

* Add cluster geometry intrinsics for ray tracing

- Added GetClusterID() method to HitObject class
- Added CandidateClusterID() and CommittedClusterID() methods to
RayQuery class
- Added SPV_NV_cluster_acceleration_structure extension support
- Added GL_NV_cluster_acceleration_structure extension support
- Added test files for RayQuery and HitObject cluster methods

Fixes #6431

* OpRayQueryGetIntersectionClusterIdNV - unrecognized spirv
Disabling spirv backend for SPV_NV_cluster_acceleration_structure

hlsl.meta.slang(18674): error 29100: unrecognized spirv opcode:
OpRayQueryGetIntersectionClusterIdNV
                result:$$int = OpRayQueryGetIntersectionClusterIdNV
&this $iCandidateOrCommitted;
                ^~~~~~
hlsl.meta.slang(18670): error 30019: expected an expression of type
'int', got 'void'
            return spirv_asm
                   ^~~~~~~~~
ninja: build stopped: subcommand failed.

* 6431 - Fix spirv opcode

* Remove tests

* Add relevant tests

* Review - Simplify tests
---
 source/slang/slang-emit-spirv.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'source/slang/slang-emit-spirv.cpp')

diff --git a/source/slang/slang-emit-spirv.cpp b/source/slang/slang-emit-spirv.cpp
index bd9b23b2d..096e7d8bc 100644
--- a/source/slang/slang-emit-spirv.cpp
+++ b/source/slang/slang-emit-spirv.cpp
@@ -1433,6 +1433,13 @@ struct SPIRVEmitContext : public SourceEmitterBase, public SPIRVEmitSharedContex
         return ensureExtensionDeclaration(name);
     }
 
+    // Ensure cluster acceleration structure extensions and capabilities are declared
+    void requireRayTracingClusterAccelerationStructure()
+    {
+        requireSPIRVCapability(SpvCapabilityRayTracingClusterAccelerationStructureNV);
+        ensureExtensionDeclaration(UnownedStringSlice("SPV_NV_cluster_acceleration_structure"));
+    }
+
     bool hasExtensionDeclaration(const UnownedStringSlice& name)
     {
         return m_extensionInsts.containsKey(name);
-- 
cgit v1.2.3