Add headers for SPV_NV_cluster_acceleration_structure. (KhronosGroup#484)

* Add headers for SPV_NV_cluster_accleration_structure.

Author: alelenv

include/spirv/unified1/spirv.bf

@@ -805,6 +805,7 @@ namespace Spv
             SMIDNV = 5377,
             HitKindFrontFacingMicroTriangleNV = 5405,
             HitKindBackFacingMicroTriangleNV = 5406,
+            ClusterIDNV = 5436,
             CullMaskKHR = 6021,
             Max = 0x7fffffff,
         }
@@ -1212,6 +1213,7 @@ namespace Spv
             CooperativeMatrixTensorAddressingNV = 5433,
             CooperativeMatrixBlockLoadsNV = 5434,
             CooperativeVectorTrainingNV = 5435,
+            RayTracingClusterAccelerationStructureNV = 5437,
             TensorAddressingNV = 5439,
             SubgroupShuffleINTEL = 5568,
             SubgroupBufferBlockIOINTEL = 5569,
@@ -2103,6 +2105,8 @@ namespace Spv
             OpTypeAccelerationStructureKHR = 5341,
             OpTypeAccelerationStructureNV = 5341,
             OpExecuteCallableNV = 5344,
+            OpRayQueryGetClusterIdNV = 5345,
+            OpHitObjectGetClusterIdNV = 5346,
             OpTypeCooperativeMatrixNV = 5358,
             OpCooperativeMatrixLoadNV = 5359,
             OpCooperativeMatrixStoreNV = 5360,

include/spirv/unified1/spirv.core.grammar.json

@@ -6317,6 +6317,37 @@
       "extensions" : [ "SPV_NV_ray_tracing" ],
       "version" : "None"
     },
+    {
+      "opname" : "OpRayQueryGetClusterIdNV",
+      "class" : "Reserved",
+      "opcode" : 5345,
+      "operands" : [
+          { "kind" : "IdResultType" },
+          { "kind" : "IdResult" },
+          {
+              "kind" : "IdRef",
+              "name" : "'RayQuery'"
+          },
+          {
+              "kind" : "IdRef",
+              "name" : "'Intersection'"
+          }
+      ],
+      "capabilities" : [ "RayTracingClusterAccelerationStructureNV" ],
+      "version" : "None"
+    },
+    {
+      "opname" : "OpHitObjectGetClusterIdNV",
+      "class" : "Reserved",
+      "opcode" : 5346,
+      "operands" : [
+          { "kind" : "IdResultType" },
+          { "kind" : "IdResult" },
+          { "kind" : "IdRef", "name" : "'Hit Object'" }
+      ],
+      "capabilities" : [ "RayTracingClusterAccelerationStructureNV" ],
+      "version" : "None"
+    },
     {
       "opname" : "OpTypeCooperativeMatrixNV",
       "class"  : "Type-Declaration",
@@ -15155,6 +15186,13 @@
           "capabilities" : [ "RayTracingDisplacementMicromapNV" ],
           "version" : "None"
         },
+        {
+          "enumerant" : "ClusterIDNV",
+          "value" : 5436,
+          "capabilities" : [ "RayTracingClusterAccelerationStructureNV" ],
+          "extensions" : [ "SPV_NV_cluster_acceleration_structure" ],
+          "version" : "None"
+        },
         {
           "enumerant" : "CullMaskKHR",
           "value"  : 6021,
@@ -16396,6 +16434,13 @@
           "extensions" : [ "SPV_NV_cooperative_vector" ],
           "version" : "None"
         },
+        {
+          "enumerant" : "RayTracingClusterAccelerationStructureNV",
+          "value" : 5437,
+          "capabilities" : [ "RayTracingKHR" ],
+          "extensions" : [ "SPV_NV_cluster_acceleration_structure" ],
+          "version" : "None"
+        },
         {
           "enumerant" : "TensorAddressingNV",
           "value" : 5439,

include/spirv/unified1/spirv.cs

@@ -804,6 +804,7 @@ public enum BuiltIn
             SMIDNV = 5377,
             HitKindFrontFacingMicroTriangleNV = 5405,
             HitKindBackFacingMicroTriangleNV = 5406,
+            ClusterIDNV = 5436,
             CullMaskKHR = 6021,
             Max = 0x7fffffff,
         }
@@ -1211,6 +1212,7 @@ public enum Capability
             CooperativeMatrixTensorAddressingNV = 5433,
             CooperativeMatrixBlockLoadsNV = 5434,
             CooperativeVectorTrainingNV = 5435,
+            RayTracingClusterAccelerationStructureNV = 5437,
             TensorAddressingNV = 5439,
             SubgroupShuffleINTEL = 5568,
             SubgroupBufferBlockIOINTEL = 5569,
@@ -2102,6 +2104,8 @@ public enum Op
             OpTypeAccelerationStructureKHR = 5341,
             OpTypeAccelerationStructureNV = 5341,
             OpExecuteCallableNV = 5344,
+            OpRayQueryGetClusterIdNV = 5345,
+            OpHitObjectGetClusterIdNV = 5346,
             OpTypeCooperativeMatrixNV = 5358,
             OpCooperativeMatrixLoadNV = 5359,
             OpCooperativeMatrixStoreNV = 5360,

include/spirv/unified1/spirv.h

@@ -791,6 +791,7 @@ typedef enum SpvBuiltIn_ {
     SpvBuiltInSMIDNV = 5377,
     SpvBuiltInHitKindFrontFacingMicroTriangleNV = 5405,
     SpvBuiltInHitKindBackFacingMicroTriangleNV = 5406,
+    SpvBuiltInClusterIDNV = 5436,
     SpvBuiltInCullMaskKHR = 6021,
     SpvBuiltInMax = 0x7fffffff,
 } SpvBuiltIn;
@@ -1182,6 +1183,7 @@ typedef enum SpvCapability_ {
     SpvCapabilityCooperativeMatrixTensorAddressingNV = 5433,
     SpvCapabilityCooperativeMatrixBlockLoadsNV = 5434,
     SpvCapabilityCooperativeVectorTrainingNV = 5435,
+    SpvCapabilityRayTracingClusterAccelerationStructureNV = 5437,
     SpvCapabilityTensorAddressingNV = 5439,
     SpvCapabilitySubgroupShuffleINTEL = 5568,
     SpvCapabilitySubgroupBufferBlockIOINTEL = 5569,
@@ -2039,6 +2041,8 @@ typedef enum SpvOp_ {
     SpvOpTypeAccelerationStructureKHR = 5341,
     SpvOpTypeAccelerationStructureNV = 5341,
     SpvOpExecuteCallableNV = 5344,
+    SpvOpRayQueryGetClusterIdNV = 5345,
+    SpvOpHitObjectGetClusterIdNV = 5346,
     SpvOpTypeCooperativeMatrixNV = 5358,
     SpvOpCooperativeMatrixLoadNV = 5359,
     SpvOpCooperativeMatrixStoreNV = 5360,
@@ -2825,6 +2829,8 @@ inline void SpvHasResultAndType(SpvOp opcode, bool *hasResult, bool *hasResultTy
     case SpvOpRayQueryGetIntersectionTriangleVertexPositionsKHR: *hasResult = true; *hasResultType = true; break;
     case SpvOpTypeAccelerationStructureKHR: *hasResult = true; *hasResultType = false; break;
     case SpvOpExecuteCallableNV: *hasResult = false; *hasResultType = false; break;
+    case SpvOpRayQueryGetClusterIdNV: *hasResult = true; *hasResultType = true; break;
+    case SpvOpHitObjectGetClusterIdNV: *hasResult = true; *hasResultType = true; break;
     case SpvOpTypeCooperativeMatrixNV: *hasResult = true; *hasResultType = false; break;
     case SpvOpCooperativeMatrixLoadNV: *hasResult = true; *hasResultType = true; break;
     case SpvOpCooperativeMatrixStoreNV: *hasResult = false; *hasResultType = false; break;
@@ -3760,6 +3766,7 @@ inline const char* SpvBuiltInToString(SpvBuiltIn value) {
     case SpvBuiltInSMIDNV: return "SMIDNV";
     case SpvBuiltInHitKindFrontFacingMicroTriangleNV: return "HitKindFrontFacingMicroTriangleNV";
     case SpvBuiltInHitKindBackFacingMicroTriangleNV: return "HitKindBackFacingMicroTriangleNV";
+    case SpvBuiltInClusterIDNV: return "ClusterIDNV";
     case SpvBuiltInCullMaskKHR: return "CullMaskKHR";
     default: return "Unknown";
     }
@@ -3975,6 +3982,7 @@ inline const char* SpvCapabilityToString(SpvCapability value) {
     case SpvCapabilityCooperativeMatrixTensorAddressingNV: return "CooperativeMatrixTensorAddressingNV";
     case SpvCapabilityCooperativeMatrixBlockLoadsNV: return "CooperativeMatrixBlockLoadsNV";
     case SpvCapabilityCooperativeVectorTrainingNV: return "CooperativeVectorTrainingNV";
+    case SpvCapabilityRayTracingClusterAccelerationStructureNV: return "RayTracingClusterAccelerationStructureNV";
     case SpvCapabilityTensorAddressingNV: return "TensorAddressingNV";
     case SpvCapabilitySubgroupShuffleINTEL: return "SubgroupShuffleINTEL";
     case SpvCapabilitySubgroupBufferBlockIOINTEL: return "SubgroupBufferBlockIOINTEL";
@@ -4720,6 +4728,8 @@ inline const char* SpvOpToString(SpvOp value) {
     case SpvOpRayQueryGetIntersectionTriangleVertexPositionsKHR: return "OpRayQueryGetIntersectionTriangleVertexPositionsKHR";
     case SpvOpTypeAccelerationStructureKHR: return "OpTypeAccelerationStructureKHR";
     case SpvOpExecuteCallableNV: return "OpExecuteCallableNV";
+    case SpvOpRayQueryGetClusterIdNV: return "OpRayQueryGetClusterIdNV";
+    case SpvOpHitObjectGetClusterIdNV: return "OpHitObjectGetClusterIdNV";
     case SpvOpTypeCooperativeMatrixNV: return "OpTypeCooperativeMatrixNV";
     case SpvOpCooperativeMatrixLoadNV: return "OpCooperativeMatrixLoadNV";
     case SpvOpCooperativeMatrixStoreNV: return "OpCooperativeMatrixStoreNV";

include/spirv/unified1/spirv.hpp

@@ -787,6 +787,7 @@ enum BuiltIn {
     BuiltInSMIDNV = 5377,
     BuiltInHitKindFrontFacingMicroTriangleNV = 5405,
     BuiltInHitKindBackFacingMicroTriangleNV = 5406,
+    BuiltInClusterIDNV = 5436,
     BuiltInCullMaskKHR = 6021,
     BuiltInMax = 0x7fffffff,
 };
@@ -1178,6 +1179,7 @@ enum Capability {
     CapabilityCooperativeMatrixTensorAddressingNV = 5433,
     CapabilityCooperativeMatrixBlockLoadsNV = 5434,
     CapabilityCooperativeVectorTrainingNV = 5435,
+    CapabilityRayTracingClusterAccelerationStructureNV = 5437,
     CapabilityTensorAddressingNV = 5439,
     CapabilitySubgroupShuffleINTEL = 5568,
     CapabilitySubgroupBufferBlockIOINTEL = 5569,
@@ -2035,6 +2037,8 @@ enum Op {
     OpTypeAccelerationStructureKHR = 5341,
     OpTypeAccelerationStructureNV = 5341,
     OpExecuteCallableNV = 5344,
+    OpRayQueryGetClusterIdNV = 5345,
+    OpHitObjectGetClusterIdNV = 5346,
     OpTypeCooperativeMatrixNV = 5358,
     OpCooperativeMatrixLoadNV = 5359,
     OpCooperativeMatrixStoreNV = 5360,
@@ -2821,6 +2825,8 @@ inline void HasResultAndType(Op opcode, bool *hasResult, bool *hasResultType) {
     case OpRayQueryGetIntersectionTriangleVertexPositionsKHR: *hasResult = true; *hasResultType = true; break;
     case OpTypeAccelerationStructureKHR: *hasResult = true; *hasResultType = false; break;
     case OpExecuteCallableNV: *hasResult = false; *hasResultType = false; break;
+    case OpRayQueryGetClusterIdNV: *hasResult = true; *hasResultType = true; break;
+    case OpHitObjectGetClusterIdNV: *hasResult = true; *hasResultType = true; break;
     case OpTypeCooperativeMatrixNV: *hasResult = true; *hasResultType = false; break;
     case OpCooperativeMatrixLoadNV: *hasResult = true; *hasResultType = true; break;
     case OpCooperativeMatrixStoreNV: *hasResult = false; *hasResultType = false; break;
@@ -3756,6 +3762,7 @@ inline const char* BuiltInToString(BuiltIn value) {
     case BuiltInSMIDNV: return "SMIDNV";
     case BuiltInHitKindFrontFacingMicroTriangleNV: return "HitKindFrontFacingMicroTriangleNV";
     case BuiltInHitKindBackFacingMicroTriangleNV: return "HitKindBackFacingMicroTriangleNV";
+    case BuiltInClusterIDNV: return "ClusterIDNV";
     case BuiltInCullMaskKHR: return "CullMaskKHR";
     default: return "Unknown";
     }
@@ -3971,6 +3978,7 @@ inline const char* CapabilityToString(Capability value) {
     case CapabilityCooperativeMatrixTensorAddressingNV: return "CooperativeMatrixTensorAddressingNV";
     case CapabilityCooperativeMatrixBlockLoadsNV: return "CooperativeMatrixBlockLoadsNV";
     case CapabilityCooperativeVectorTrainingNV: return "CooperativeVectorTrainingNV";
+    case CapabilityRayTracingClusterAccelerationStructureNV: return "RayTracingClusterAccelerationStructureNV";
     case CapabilityTensorAddressingNV: return "TensorAddressingNV";
     case CapabilitySubgroupShuffleINTEL: return "SubgroupShuffleINTEL";
     case CapabilitySubgroupBufferBlockIOINTEL: return "SubgroupBufferBlockIOINTEL";
@@ -4716,6 +4724,8 @@ inline const char* OpToString(Op value) {
     case OpRayQueryGetIntersectionTriangleVertexPositionsKHR: return "OpRayQueryGetIntersectionTriangleVertexPositionsKHR";
     case OpTypeAccelerationStructureKHR: return "OpTypeAccelerationStructureKHR";
     case OpExecuteCallableNV: return "OpExecuteCallableNV";
+    case OpRayQueryGetClusterIdNV: return "OpRayQueryGetClusterIdNV";
+    case OpHitObjectGetClusterIdNV: return "OpHitObjectGetClusterIdNV";
     case OpTypeCooperativeMatrixNV: return "OpTypeCooperativeMatrixNV";
     case OpCooperativeMatrixLoadNV: return "OpCooperativeMatrixLoadNV";
     case OpCooperativeMatrixStoreNV: return "OpCooperativeMatrixStoreNV";

include/spirv/unified1/spirv.hpp11

@@ -787,6 +787,7 @@ enum class BuiltIn : unsigned {
     SMIDNV = 5377,
     HitKindFrontFacingMicroTriangleNV = 5405,
     HitKindBackFacingMicroTriangleNV = 5406,
+    ClusterIDNV = 5436,
     CullMaskKHR = 6021,
     Max = 0x7fffffff,
 };
@@ -1178,6 +1179,7 @@ enum class Capability : unsigned {
     CooperativeMatrixTensorAddressingNV = 5433,
     CooperativeMatrixBlockLoadsNV = 5434,
     CooperativeVectorTrainingNV = 5435,
+    RayTracingClusterAccelerationStructureNV = 5437,
     TensorAddressingNV = 5439,
     SubgroupShuffleINTEL = 5568,
     SubgroupBufferBlockIOINTEL = 5569,
@@ -2035,6 +2037,8 @@ enum class Op : unsigned {
     OpTypeAccelerationStructureKHR = 5341,
     OpTypeAccelerationStructureNV = 5341,
     OpExecuteCallableNV = 5344,
+    OpRayQueryGetClusterIdNV = 5345,
+    OpHitObjectGetClusterIdNV = 5346,
     OpTypeCooperativeMatrixNV = 5358,
     OpCooperativeMatrixLoadNV = 5359,
     OpCooperativeMatrixStoreNV = 5360,
@@ -2821,6 +2825,8 @@ inline void HasResultAndType(Op opcode, bool *hasResult, bool *hasResultType) {
     case Op::OpRayQueryGetIntersectionTriangleVertexPositionsKHR: *hasResult = true; *hasResultType = true; break;
     case Op::OpTypeAccelerationStructureKHR: *hasResult = true; *hasResultType = false; break;
     case Op::OpExecuteCallableNV: *hasResult = false; *hasResultType = false; break;
+    case Op::OpRayQueryGetClusterIdNV: *hasResult = true; *hasResultType = true; break;
+    case Op::OpHitObjectGetClusterIdNV: *hasResult = true; *hasResultType = true; break;
     case Op::OpTypeCooperativeMatrixNV: *hasResult = true; *hasResultType = false; break;
     case Op::OpCooperativeMatrixLoadNV: *hasResult = true; *hasResultType = true; break;
     case Op::OpCooperativeMatrixStoreNV: *hasResult = false; *hasResultType = false; break;
@@ -3756,6 +3762,7 @@ inline const char* BuiltInToString(BuiltIn value) {
     case BuiltIn::SMIDNV: return "SMIDNV";
     case BuiltIn::HitKindFrontFacingMicroTriangleNV: return "HitKindFrontFacingMicroTriangleNV";
     case BuiltIn::HitKindBackFacingMicroTriangleNV: return "HitKindBackFacingMicroTriangleNV";
+    case BuiltIn::ClusterIDNV: return "ClusterIDNV";
     case BuiltIn::CullMaskKHR: return "CullMaskKHR";
     default: return "Unknown";
     }
@@ -3971,6 +3978,7 @@ inline const char* CapabilityToString(Capability value) {
     case Capability::CooperativeMatrixTensorAddressingNV: return "CooperativeMatrixTensorAddressingNV";
     case Capability::CooperativeMatrixBlockLoadsNV: return "CooperativeMatrixBlockLoadsNV";
     case Capability::CooperativeVectorTrainingNV: return "CooperativeVectorTrainingNV";
+    case Capability::RayTracingClusterAccelerationStructureNV: return "RayTracingClusterAccelerationStructureNV";
     case Capability::TensorAddressingNV: return "TensorAddressingNV";
     case Capability::SubgroupShuffleINTEL: return "SubgroupShuffleINTEL";
     case Capability::SubgroupBufferBlockIOINTEL: return "SubgroupBufferBlockIOINTEL";
@@ -4716,6 +4724,8 @@ inline const char* OpToString(Op value) {
     case Op::OpRayQueryGetIntersectionTriangleVertexPositionsKHR: return "OpRayQueryGetIntersectionTriangleVertexPositionsKHR";
     case Op::OpTypeAccelerationStructureKHR: return "OpTypeAccelerationStructureKHR";
     case Op::OpExecuteCallableNV: return "OpExecuteCallableNV";
+    case Op::OpRayQueryGetClusterIdNV: return "OpRayQueryGetClusterIdNV";
+    case Op::OpHitObjectGetClusterIdNV: return "OpHitObjectGetClusterIdNV";
     case Op::OpTypeCooperativeMatrixNV: return "OpTypeCooperativeMatrixNV";
     case Op::OpCooperativeMatrixLoadNV: return "OpCooperativeMatrixLoadNV";
     case Op::OpCooperativeMatrixStoreNV: return "OpCooperativeMatrixStoreNV";

include/spirv/unified1/spirv.json

@@ -813,6 +813,7 @@
                     "SMIDNV": 5377,
                     "HitKindFrontFacingMicroTriangleNV": 5405,
                     "HitKindBackFacingMicroTriangleNV": 5406,
+                    "ClusterIDNV": 5436,
                     "CullMaskKHR": 6021
                 }
             },
@@ -1154,6 +1155,7 @@
                     "CooperativeMatrixTensorAddressingNV": 5433,
                     "CooperativeMatrixBlockLoadsNV": 5434,
                     "CooperativeVectorTrainingNV": 5435,
+                    "RayTracingClusterAccelerationStructureNV": 5437,
                     "TensorAddressingNV": 5439,
                     "SubgroupShuffleINTEL": 5568,
                     "SubgroupBufferBlockIOINTEL": 5569,
@@ -2023,6 +2025,8 @@
                     "OpTypeAccelerationStructureKHR": 5341,
                     "OpTypeAccelerationStructureNV": 5341,
                     "OpExecuteCallableNV": 5344,
+                    "OpRayQueryGetClusterIdNV": 5345,
+                    "OpHitObjectGetClusterIdNV": 5346,
                     "OpTypeCooperativeMatrixNV": 5358,
                     "OpCooperativeMatrixLoadNV": 5359,
                     "OpCooperativeMatrixStoreNV": 5360,

include/spirv/unified1/spirv.lua

@@ -778,6 +778,7 @@ spv = {
         SMIDNV = 5377,
         HitKindFrontFacingMicroTriangleNV = 5405,
         HitKindBackFacingMicroTriangleNV = 5406,
+        ClusterIDNV = 5436,
         CullMaskKHR = 6021,
         Max = 0x7fffffff,
     },
@@ -1169,6 +1170,7 @@ spv = {
         CooperativeMatrixTensorAddressingNV = 5433,
         CooperativeMatrixBlockLoadsNV = 5434,
         CooperativeVectorTrainingNV = 5435,
+        RayTracingClusterAccelerationStructureNV = 5437,
         TensorAddressingNV = 5439,
         SubgroupShuffleINTEL = 5568,
         SubgroupBufferBlockIOINTEL = 5569,
@@ -2026,6 +2028,8 @@ spv = {
         OpTypeAccelerationStructureKHR = 5341,
         OpTypeAccelerationStructureNV = 5341,
         OpExecuteCallableNV = 5344,
+        OpRayQueryGetClusterIdNV = 5345,
+        OpHitObjectGetClusterIdNV = 5346,
         OpTypeCooperativeMatrixNV = 5358,
         OpCooperativeMatrixLoadNV = 5359,
         OpCooperativeMatrixStoreNV = 5360,

include/spirv/unified1/spirv.py

@@ -759,6 +759,7 @@
         'SMIDNV' : 5377,
         'HitKindFrontFacingMicroTriangleNV' : 5405,
         'HitKindBackFacingMicroTriangleNV' : 5406,
+        'ClusterIDNV' : 5436,
         'CullMaskKHR' : 6021,
     },
 
@@ -1140,6 +1141,7 @@
         'CooperativeMatrixTensorAddressingNV' : 5433,
         'CooperativeMatrixBlockLoadsNV' : 5434,
         'CooperativeVectorTrainingNV' : 5435,
+        'RayTracingClusterAccelerationStructureNV' : 5437,
         'TensorAddressingNV' : 5439,
         'SubgroupShuffleINTEL' : 5568,
         'SubgroupBufferBlockIOINTEL' : 5569,
@@ -1970,6 +1972,8 @@
         'OpTypeAccelerationStructureKHR' : 5341,
         'OpTypeAccelerationStructureNV' : 5341,
         'OpExecuteCallableNV' : 5344,
+        'OpRayQueryGetClusterIdNV' : 5345,
+        'OpHitObjectGetClusterIdNV' : 5346,
         'OpTypeCooperativeMatrixNV' : 5358,
         'OpCooperativeMatrixLoadNV' : 5359,
         'OpCooperativeMatrixStoreNV' : 5360,

include/spirv/unified1/spv.d

@@ -807,6 +807,7 @@ enum BuiltIn : uint
     SMIDNV = 5377,
     HitKindFrontFacingMicroTriangleNV = 5405,
     HitKindBackFacingMicroTriangleNV = 5406,
+    ClusterIDNV = 5436,
     CullMaskKHR = 6021,
     Max = 0x7fffffff,
 }
@@ -1214,6 +1215,7 @@ enum Capability : uint
     CooperativeMatrixTensorAddressingNV = 5433,
     CooperativeMatrixBlockLoadsNV = 5434,
     CooperativeVectorTrainingNV = 5435,
+    RayTracingClusterAccelerationStructureNV = 5437,
     TensorAddressingNV = 5439,
     SubgroupShuffleINTEL = 5568,
     SubgroupBufferBlockIOINTEL = 5569,
@@ -2105,6 +2107,8 @@ enum Op : uint
     OpTypeAccelerationStructureKHR = 5341,
     OpTypeAccelerationStructureNV = 5341,
     OpExecuteCallableNV = 5344,
+    OpRayQueryGetClusterIdNV = 5345,
+    OpHitObjectGetClusterIdNV = 5346,
     OpTypeCooperativeMatrixNV = 5358,
     OpCooperativeMatrixLoadNV = 5359,
     OpCooperativeMatrixStoreNV = 5360,