diff --git a/DEPS b/DEPS index ef3ee5da5c..350cfb4de4 100644 --- a/DEPS +++ b/DEPS @@ -6,7 +6,7 @@ vars = { 'effcee_revision': '2ec8f8738118cc483b67c04a759fee53496c5659', 'googletest_revision': '3af06fe1664d30f98de1e78c53a7087e842a2547', 're2_revision': 'ca11026a032ce2a3de4b3c389ee53d2bdc8794d6', - 'spirv_headers_revision': '05836bdba63e7debce9fa9feaed42f20cd43af9d', + 'spirv_headers_revision': '4de110ce1c78fda37932c735ef7f747e6f6cbee8', } deps = { diff --git a/source/opcode.cpp b/source/opcode.cpp index 8305bcf0a9..c80e3a001b 100644 --- a/source/opcode.cpp +++ b/source/opcode.cpp @@ -337,7 +337,7 @@ int32_t spvOpcodeGeneratesType(SpvOp op) { case SpvOpTypeCooperativeMatrixNV: // case SpvOpTypeAccelerationStructureKHR: covered by // SpvOpTypeAccelerationStructureNV - case SpvOpTypeRayQueryProvisionalKHR: + case SpvOpTypeRayQueryKHR: return true; default: // In particular, OpTypeForwardPointer does not generate a type, diff --git a/source/opt/ir_context.cpp b/source/opt/ir_context.cpp index 3e610d7079..82107b5ccc 100644 --- a/source/opt/ir_context.cpp +++ b/source/opt/ir_context.cpp @@ -475,7 +475,7 @@ void IRContext::AddCombinatorsForCapability(uint32_t capability) { SpvOpTypeSampledImage, SpvOpTypeAccelerationStructureNV, SpvOpTypeAccelerationStructureKHR, - SpvOpTypeRayQueryProvisionalKHR, + SpvOpTypeRayQueryKHR, SpvOpTypeArray, SpvOpTypeRuntimeArray, SpvOpTypeStruct, diff --git a/source/opt/reflect.h b/source/opt/reflect.h index 2e253add34..d374e6823f 100644 --- a/source/opt/reflect.h +++ b/source/opt/reflect.h @@ -47,7 +47,7 @@ inline bool IsTypeInst(SpvOp opcode) { opcode == SpvOpTypePipeStorage || opcode == SpvOpTypeNamedBarrier || opcode == SpvOpTypeAccelerationStructureNV || opcode == SpvOpTypeAccelerationStructureKHR || - opcode == SpvOpTypeRayQueryProvisionalKHR || + opcode == SpvOpTypeRayQueryKHR || opcode == SpvOpTypeCooperativeMatrixNV; } inline bool IsConstantInst(SpvOp opcode) { diff --git a/source/opt/type_manager.cpp b/source/opt/type_manager.cpp index 27c7199452..ce9c2c14ac 100644 --- a/source/opt/type_manager.cpp +++ b/source/opt/type_manager.cpp @@ -862,8 +862,8 @@ Type* TypeManager::RecordIfTypeDefinition(const Instruction& inst) { inst.GetSingleWordInOperand(2), inst.GetSingleWordInOperand(3)); break; - case SpvOpTypeRayQueryProvisionalKHR: - type = new RayQueryProvisionalKHR(); + case SpvOpTypeRayQueryKHR: + type = new RayQueryKHR(); break; default: SPIRV_UNIMPLEMENTED(consumer_, "unhandled type"); diff --git a/source/opt/types.cpp b/source/opt/types.cpp index 426d3ea445..b1eb3a5084 100644 --- a/source/opt/types.cpp +++ b/source/opt/types.cpp @@ -128,7 +128,7 @@ std::unique_ptr Type::Clone() const { DeclareKindCase(NamedBarrier); DeclareKindCase(AccelerationStructureNV); DeclareKindCase(CooperativeMatrixNV); - DeclareKindCase(RayQueryProvisionalKHR); + DeclareKindCase(RayQueryKHR); #undef DeclareKindCase default: assert(false && "Unhandled type"); @@ -174,7 +174,7 @@ bool Type::operator==(const Type& other) const { DeclareKindCase(NamedBarrier); DeclareKindCase(AccelerationStructureNV); DeclareKindCase(CooperativeMatrixNV); - DeclareKindCase(RayQueryProvisionalKHR); + DeclareKindCase(RayQueryKHR); #undef DeclareKindCase default: assert(false && "Unhandled type"); @@ -225,7 +225,7 @@ void Type::GetHashWords(std::vector* words, DeclareKindCase(NamedBarrier); DeclareKindCase(AccelerationStructureNV); DeclareKindCase(CooperativeMatrixNV); - DeclareKindCase(RayQueryProvisionalKHR); + DeclareKindCase(RayQueryKHR); #undef DeclareKindCase default: assert(false && "Unhandled type"); diff --git a/source/opt/types.h b/source/opt/types.h index ebeb476039..d5be9be431 100644 --- a/source/opt/types.h +++ b/source/opt/types.h @@ -59,7 +59,7 @@ class PipeStorage; class NamedBarrier; class AccelerationStructureNV; class CooperativeMatrixNV; -class RayQueryProvisionalKHR; +class RayQueryKHR; // Abstract class for a SPIR-V type. It has a bunch of As() methods, // which is used as a way to probe the actual . @@ -96,7 +96,7 @@ class Type { kNamedBarrier, kAccelerationStructureNV, kCooperativeMatrixNV, - kRayQueryProvisionalKHR + kRayQueryKHR }; Type(Kind k) : kind_(k) {} @@ -201,7 +201,7 @@ class Type { DeclareCastMethod(NamedBarrier) DeclareCastMethod(AccelerationStructureNV) DeclareCastMethod(CooperativeMatrixNV) - DeclareCastMethod(RayQueryProvisionalKHR) + DeclareCastMethod(RayQueryKHR) #undef DeclareCastMethod protected: @@ -662,7 +662,7 @@ DefineParameterlessType(Queue, queue); DefineParameterlessType(PipeStorage, pipe_storage); DefineParameterlessType(NamedBarrier, named_barrier); DefineParameterlessType(AccelerationStructureNV, accelerationStructureNV); -DefineParameterlessType(RayQueryProvisionalKHR, rayQueryProvisionalKHR); +DefineParameterlessType(RayQueryKHR, rayQueryKHR); #undef DefineParameterlessType } // namespace analysis diff --git a/source/val/validate_builtins.cpp b/source/val/validate_builtins.cpp index 4e6d9aa9c3..d9e066653d 100644 --- a/source/val/validate_builtins.cpp +++ b/source/val/validate_builtins.cpp @@ -2375,10 +2375,9 @@ spv_result_t BuiltInsValidator::ValidateVertexIndexAtDefinition( spv_result_t BuiltInsValidator::ValidateVertexIdOrInstanceIdAtDefinition( const Decoration& decoration, const Instruction& inst) { const SpvBuiltIn label = SpvBuiltIn(decoration.params()[0]); - bool allow_instance_id = - (_.HasCapability(SpvCapabilityRayTracingNV) || - _.HasCapability(SpvCapabilityRayTracingProvisionalKHR)) && - label == SpvBuiltInInstanceId; + bool allow_instance_id = (_.HasCapability(SpvCapabilityRayTracingNV) || + _.HasCapability(SpvCapabilityRayTracingKHR)) && + label == SpvBuiltInInstanceId; if (spvIsVulkanEnv(_.context()->target_env) && !allow_instance_id) { return _.diag(SPV_ERROR_INVALID_DATA, &inst) diff --git a/source/val/validate_cfg.cpp b/source/val/validate_cfg.cpp index 8babd355d1..45edd0c9c3 100644 --- a/source/val/validate_cfg.cpp +++ b/source/val/validate_cfg.cpp @@ -1110,6 +1110,8 @@ spv_result_t CfgPass(ValidationState_t& _, const Instruction* inst) { case SpvOpReturnValue: case SpvOpUnreachable: case SpvOpTerminateInvocation: + case SpvOpIgnoreIntersectionKHR: + case SpvOpTerminateRayKHR: _.current_function().RegisterBlockEnd(std::vector()); if (opcode == SpvOpKill) { _.current_function().RegisterExecutionModelLimitation( @@ -1121,6 +1123,17 @@ spv_result_t CfgPass(ValidationState_t& _, const Instruction* inst) { SpvExecutionModelFragment, "OpTerminateInvocation requires Fragment execution model"); } + if (opcode == SpvOpIgnoreIntersectionKHR) { + _.current_function().RegisterExecutionModelLimitation( + SpvExecutionModelAnyHitKHR, + "OpIgnoreIntersectionKHR requires AnyHit execution model"); + } + if (opcode == SpvOpTerminateRayKHR) { + _.current_function().RegisterExecutionModelLimitation( + SpvExecutionModelAnyHitKHR, + "OpTerminateRayKHR requires AnyHit execution model"); + } + break; default: break; diff --git a/source/val/validate_memory.cpp b/source/val/validate_memory.cpp index 1e1a38dd22..d9f8b99155 100644 --- a/source/val/validate_memory.cpp +++ b/source/val/validate_memory.cpp @@ -536,8 +536,7 @@ spv_result_t ValidateVariable(ValidationState_t& _, const Instruction* inst) { _, pointee, {SpvOpTypeImage, SpvOpTypeSampler, SpvOpTypeSampledImage, SpvOpTypeAccelerationStructureNV, - SpvOpTypeAccelerationStructureKHR, - SpvOpTypeRayQueryProvisionalKHR})) { + SpvOpTypeAccelerationStructureKHR, SpvOpTypeRayQueryKHR})) { return _.diag(SPV_ERROR_INVALID_ID, inst) << "UniformConstant OpVariable '" << _.getIdName(inst->id()) << "' has illegal type.\n" @@ -547,7 +546,7 @@ spv_result_t ValidateVariable(ValidationState_t& _, const Instruction* inst) { << "variables must be typed as OpTypeImage, OpTypeSampler, " << "OpTypeSampledImage, OpTypeAccelerationStructureNV, " "OpTypeAccelerationStructureKHR, " - "OpTypeRayQueryProvisionalKHR, " + "OpTypeRayQueryKHR, " << "or an array of one of these types."; } } diff --git a/test/operand_capabilities_test.cpp b/test/operand_capabilities_test.cpp index addb08a793..0aec79180e 100644 --- a/test/operand_capabilities_test.cpp +++ b/test/operand_capabilities_test.cpp @@ -498,11 +498,11 @@ INSTANTIATE_TEST_SUITE_P( CASE1(BUILT_IN, BuiltInCullDistance, CullDistance), // Bug 1407, 15234 CASE1(BUILT_IN, BuiltInVertexId, Shader), CASE1(BUILT_IN, BuiltInInstanceId, Shader), - CASE4(BUILT_IN, BuiltInPrimitiveId, Geometry, Tessellation, - RayTracingNV, RayTracingProvisionalKHR), + CASE5(BUILT_IN, BuiltInPrimitiveId, Geometry, Tessellation, + RayTracingNV, RayTracingKHR, MeshShadingNV), CASE2(BUILT_IN, BuiltInInvocationId, Geometry, Tessellation), - CASE2(BUILT_IN, BuiltInLayer, Geometry, ShaderViewportIndexLayerEXT), - CASE2(BUILT_IN, BuiltInViewportIndex, MultiViewport, ShaderViewportIndexLayerEXT), // Bug 15234 + CASE3(BUILT_IN, BuiltInLayer, Geometry, ShaderViewportIndexLayerEXT, MeshShadingNV), + CASE3(BUILT_IN, BuiltInViewportIndex, MultiViewport, ShaderViewportIndexLayerEXT, MeshShadingNV), // Bug 15234 CASE1(BUILT_IN, BuiltInTessLevelOuter, Tessellation), CASE1(BUILT_IN, BuiltInTessLevelInner, Tessellation), CASE1(BUILT_IN, BuiltInTessCoord, Tessellation), @@ -545,10 +545,11 @@ INSTANTIATE_TEST_SUITE_P( Values(SPV_ENV_UNIVERSAL_1_5), ValuesIn(std::vector{ // SPIR-V 1.5 adds new capabilities to enable these two builtins. - CASE3(BUILT_IN, BuiltInLayer, Geometry, ShaderLayer, - ShaderViewportIndexLayerEXT), - CASE3(BUILT_IN, BuiltInViewportIndex, MultiViewport, - ShaderViewportIndex, ShaderViewportIndexLayerEXT), + CASE4(BUILT_IN, BuiltInLayer, Geometry, ShaderLayer, + ShaderViewportIndexLayerEXT, MeshShadingNV), + CASE4(BUILT_IN, BuiltInViewportIndex, MultiViewport, + ShaderViewportIndex, ShaderViewportIndexLayerEXT, + MeshShadingNV), }))); // See SPIR-V Section 3.22 Selection Control diff --git a/test/val/val_barriers_test.cpp b/test/val/val_barriers_test.cpp index 3643883227..8bd10d422a 100644 --- a/test/val/val_barriers_test.cpp +++ b/test/val/val_barriers_test.cpp @@ -1595,7 +1595,7 @@ TEST_F(ValidateBarriers, OpMemoryBarrierShaderCallRayGenSuccess) { // capabilities_and_extensions R"( OpCapability VulkanMemoryModelKHR - OpCapability RayTracingProvisionalKHR + OpCapability RayTracingKHR OpExtension "SPV_KHR_vulkan_memory_model" OpExtension "SPV_KHR_ray_tracing" )", @@ -1642,7 +1642,7 @@ TEST_F(ValidateBarriers, OpControlBarrierShaderCallRayGenFailure) { // capabilities_and_extensions R"( OpCapability VulkanMemoryModelKHR - OpCapability RayTracingProvisionalKHR + OpCapability RayTracingKHR OpExtension "SPV_KHR_vulkan_memory_model" OpExtension "SPV_KHR_ray_tracing" )", diff --git a/test/val/val_memory_test.cpp b/test/val/val_memory_test.cpp index b32867b16c..e541890528 100644 --- a/test/val/val_memory_test.cpp +++ b/test/val/val_memory_test.cpp @@ -58,7 +58,7 @@ OpFunctionEnd "are used only as handles to refer to opaque resources. Such " "variables must be typed as OpTypeImage, OpTypeSampler, " "OpTypeSampledImage, OpTypeAccelerationStructureNV, " - "OpTypeAccelerationStructureKHR, OpTypeRayQueryProvisionalKHR, " + "OpTypeAccelerationStructureKHR, OpTypeRayQueryKHR, " "or an array of one of these types.")); } @@ -112,7 +112,7 @@ OpFunctionEnd "are used only as handles to refer to opaque resources. Such " "variables must be typed as OpTypeImage, OpTypeSampler, " "OpTypeSampledImage, OpTypeAccelerationStructureNV, " - "OpTypeAccelerationStructureKHR, OpTypeRayQueryProvisionalKHR, " + "OpTypeAccelerationStructureKHR, OpTypeRayQueryKHR, " "or an array of one of these types.")); } diff --git a/utils/vscode/src/schema/schema.go b/utils/vscode/src/schema/schema.go index 0d57cb121d..0fde3fea8c 100755 --- a/utils/vscode/src/schema/schema.go +++ b/utils/vscode/src/schema/schema.go @@ -477,7 +477,7 @@ var ( "OpTraceRayKHR": OpTraceRayKHR, "OpTypeAccelerationStructureNV": OpTypeAccelerationStructureNV, "OpTypeAccelerationStructureKHR": OpTypeAccelerationStructureKHR, - "OpTypeRayQueryProvisionalKHR": OpTypeRayQueryProvisionalKHR, + "OpTypeRayQueryKHR": OpTypeRayQueryKHR, "OpRayQueryInitializeKHR": OpRayQueryInitializeKHR, "OpRayQueryTerminateKHR": OpRayQueryTerminateKHR, "OpRayQueryGenerateIntersectionKHR": OpRayQueryGenerateIntersectionKHR, @@ -10807,8 +10807,8 @@ var ( }, }, } - OpTypeRayQueryProvisionalKHR = &Opcode { - Opname: "OpTypeRayQueryProvisionalKHR", + OpTypeRayQueryKHR = &Opcode { + Opname: "OpTypeRayQueryKHR", Class: "Reserved", Opcode: 4472, Operands: []Operand { @@ -20183,77 +20183,77 @@ var ( Enumerant{ Enumerant: "NoneKHR", Value: 0x0000, - Capabilities: []string{"RayQueryProvisionalKHR","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayQueryKHR","RayTracingKHR",}, Parameters: []Parameter{}, Version: "", }, Enumerant{ Enumerant: "OpaqueKHR", Value: 0x0001, - Capabilities: []string{"RayQueryProvisionalKHR","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayQueryKHR","RayTracingKHR",}, Parameters: []Parameter{}, Version: "", }, Enumerant{ Enumerant: "NoOpaqueKHR", Value: 0x0002, - Capabilities: []string{"RayQueryProvisionalKHR","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayQueryKHR","RayTracingKHR",}, Parameters: []Parameter{}, Version: "", }, Enumerant{ Enumerant: "TerminateOnFirstHitKHR", Value: 0x0004, - Capabilities: []string{"RayQueryProvisionalKHR","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayQueryKHR","RayTracingKHR",}, Parameters: []Parameter{}, Version: "", }, Enumerant{ Enumerant: "SkipClosestHitShaderKHR", Value: 0x0008, - Capabilities: []string{"RayQueryProvisionalKHR","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayQueryKHR","RayTracingKHR",}, Parameters: []Parameter{}, Version: "", }, Enumerant{ Enumerant: "CullBackFacingTrianglesKHR", Value: 0x0010, - Capabilities: []string{"RayQueryProvisionalKHR","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayQueryKHR","RayTracingKHR",}, Parameters: []Parameter{}, Version: "", }, Enumerant{ Enumerant: "CullFrontFacingTrianglesKHR", Value: 0x0020, - Capabilities: []string{"RayQueryProvisionalKHR","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayQueryKHR","RayTracingKHR",}, Parameters: []Parameter{}, Version: "", }, Enumerant{ Enumerant: "CullOpaqueKHR", Value: 0x0040, - Capabilities: []string{"RayQueryProvisionalKHR","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayQueryKHR","RayTracingKHR",}, Parameters: []Parameter{}, Version: "", }, Enumerant{ Enumerant: "CullNoOpaqueKHR", Value: 0x0080, - Capabilities: []string{"RayQueryProvisionalKHR","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayQueryKHR","RayTracingKHR",}, Parameters: []Parameter{}, Version: "", }, Enumerant{ Enumerant: "SkipTrianglesKHR", Value: 0x0100, - Capabilities: []string{"RayTraversalPrimitiveCullingProvisionalKHR",}, + Capabilities: []string{"RayTraversalPrimitiveCullingKHR",}, Parameters: []Parameter{}, Version: "", }, Enumerant{ Enumerant: "SkipAABBsKHR", Value: 0x0200, - Capabilities: []string{"RayTraversalPrimitiveCullingProvisionalKHR",}, + Capabilities: []string{"RayTraversalPrimitiveCullingKHR",}, Parameters: []Parameter{}, Version: "", }, @@ -20379,84 +20379,84 @@ var ( Enumerant{ Enumerant: "RayGenerationNV", Value: 5313, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "RayGenerationKHR", Value: 5313, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "IntersectionNV", Value: 5314, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "IntersectionKHR", Value: 5314, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "AnyHitNV", Value: 5315, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "AnyHitKHR", Value: 5315, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "ClosestHitNV", Value: 5316, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "ClosestHitKHR", Value: 5316, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "MissNV", Value: 5317, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "MissKHR", Value: 5317, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "CallableNV", Value: 5318, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "CallableKHR", Value: 5318, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, @@ -21044,84 +21044,84 @@ var ( Enumerant{ Enumerant: "CallableDataNV", Value: 5328, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "CallableDataKHR", Value: 5328, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "IncomingCallableDataNV", Value: 5329, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "IncomingCallableDataKHR", Value: 5329, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "RayPayloadNV", Value: 5338, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "RayPayloadKHR", Value: 5338, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "HitAttributeNV", Value: 5339, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "HitAttributeKHR", Value: 5339, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "IncomingRayPayloadNV", Value: 5342, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "IncomingRayPayloadKHR", Value: 5342, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "ShaderRecordBufferNV", Value: 5343, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "ShaderRecordBufferKHR", Value: 5343, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, @@ -22507,7 +22507,7 @@ var ( Enumerant{ Enumerant: "PrimitiveId", Value: 7, - Capabilities: []string{"Geometry","Tessellation","RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"Geometry","Tessellation","RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "", }, @@ -23053,203 +23053,203 @@ var ( Enumerant{ Enumerant: "LaunchIdNV", Value: 5319, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "LaunchIdKHR", Value: 5319, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "LaunchSizeNV", Value: 5320, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "LaunchSizeKHR", Value: 5320, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "WorldRayOriginNV", Value: 5321, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "WorldRayOriginKHR", Value: 5321, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "WorldRayDirectionNV", Value: 5322, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "WorldRayDirectionKHR", Value: 5322, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "ObjectRayOriginNV", Value: 5323, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "ObjectRayOriginKHR", Value: 5323, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "ObjectRayDirectionNV", Value: 5324, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "ObjectRayDirectionKHR", Value: 5324, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "RayTminNV", Value: 5325, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "RayTminKHR", Value: 5325, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "RayTmaxNV", Value: 5326, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "RayTmaxKHR", Value: 5326, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "InstanceCustomIndexNV", Value: 5327, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "InstanceCustomIndexKHR", Value: 5327, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "ObjectToWorldNV", Value: 5330, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "ObjectToWorldKHR", Value: 5330, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "WorldToObjectNV", Value: 5331, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "WorldToObjectKHR", Value: 5331, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "HitTNV", Value: 5332, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "HitTKHR", Value: 5332, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "HitKindNV", Value: 5333, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "HitKindKHR", Value: 5333, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "IncomingRayFlagsNV", Value: 5351, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "IncomingRayFlagsKHR", Value: 5351, - Capabilities: []string{"RayTracingNV","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingNV","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ Enumerant: "RayGeometryIndexKHR", Value: 5352, - Capabilities: []string{"RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, @@ -23340,7 +23340,7 @@ var ( Enumerant{ Enumerant: "ShaderCallKHR", Value: 6, - Capabilities: []string{"RayTracingProvisionalKHR",}, + Capabilities: []string{"RayTracingKHR",}, Parameters: []Parameter{}, Version: "", }, @@ -24080,16 +24080,16 @@ var ( Version: "1.4", }, Enumerant{ - Enumerant: "RayQueryProvisionalKHR", + Enumerant: "RayQueryKHR", Value: 4471, Capabilities: []string{"Shader",}, Parameters: []Parameter{}, Version: "None", }, Enumerant{ - Enumerant: "RayTraversalPrimitiveCullingProvisionalKHR", + Enumerant: "RayTraversalPrimitiveCullingKHR", Value: 4478, - Capabilities: []string{"RayQueryProvisionalKHR","RayTracingProvisionalKHR",}, + Capabilities: []string{"RayQueryKHR","RayTracingKHR",}, Parameters: []Parameter{}, Version: "None", }, @@ -24465,7 +24465,7 @@ var ( Version: "None", }, Enumerant{ - Enumerant: "RayTracingProvisionalKHR", + Enumerant: "RayTracingKHR", Value: 5353, Capabilities: []string{"Shader",}, Parameters: []Parameter{}, @@ -24579,14 +24579,14 @@ var ( Enumerant{ Enumerant: "RayQueryCandidateIntersectionKHR", Value: 0, - Capabilities: []string{"RayQueryProvisionalKHR",}, + Capabilities: []string{"RayQueryKHR",}, Parameters: []Parameter{}, Version: "", }, Enumerant{ Enumerant: "RayQueryCommittedIntersectionKHR", Value: 1, - Capabilities: []string{"RayQueryProvisionalKHR",}, + Capabilities: []string{"RayQueryKHR",}, Parameters: []Parameter{}, Version: "", }, @@ -24600,21 +24600,21 @@ var ( Enumerant{ Enumerant: "RayQueryCommittedIntersectionNoneKHR", Value: 0, - Capabilities: []string{"RayQueryProvisionalKHR",}, + Capabilities: []string{"RayQueryKHR",}, Parameters: []Parameter{}, Version: "", }, Enumerant{ Enumerant: "RayQueryCommittedIntersectionTriangleKHR", Value: 1, - Capabilities: []string{"RayQueryProvisionalKHR",}, + Capabilities: []string{"RayQueryKHR",}, Parameters: []Parameter{}, Version: "", }, Enumerant{ Enumerant: "RayQueryCommittedIntersectionGeneratedKHR", Value: 2, - Capabilities: []string{"RayQueryProvisionalKHR",}, + Capabilities: []string{"RayQueryKHR",}, Parameters: []Parameter{}, Version: "", }, @@ -24628,14 +24628,14 @@ var ( Enumerant{ Enumerant: "RayQueryCandidateIntersectionTriangleKHR", Value: 0, - Capabilities: []string{"RayQueryProvisionalKHR",}, + Capabilities: []string{"RayQueryKHR",}, Parameters: []Parameter{}, Version: "", }, Enumerant{ Enumerant: "RayQueryCandidateIntersectionAABBKHR", Value: 1, - Capabilities: []string{"RayQueryProvisionalKHR",}, + Capabilities: []string{"RayQueryKHR",}, Parameters: []Parameter{}, Version: "", },