Updates to final ray tracing extensions

DEPS

@@ -6,7 +6,7 @@ vars = {
   'effcee_revision': '2ec8f8738118cc483b67c04a759fee53496c5659',
   'googletest_revision': '3af06fe1664d30f98de1e78c53a7087e842a2547',
   're2_revision': 'ca11026a032ce2a3de4b3c389ee53d2bdc8794d6',
-  'spirv_headers_revision': '05836bdba63e7debce9fa9feaed42f20cd43af9d',
+  'spirv_headers_revision': '4de110ce1c78fda37932c735ef7f747e6f6cbee8',
 }
 
 deps = {

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,

source/opt/ir_context.cpp

@@ -475,7 +475,7 @@ void IRContext::AddCombinatorsForCapability(uint32_t capability) {
                                SpvOpTypeSampledImage,
                                SpvOpTypeAccelerationStructureNV,
                                SpvOpTypeAccelerationStructureKHR,
-                               SpvOpTypeRayQueryProvisionalKHR,
+                               SpvOpTypeRayQueryKHR,
                                SpvOpTypeArray,
                                SpvOpTypeRuntimeArray,
                                SpvOpTypeStruct,

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) {

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");

source/opt/types.cpp

@@ -128,7 +128,7 @@ std::unique_ptr<Type> 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<uint32_t>* words,
     DeclareKindCase(NamedBarrier);
     DeclareKindCase(AccelerationStructureNV);
     DeclareKindCase(CooperativeMatrixNV);
-    DeclareKindCase(RayQueryProvisionalKHR);
+    DeclareKindCase(RayQueryKHR);
 #undef DeclareKindCase
     default:
       assert(false && "Unhandled type");

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<sublcass>() methods,
 // which is used as a way to probe the actual <subclass>.
@@ -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

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)

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<uint32_t>());
       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;

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 <id> '" << _.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.";
       }
     }

test/operand_capabilities_test.cpp

@@ -499,7 +499,7 @@ INSTANTIATE_TEST_SUITE_P(
             CASE1(BUILT_IN, BuiltInVertexId, Shader),
             CASE1(BUILT_IN, BuiltInInstanceId, Shader),
             CASE4(BUILT_IN, BuiltInPrimitiveId, Geometry, Tessellation,
-                  RayTracingNV, RayTracingProvisionalKHR),
+                  RayTracingNV, RayTracingKHR),
             CASE2(BUILT_IN, BuiltInInvocationId, Geometry, Tessellation),
             CASE2(BUILT_IN, BuiltInLayer, Geometry, ShaderViewportIndexLayerEXT),
             CASE2(BUILT_IN, BuiltInViewportIndex, MultiViewport, ShaderViewportIndexLayerEXT),  // Bug 15234

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"
                                              )",

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."));
 }