From 946d5ca004c33435a648ae115b859caa607e78d6 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Mon, 23 Nov 2020 09:47:03 -0600 Subject: [PATCH] spirv: Update JSON and headers from Khronos main This corresponds to 104ecc356c1bea4476320faca64440cd1df655a3 ("Merge pull request #180 from dneto0/issue-179") in https://github.com/KhronosGroup/SPIRV-Headers Acked-by: Caio Marcelo de Oliveira Filho Part-of: --- src/compiler/spirv/spirv.core.grammar.json | 357 +++++++++++---------- src/compiler/spirv/spirv.h | 22 +- src/compiler/spirv/spirv_to_nir.c | 6 +- 3 files changed, 210 insertions(+), 175 deletions(-) diff --git a/src/compiler/spirv/spirv.core.grammar.json b/src/compiler/spirv/spirv.core.grammar.json index 18901cd16d5..c91540dddd0 100644 --- a/src/compiler/spirv/spirv.core.grammar.json +++ b/src/compiler/spirv/spirv.core.grammar.json @@ -4197,13 +4197,77 @@ "version" : "None" }, { - "opname" : "OpTypeRayQueryProvisionalKHR", + "opname" : "OpTraceRayKHR", + "class" : "Reserved", + "opcode" : 4445, + "operands" : [ + + { "kind" : "IdRef", "name" : "'Accel'" }, + { "kind" : "IdRef", "name" : "'Ray Flags'" }, + { "kind" : "IdRef", "name" : "'Cull Mask'" }, + { "kind" : "IdRef", "name" : "'SBT Offset'" }, + { "kind" : "IdRef", "name" : "'SBT Stride'" }, + { "kind" : "IdRef", "name" : "'Miss Index'" }, + { "kind" : "IdRef", "name" : "'Ray Origin'" }, + { "kind" : "IdRef", "name" : "'Ray Tmin'" }, + { "kind" : "IdRef", "name" : "'Ray Direction'" }, + { "kind" : "IdRef", "name" : "'Ray Tmax'" }, + { "kind" : "IdRef", "name" : "'Payload'" } + ], + "capabilities" : [ "RayTracingKHR" ], + "extensions" : [ "SPV_KHR_ray_tracing" ], + "version" : "None" + }, + { + "opname" : "OpExecuteCallableKHR", + "class" : "Reserved", + "opcode" : 4446, + "operands" : [ + + { "kind" : "IdRef", "name" : "'SBT Index'" }, + { "kind" : "IdRef", "name" : "'Callable Data'" } + ], + "capabilities" : [ "RayTracingKHR" ], + "extensions" : [ "SPV_KHR_ray_tracing" ], + "version" : "None" + }, + { + "opname" : "OpConvertUToAccelerationStructureKHR", + "class" : "Reserved", + "opcode" : 4447, + "operands" : [ + { "kind" : "IdResultType" }, + { "kind" : "IdResult" }, + { "kind" : "IdRef", "name" : "'Accel'" } + ], + "capabilities" : [ "RayTracingKHR", "RayQueryKHR" ], + "extensions" : [ "SPV_KHR_ray_tracing", "SPV_KHR_ray_query" ], + "version" : "None" + }, + { + "opname" : "OpIgnoreIntersectionKHR", + "class" : "Reserved", + "opcode" : 4448, + "capabilities" : [ "RayTracingKHR" ], + "extensions" : [ "SPV_KHR_ray_tracing" ], + "version" : "None" + }, + { + "opname" : "OpTerminateRayKHR", + "class" : "Reserved", + "opcode" : 4449, + "capabilities" : [ "RayTracingKHR" ], + "extensions" : [ "SPV_KHR_ray_tracing" ], + "version" : "None" + }, + { + "opname" : "OpTypeRayQueryKHR", "class" : "Reserved", "opcode" : 4472, "operands" : [ { "kind" : "IdResult" } ], - "capabilities" : [ "RayQueryProvisionalKHR" ], + "capabilities" : [ "RayQueryKHR" ], "extensions" : [ "SPV_KHR_ray_query" ], "version" : "None" }, @@ -4246,7 +4310,7 @@ } ], - "capabilities" : [ "RayQueryProvisionalKHR" ], + "capabilities" : [ "RayQueryKHR" ], "extensions" : [ "SPV_KHR_ray_query" ], "version" : "None" }, @@ -4260,7 +4324,7 @@ "name" : "'RayQuery'" } ], - "capabilities" : [ "RayQueryProvisionalKHR" ], + "capabilities" : [ "RayQueryKHR" ], "extensions" : [ "SPV_KHR_ray_query" ], "version" : "None" }, @@ -4278,7 +4342,7 @@ "name" : "'HitT'" } ], - "capabilities" : [ "RayQueryProvisionalKHR" ], + "capabilities" : [ "RayQueryKHR" ], "extensions" : [ "SPV_KHR_ray_query" ], "version" : "None" }, @@ -4292,7 +4356,7 @@ "name" : "'RayQuery'" } ], - "capabilities" : [ "RayQueryProvisionalKHR" ], + "capabilities" : [ "RayQueryKHR" ], "extensions" : [ "SPV_KHR_ray_query" ], "version" : "None" }, @@ -4308,7 +4372,7 @@ "name" : "'RayQuery'" } ], - "capabilities" : [ "RayQueryProvisionalKHR" ], + "capabilities" : [ "RayQueryKHR" ], "extensions" : [ "SPV_KHR_ray_query" ], "version" : "None" }, @@ -4328,7 +4392,7 @@ "name" : "'Intersection'" } ], - "capabilities" : [ "RayQueryProvisionalKHR" ], + "capabilities" : [ "RayQueryKHR" ], "extensions" : [ "SPV_KHR_ray_query" ], "version" : "None" }, @@ -4546,7 +4610,7 @@ { "kind" : "IdRef", "name" : "'Hit'" }, { "kind" : "IdRef", "name" : "'HitKind'" } ], - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], "version" : "None" }, @@ -4560,7 +4624,7 @@ { "kind" : "IdRef", "name" : "'Hit'" }, { "kind" : "IdRef", "name" : "'HitKind'" } ], - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], "version" : "None" }, @@ -4568,32 +4632,16 @@ "opname" : "OpIgnoreIntersectionNV", "class" : "Reserved", "opcode" : 5335, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], - "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], - "version" : "None" - }, - { - "opname" : "OpIgnoreIntersectionKHR", - "class" : "Reserved", - "opcode" : 5335, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], - "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], + "capabilities" : [ "RayTracingNV" ], + "extensions" : [ "SPV_NV_ray_tracing" ], "version" : "None" }, { "opname" : "OpTerminateRayNV", "class" : "Reserved", "opcode" : 5336, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], - "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], - "version" : "None" - }, - { - "opname" : "OpTerminateRayKHR", - "class" : "Reserved", - "opcode" : 5336, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], - "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], + "capabilities" : [ "RayTracingNV" ], + "extensions" : [ "SPV_NV_ray_tracing" ], "version" : "None" }, { @@ -4614,30 +4662,8 @@ { "kind" : "IdRef", "name" : "'Ray Tmax'" }, { "kind" : "IdRef", "name" : "'PayloadId'" } ], - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], - "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], - "version" : "None" - }, - { - "opname" : "OpTraceRayKHR", - "class" : "Reserved", - "opcode" : 5337, - "operands" : [ - - { "kind" : "IdRef", "name" : "'Accel'" }, - { "kind" : "IdRef", "name" : "'Ray Flags'" }, - { "kind" : "IdRef", "name" : "'Cull Mask'" }, - { "kind" : "IdRef", "name" : "'SBT Offset'" }, - { "kind" : "IdRef", "name" : "'SBT Stride'" }, - { "kind" : "IdRef", "name" : "'Miss Index'" }, - { "kind" : "IdRef", "name" : "'Ray Origin'" }, - { "kind" : "IdRef", "name" : "'Ray Tmin'" }, - { "kind" : "IdRef", "name" : "'Ray Direction'" }, - { "kind" : "IdRef", "name" : "'Ray Tmax'" }, - { "kind" : "IdRef", "name" : "'PayloadId'" } - ], - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], - "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], + "capabilities" : [ "RayTracingNV" ], + "extensions" : [ "SPV_NV_ray_tracing" ], "version" : "None" }, { @@ -4647,7 +4673,7 @@ "operands" : [ { "kind" : "IdResult" } ], - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR", "RayQueryProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR", "RayQueryKHR" ], "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing", "SPV_KHR_ray_query" ], "version" : "None" }, @@ -4658,7 +4684,7 @@ "operands" : [ { "kind" : "IdResult" } ], - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR", "RayQueryProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR", "RayQueryKHR" ], "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing", "SPV_KHR_ray_query" ], "version" : "None" }, @@ -4671,21 +4697,8 @@ { "kind" : "IdRef", "name" : "'SBT Index'" }, { "kind" : "IdRef", "name" : "'Callable DataId'" } ], - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], - "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], - "version" : "None" - }, - { - "opname" : "OpExecuteCallableKHR", - "class" : "Reserved", - "opcode" : 5344, - "operands" : [ - - { "kind" : "IdRef", "name" : "'SBT Index'" }, - { "kind" : "IdRef", "name" : "'Callable DataId'" } - ], - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], - "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], + "capabilities" : [ "RayTracingNV" ], + "extensions" : [ "SPV_NV_ray_tracing" ], "version" : "None" }, { @@ -6763,7 +6776,7 @@ "name" : "'RayQuery'" } ], - "capabilities" : [ "RayQueryProvisionalKHR" ], + "capabilities" : [ "RayQueryKHR" ], "extensions" : [ "SPV_KHR_ray_query" ], "version" : "None" }, @@ -6779,7 +6792,7 @@ "name" : "'RayQuery'" } ], - "capabilities" : [ "RayQueryProvisionalKHR" ], + "capabilities" : [ "RayQueryKHR" ], "extensions" : [ "SPV_KHR_ray_query" ], "version" : "None" }, @@ -6799,7 +6812,7 @@ "name" : "'Intersection'" } ], - "capabilities" : [ "RayQueryProvisionalKHR" ], + "capabilities" : [ "RayQueryKHR" ], "extensions" : [ "SPV_KHR_ray_query" ], "version" : "None" }, @@ -6819,7 +6832,7 @@ "name" : "'Intersection'" } ], - "capabilities" : [ "RayQueryProvisionalKHR" ], + "capabilities" : [ "RayQueryKHR" ], "extensions" : [ "SPV_KHR_ray_query" ], "version" : "None" }, @@ -6839,7 +6852,7 @@ "name" : "'Intersection'" } ], - "capabilities" : [ "RayQueryProvisionalKHR" ], + "capabilities" : [ "RayQueryKHR" ], "extensions" : [ "SPV_KHR_ray_query" ], "version" : "None" }, @@ -6859,7 +6872,7 @@ "name" : "'Intersection'" } ], - "capabilities" : [ "RayQueryProvisionalKHR" ], + "capabilities" : [ "RayQueryKHR" ], "extensions" : [ "SPV_KHR_ray_query" ], "version" : "None" }, @@ -6879,7 +6892,7 @@ "name" : "'Intersection'" } ], - "capabilities" : [ "RayQueryProvisionalKHR" ], + "capabilities" : [ "RayQueryKHR" ], "extensions" : [ "SPV_KHR_ray_query" ], "version" : "None" }, @@ -6899,7 +6912,7 @@ "name" : "'Intersection'" } ], - "capabilities" : [ "RayQueryProvisionalKHR" ], + "capabilities" : [ "RayQueryKHR" ], "extensions" : [ "SPV_KHR_ray_query" ], "version" : "None" }, @@ -6919,7 +6932,7 @@ "name" : "'Intersection'" } ], - "capabilities" : [ "RayQueryProvisionalKHR" ], + "capabilities" : [ "RayQueryKHR" ], "extensions" : [ "SPV_KHR_ray_query" ], "version" : "None" }, @@ -6939,7 +6952,7 @@ "name" : "'Intersection'" } ], - "capabilities" : [ "RayQueryProvisionalKHR" ], + "capabilities" : [ "RayQueryKHR" ], "extensions" : [ "SPV_KHR_ray_query" ], "version" : "None" }, @@ -6955,7 +6968,7 @@ "name" : "'RayQuery'" } ], - "capabilities" : [ "RayQueryProvisionalKHR" ], + "capabilities" : [ "RayQueryKHR" ], "extensions" : [ "SPV_KHR_ray_query" ], "version" : "None" }, @@ -6975,7 +6988,7 @@ "name" : "'Intersection'" } ], - "capabilities" : [ "RayQueryProvisionalKHR" ], + "capabilities" : [ "RayQueryKHR" ], "extensions" : [ "SPV_KHR_ray_query" ], "version" : "None" }, @@ -6995,7 +7008,7 @@ "name" : "'Intersection'" } ], - "capabilities" : [ "RayQueryProvisionalKHR" ], + "capabilities" : [ "RayQueryKHR" ], "extensions" : [ "SPV_KHR_ray_query" ], "version" : "None" }, @@ -7011,7 +7024,7 @@ "name" : "'RayQuery'" } ], - "capabilities" : [ "RayQueryProvisionalKHR" ], + "capabilities" : [ "RayQueryKHR" ], "extensions" : [ "SPV_KHR_ray_query" ], "version" : "None" }, @@ -7027,7 +7040,7 @@ "name" : "'RayQuery'" } ], - "capabilities" : [ "RayQueryProvisionalKHR" ], + "capabilities" : [ "RayQueryKHR" ], "extensions" : [ "SPV_KHR_ray_query" ], "version" : "None" }, @@ -7047,7 +7060,7 @@ "name" : "'Intersection'" } ], - "capabilities" : [ "RayQueryProvisionalKHR" ], + "capabilities" : [ "RayQueryKHR" ], "extensions" : [ "SPV_KHR_ray_query" ], "version" : "None" }, @@ -7067,7 +7080,7 @@ "name" : "'Intersection'" } ], - "capabilities" : [ "RayQueryProvisionalKHR" ], + "capabilities" : [ "RayQueryKHR" ], "extensions" : [ "SPV_KHR_ray_query" ], "version" : "None" }, @@ -7654,67 +7667,67 @@ { "enumerant" : "NoneKHR", "value" : "0x0000", - "capabilities" : [ "RayQueryProvisionalKHR","RayTracingProvisionalKHR" ], + "capabilities" : [ "RayQueryKHR","RayTracingKHR" ], "version" : "None" }, { "enumerant" : "OpaqueKHR", "value" : "0x0001", - "capabilities" : [ "RayQueryProvisionalKHR","RayTracingProvisionalKHR" ], + "capabilities" : [ "RayQueryKHR","RayTracingKHR" ], "version" : "None" }, { "enumerant" : "NoOpaqueKHR", "value" : "0x0002", - "capabilities" : [ "RayQueryProvisionalKHR","RayTracingProvisionalKHR" ], + "capabilities" : [ "RayQueryKHR","RayTracingKHR" ], "version" : "None" }, { "enumerant" : "TerminateOnFirstHitKHR", "value" : "0x0004", - "capabilities" : [ "RayQueryProvisionalKHR","RayTracingProvisionalKHR" ], + "capabilities" : [ "RayQueryKHR","RayTracingKHR" ], "version" : "None" }, { "enumerant" : "SkipClosestHitShaderKHR", "value" : "0x0008", - "capabilities" : [ "RayQueryProvisionalKHR","RayTracingProvisionalKHR" ], + "capabilities" : [ "RayQueryKHR","RayTracingKHR" ], "version" : "None" }, { "enumerant" : "CullBackFacingTrianglesKHR", "value" : "0x0010", - "capabilities" : [ "RayQueryProvisionalKHR","RayTracingProvisionalKHR" ], + "capabilities" : [ "RayQueryKHR","RayTracingKHR" ], "version" : "None" }, { "enumerant" : "CullFrontFacingTrianglesKHR", "value" : "0x0020", - "capabilities" : [ "RayQueryProvisionalKHR","RayTracingProvisionalKHR" ], + "capabilities" : [ "RayQueryKHR","RayTracingKHR" ], "version" : "None" }, { "enumerant" : "CullOpaqueKHR", "value" : "0x0040", - "capabilities" : [ "RayQueryProvisionalKHR","RayTracingProvisionalKHR" ], + "capabilities" : [ "RayQueryKHR","RayTracingKHR" ], "version" : "None" }, { "enumerant" : "CullNoOpaqueKHR", "value" : "0x0080", - "capabilities" : [ "RayQueryProvisionalKHR","RayTracingProvisionalKHR" ], + "capabilities" : [ "RayQueryKHR","RayTracingKHR" ], "version" : "None" }, { "enumerant" : "SkipTrianglesKHR", "value" : "0x0100", - "capabilities" : [ "RayTraversalPrimitiveCullingProvisionalKHR" ], + "capabilities" : [ "RayTraversalPrimitiveCullingKHR" ], "version" : "None" }, { "enumerant" : "SkipAABBsKHR", "value" : "0x0200", - "capabilities" : [ "RayTraversalPrimitiveCullingProvisionalKHR" ], + "capabilities" : [ "RayTraversalPrimitiveCullingKHR" ], "version" : "None" } ] @@ -7833,73 +7846,73 @@ { "enumerant" : "RayGenerationNV", "value" : 5313, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "version" : "None" }, { "enumerant" : "RayGenerationKHR", "value" : 5313, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "version" : "None" }, { "enumerant" : "IntersectionNV", "value" : 5314, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "version" : "None" }, { "enumerant" : "IntersectionKHR", "value" : 5314, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "version" : "None" }, { "enumerant" : "AnyHitNV", "value" : 5315, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "version" : "None" }, { "enumerant" : "AnyHitKHR", "value" : 5315, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "version" : "None" }, { "enumerant" : "ClosestHitNV", "value" : 5316, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "version" : "None" }, { "enumerant" : "ClosestHitKHR", "value" : 5316, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "version" : "None" }, { "enumerant" : "MissNV", "value" : 5317, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "version" : "None" }, { "enumerant" : "MissKHR", "value" : 5317, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "version" : "None" }, { "enumerant" : "CallableNV", "value" : 5318, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "version" : "None" }, { "enumerant" : "CallableKHR", "value" : 5318, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "version" : "None" } ] @@ -8464,84 +8477,84 @@ "enumerant" : "CallableDataNV", "value" : 5328, "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "version" : "None" }, { "enumerant" : "CallableDataKHR", "value" : 5328, "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "version" : "None" }, { "enumerant" : "IncomingCallableDataNV", "value" : 5329, "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "version" : "None" }, { "enumerant" : "IncomingCallableDataKHR", "value" : 5329, "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "version" : "None" }, { "enumerant" : "RayPayloadNV", "value" : 5338, "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "version" : "None" }, { "enumerant" : "RayPayloadKHR", "value" : 5338, "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "version" : "None" }, { "enumerant" : "HitAttributeNV", "value" : 5339, "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "version" : "None" }, { "enumerant" : "HitAttributeKHR", "value" : 5339, "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "version" : "None" }, { "enumerant" : "IncomingRayPayloadNV", "value" : 5342, "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "version" : "None" }, { "enumerant" : "IncomingRayPayloadKHR", "value" : 5342, "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "version" : "None" }, { "enumerant" : "ShaderRecordBufferNV", "value" : 5343, "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "version" : "None" }, { "enumerant" : "ShaderRecordBufferKHR", "value" : 5343, "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "version" : "None" }, { @@ -9792,7 +9805,7 @@ { "enumerant" : "PrimitiveId", "value" : 7, - "capabilities" : [ "Geometry", "Tessellation", "RayTracingNV", "RayTracingProvisionalKHR" ] + "capabilities" : [ "Geometry", "Tessellation", "RayTracingNV", "RayTracingKHR", "MeshShadingNV" ] }, { "enumerant" : "InvocationId", @@ -9802,12 +9815,12 @@ { "enumerant" : "Layer", "value" : 9, - "capabilities" : [ "Geometry", "ShaderLayer", "ShaderViewportIndexLayerEXT" ] + "capabilities" : [ "Geometry", "ShaderLayer", "ShaderViewportIndexLayerEXT", "MeshShadingNV" ] }, { "enumerant" : "ViewportIndex", "value" : 10, - "capabilities" : [ "MultiViewport", "ShaderViewportIndex", "ShaderViewportIndexLayerEXT" ] + "capabilities" : [ "MultiViewport", "ShaderViewportIndex", "ShaderViewportIndexLayerEXT", "MeshShadingNV" ] }, { "enumerant" : "TessLevelOuter", @@ -10264,203 +10277,203 @@ { "enumerant" : "LaunchIdNV", "value" : 5319, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], "version" : "None" }, { "enumerant" : "LaunchIdKHR", "value" : 5319, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], "version" : "None" }, { "enumerant" : "LaunchSizeNV", "value" : 5320, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], "version" : "None" }, { "enumerant" : "LaunchSizeKHR", "value" : 5320, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], "version" : "None" }, { "enumerant" : "WorldRayOriginNV", "value" : 5321, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], "version" : "None" }, { "enumerant" : "WorldRayOriginKHR", "value" : 5321, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], "version" : "None" }, { "enumerant" : "WorldRayDirectionNV", "value" : 5322, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], "version" : "None" }, { "enumerant" : "WorldRayDirectionKHR", "value" : 5322, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], "version" : "None" }, { "enumerant" : "ObjectRayOriginNV", "value" : 5323, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], "version" : "None" }, { "enumerant" : "ObjectRayOriginKHR", "value" : 5323, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], "version" : "None" }, { "enumerant" : "ObjectRayDirectionNV", "value" : 5324, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], "version" : "None" }, { "enumerant" : "ObjectRayDirectionKHR", "value" : 5324, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], "version" : "None" }, { "enumerant" : "RayTminNV", "value" : 5325, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], "version" : "None" }, { "enumerant" : "RayTminKHR", "value" : 5325, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], "version" : "None" }, { "enumerant" : "RayTmaxNV", "value" : 5326, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], "version" : "None" }, { "enumerant" : "RayTmaxKHR", "value" : 5326, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], "version" : "None" }, { "enumerant" : "InstanceCustomIndexNV", "value" : 5327, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], "version" : "None" }, { "enumerant" : "InstanceCustomIndexKHR", "value" : 5327, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], "version" : "None" }, { "enumerant" : "ObjectToWorldNV", "value" : 5330, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], "version" : "None" }, { "enumerant" : "ObjectToWorldKHR", "value" : 5330, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], "version" : "None" }, { "enumerant" : "WorldToObjectNV", "value" : 5331, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], "version" : "None" }, { "enumerant" : "WorldToObjectKHR", "value" : 5331, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], "version" : "None" }, { "enumerant" : "HitTNV", "value" : 5332, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], "version" : "None" }, { "enumerant" : "HitTKHR", "value" : 5332, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], "version" : "None" }, { "enumerant" : "HitKindNV", "value" : 5333, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], "version" : "None" }, { "enumerant" : "HitKindKHR", "value" : 5333, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], "version" : "None" }, { "enumerant" : "IncomingRayFlagsNV", "value" : 5351, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], "version" : "None" }, { "enumerant" : "IncomingRayFlagsKHR", "value" : 5351, - "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], "version" : "None" }, { "enumerant" : "RayGeometryIndexKHR", "value" : 5352, - "capabilities" : [ "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingKHR" ], "extensions" : [ "SPV_KHR_ray_tracing" ], "version" : "None" }, @@ -10533,7 +10546,7 @@ { "enumerant" : "ShaderCallKHR", "value" : 6, - "capabilities" : [ "RayTracingProvisionalKHR" ], + "capabilities" : [ "RayTracingKHR" ], "version" : "None" } ] @@ -11121,12 +11134,26 @@ "version" : "None" }, { - "enumerant" : "RayTraversalPrimitiveCullingProvisionalKHR", + "enumerant" : "RayQueryKHR", + "value" : 4472, + "capabilities" : [ "Shader" ], + "extensions" : [ "SPV_KHR_ray_query" ], + "version" : "None" + }, + { + "enumerant" : "RayTraversalPrimitiveCullingKHR", "value" : 4478, - "capabilities" : [ "RayQueryProvisionalKHR","RayTracingProvisionalKHR" ], + "capabilities" : [ "RayQueryKHR","RayTracingKHR" ], "extensions" : [ "SPV_KHR_ray_query","SPV_KHR_ray_tracing" ], "version" : "None" }, + { + "enumerant" : "RayTracingKHR", + "value" : 4479, + "capabilities" : [ "Shader" ], + "extensions" : [ "SPV_KHR_ray_tracing" ], + "version" : "None" + }, { "enumerant" : "Float16ImageAMD", "value" : 5008, @@ -11657,13 +11684,13 @@ { "enumerant" : "RayQueryCandidateIntersectionKHR", "value" : 0, - "capabilities" : [ "RayQueryProvisionalKHR" ], + "capabilities" : [ "RayQueryKHR" ], "version" : "None" }, { "enumerant" : "RayQueryCommittedIntersectionKHR", "value" : 1, - "capabilities" : [ "RayQueryProvisionalKHR" ], + "capabilities" : [ "RayQueryKHR" ], "version" : "None" } ] @@ -11675,19 +11702,19 @@ { "enumerant" : "RayQueryCommittedIntersectionNoneKHR", "value" : 0, - "capabilities" : [ "RayQueryProvisionalKHR" ], + "capabilities" : [ "RayQueryKHR" ], "version" : "None" }, { "enumerant" : "RayQueryCommittedIntersectionTriangleKHR", "value" : 1, - "capabilities" : [ "RayQueryProvisionalKHR" ], + "capabilities" : [ "RayQueryKHR" ], "version" : "None" }, { "enumerant" : "RayQueryCommittedIntersectionGeneratedKHR", "value" : 2, - "capabilities" : [ "RayQueryProvisionalKHR" ], + "capabilities" : [ "RayQueryKHR" ], "version" : "None" } ] @@ -11699,13 +11726,13 @@ { "enumerant" : "RayQueryCandidateIntersectionTriangleKHR", "value" : 0, - "capabilities" : [ "RayQueryProvisionalKHR" ], + "capabilities" : [ "RayQueryKHR" ], "version" : "None" }, { "enumerant" : "RayQueryCandidateIntersectionAABBKHR", "value" : 1, - "capabilities" : [ "RayQueryProvisionalKHR" ], + "capabilities" : [ "RayQueryKHR" ], "version" : "None" } ] diff --git a/src/compiler/spirv/spirv.h b/src/compiler/spirv/spirv.h index 4e36b3a4c45..fae2a10e93c 100644 --- a/src/compiler/spirv/spirv.h +++ b/src/compiler/spirv/spirv.h @@ -903,7 +903,9 @@ typedef enum SpvCapability_ { SpvCapabilityRoundingModeRTE = 4467, SpvCapabilityRoundingModeRTZ = 4468, SpvCapabilityRayQueryProvisionalKHR = 4471, - SpvCapabilityRayTraversalPrimitiveCullingProvisionalKHR = 4478, + SpvCapabilityRayQueryKHR = 4472, + SpvCapabilityRayTraversalPrimitiveCullingKHR = 4478, + SpvCapabilityRayTracingKHR = 4479, SpvCapabilityFloat16ImageAMD = 5008, SpvCapabilityImageGatherBiasLodAMD = 5009, SpvCapabilityFragmentMaskAMD = 5010, @@ -1402,7 +1404,12 @@ typedef enum SpvOp_ { SpvOpSubgroupAnyKHR = 4429, SpvOpSubgroupAllEqualKHR = 4430, SpvOpSubgroupReadInvocationKHR = 4432, - SpvOpTypeRayQueryProvisionalKHR = 4472, + SpvOpTraceRayKHR = 4445, + SpvOpExecuteCallableKHR = 4446, + SpvOpConvertUToAccelerationStructureKHR = 4447, + SpvOpIgnoreIntersectionKHR = 4448, + SpvOpTerminateRayKHR = 4449, + SpvOpTypeRayQueryKHR = 4472, SpvOpRayQueryInitializeKHR = 4473, SpvOpRayQueryTerminateKHR = 4474, SpvOpRayQueryGenerateIntersectionKHR = 4475, @@ -1425,15 +1432,11 @@ typedef enum SpvOp_ { SpvOpWritePackedPrimitiveIndices4x8NV = 5299, SpvOpReportIntersectionKHR = 5334, SpvOpReportIntersectionNV = 5334, - SpvOpIgnoreIntersectionKHR = 5335, SpvOpIgnoreIntersectionNV = 5335, - SpvOpTerminateRayKHR = 5336, SpvOpTerminateRayNV = 5336, SpvOpTraceNV = 5337, - SpvOpTraceRayKHR = 5337, SpvOpTypeAccelerationStructureKHR = 5341, SpvOpTypeAccelerationStructureNV = 5341, - SpvOpExecuteCallableKHR = 5344, SpvOpExecuteCallableNV = 5344, SpvOpTypeCooperativeMatrixNV = 5358, SpvOpCooperativeMatrixLoadNV = 5359, @@ -1973,7 +1976,12 @@ inline void SpvHasResultAndType(SpvOp opcode, bool *hasResult, bool *hasResultTy case SpvOpSubgroupAnyKHR: *hasResult = true; *hasResultType = true; break; case SpvOpSubgroupAllEqualKHR: *hasResult = true; *hasResultType = true; break; case SpvOpSubgroupReadInvocationKHR: *hasResult = true; *hasResultType = true; break; - case SpvOpTypeRayQueryProvisionalKHR: *hasResult = true; *hasResultType = false; break; + case SpvOpTraceRayKHR: *hasResult = false; *hasResultType = false; break; + case SpvOpExecuteCallableKHR: *hasResult = false; *hasResultType = false; break; + case SpvOpConvertUToAccelerationStructureKHR: *hasResult = true; *hasResultType = true; break; + case SpvOpIgnoreIntersectionKHR: *hasResult = false; *hasResultType = false; break; + case SpvOpTerminateRayKHR: *hasResult = false; *hasResultType = false; break; + case SpvOpTypeRayQueryKHR: *hasResult = true; *hasResultType = false; break; case SpvOpRayQueryInitializeKHR: *hasResult = false; *hasResultType = false; break; case SpvOpRayQueryTerminateKHR: *hasResult = false; *hasResultType = false; break; case SpvOpRayQueryGenerateIntersectionKHR: *hasResult = false; *hasResultType = false; break; diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c index c1c156e53c0..e0a21915b73 100644 --- a/src/compiler/spirv/spirv_to_nir.c +++ b/src/compiler/spirv/spirv_to_nir.c @@ -4459,15 +4459,15 @@ vtn_handle_preamble_instruction(struct vtn_builder *b, SpvOp opcode, spv_check_supported(intel_subgroup_buffer_block_io, cap); break; - case SpvCapabilityRayTracingProvisionalKHR: + case SpvCapabilityRayTracingKHR: spv_check_supported(ray_tracing, cap); break; - case SpvCapabilityRayQueryProvisionalKHR: + case SpvCapabilityRayQueryKHR: spv_check_supported(ray_query, cap); break; - case SpvCapabilityRayTraversalPrimitiveCullingProvisionalKHR: + case SpvCapabilityRayTraversalPrimitiveCullingKHR: spv_check_supported(ray_traversal_primitive_culling, cap); break;