Move to the most recent SPIRV-Headers and SPIRV-Tools.

SPIRV/GlslangToSpv.cpp

@@ -1501,7 +1501,7 @@ TGlslangToSpvTraverser::TGlslangToSpvTraverser(unsigned int spvVersion,
     }
 
     if (glslangIntermediate->getLayoutPrimitiveCulling()) {
-        builder.addCapability(spv::CapabilityRayTraversalPrimitiveCullingProvisionalKHR);
+        builder.addCapability(spv::CapabilityRayTraversalPrimitiveCullingKHR);
     }
 
     unsigned int mode;

SPIRV/SpvBuilder.cpp

@@ -621,13 +621,13 @@ Id Builder::makeAccelerationStructureType()
 Id Builder::makeRayQueryType()
 {
     Instruction *type;
-    if (groupedTypes[OpTypeRayQueryProvisionalKHR].size() == 0) {
-        type = new Instruction(getUniqueId(), NoType, OpTypeRayQueryProvisionalKHR);
-        groupedTypes[OpTypeRayQueryProvisionalKHR].push_back(type);
+    if (groupedTypes[OpTypeRayQueryKHR].size() == 0) {
+        type = new Instruction(getUniqueId(), NoType, OpTypeRayQueryKHR);
+        groupedTypes[OpTypeRayQueryKHR].push_back(type);
         constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(type));
         module.mapInstruction(type);
     } else {
-        type = groupedTypes[OpTypeRayQueryProvisionalKHR].back();
+        type = groupedTypes[OpTypeRayQueryKHR].back();
     }
 
     return type->getResultId();

SPIRV/doc.cpp

@@ -917,7 +917,7 @@ const char* CapabilityString(int info)
     case CapabilityRayTracingNV:                    return "RayTracingNV";
     case CapabilityRayTracingProvisionalKHR:        return "RayTracingProvisionalKHR";
     case CapabilityRayQueryProvisionalKHR:          return "RayQueryProvisionalKHR";
-    case CapabilityRayTraversalPrimitiveCullingProvisionalKHR: return "RayTraversalPrimitiveCullingProvisionalKHR";
+    case CapabilityRayTraversalPrimitiveCullingKHR: return "RayTraversalPrimitiveCullingKHR";
     case CapabilityComputeDerivativeGroupQuadsNV:   return "ComputeDerivativeGroupQuadsNV";
     case CapabilityComputeDerivativeGroupLinearNV:  return "ComputeDerivativeGroupLinearNV";
     case CapabilityFragmentBarycentricNV:           return "FragmentBarycentricNV";
@@ -1374,7 +1374,7 @@ const char* OpcodeString(int op)
     case OpImageSampleFootprintNV:           return "OpImageSampleFootprintNV";
     case OpWritePackedPrimitiveIndices4x8NV: return "OpWritePackedPrimitiveIndices4x8NV";
 
-    case OpTypeRayQueryProvisionalKHR:                                        return "OpTypeRayQueryProvisionalKHR";
+    case OpTypeRayQueryKHR:                                                   return "OpTypeRayQueryKHR";
     case OpRayQueryInitializeKHR:                                             return "OpRayQueryInitializeKHR";
     case OpRayQueryTerminateKHR:                                              return "OpRayQueryTerminateKHR";
     case OpRayQueryGenerateIntersectionKHR:                                   return "OpRayQueryGenerateIntersectionKHR";
@@ -2797,7 +2797,7 @@ void Parameterize()
 
     // Ray Query
     InstructionDesc[OpTypeAccelerationStructureKHR].setResultAndType(true, false);
-    InstructionDesc[OpTypeRayQueryProvisionalKHR].setResultAndType(true, false);
+    InstructionDesc[OpTypeRayQueryKHR].setResultAndType(true, false);
 
     InstructionDesc[OpRayQueryInitializeKHR].operands.push(OperandId, "'RayQuery'");
     InstructionDesc[OpRayQueryInitializeKHR].operands.push(OperandId, "'AccelerationS'");

SPIRV/spirv.hpp

@@ -50,11 +50,11 @@ namespace spv {
 typedef unsigned int Id;
 
 #define SPV_VERSION 0x10500
-#define SPV_REVISION 3
+#define SPV_REVISION 4
 
 static const unsigned int MagicNumber = 0x07230203;
 static const unsigned int Version = 0x00010500;
-static const unsigned int Revision = 3;
+static const unsigned int Revision = 4;
 static const unsigned int OpCodeMask = 0xffff;
 static const unsigned int WordCountShift = 16;
 
@@ -899,7 +899,9 @@ enum Capability {
     CapabilityRoundingModeRTE = 4467,
     CapabilityRoundingModeRTZ = 4468,
     CapabilityRayQueryProvisionalKHR = 4471,
-    CapabilityRayTraversalPrimitiveCullingProvisionalKHR = 4478,
+    CapabilityRayQueryKHR = 4472,
+    CapabilityRayTraversalPrimitiveCullingKHR = 4478,
+    CapabilityRayTracingKHR = 4479,
     CapabilityFloat16ImageAMD = 5008,
     CapabilityImageGatherBiasLodAMD = 5009,
     CapabilityFragmentMaskAMD = 5010,
@@ -1398,7 +1400,12 @@ enum Op {
     OpSubgroupAnyKHR = 4429,
     OpSubgroupAllEqualKHR = 4430,
     OpSubgroupReadInvocationKHR = 4432,
-    OpTypeRayQueryProvisionalKHR = 4472,
+    OpTraceRayKHR = 4445,
+    OpExecuteCallableKHR = 4446,
+    OpConvertUToAccelerationStructureKHR = 4447,
+    OpIgnoreIntersectionKHR = 4448,
+    OpTerminateRayKHR = 4449,
+    OpTypeRayQueryKHR = 4472,
     OpRayQueryInitializeKHR = 4473,
     OpRayQueryTerminateKHR = 4474,
     OpRayQueryGenerateIntersectionKHR = 4475,
@@ -1421,15 +1428,11 @@ enum Op {
     OpWritePackedPrimitiveIndices4x8NV = 5299,
     OpReportIntersectionKHR = 5334,
     OpReportIntersectionNV = 5334,
-    OpIgnoreIntersectionKHR = 5335,
     OpIgnoreIntersectionNV = 5335,
-    OpTerminateRayKHR = 5336,
     OpTerminateRayNV = 5336,
     OpTraceNV = 5337,
-    OpTraceRayKHR = 5337,
     OpTypeAccelerationStructureKHR = 5341,
     OpTypeAccelerationStructureNV = 5341,
-    OpExecuteCallableKHR = 5344,
     OpExecuteCallableNV = 5344,
     OpTypeCooperativeMatrixNV = 5358,
     OpCooperativeMatrixLoadNV = 5359,
@@ -1849,7 +1852,6 @@ inline void HasResultAndType(Op opcode, bool *hasResult, bool *hasResultType) {
     case OpBranchConditional: *hasResult = false; *hasResultType = false; break;
     case OpSwitch: *hasResult = false; *hasResultType = false; break;
     case OpKill: *hasResult = false; *hasResultType = false; break;
-    case OpTerminateInvocation: *hasResult = false; *hasResultType = false; break;
     case OpReturn: *hasResult = false; *hasResultType = false; break;
     case OpReturnValue: *hasResult = false; *hasResultType = false; break;
     case OpUnreachable: *hasResult = false; *hasResultType = false; break;
@@ -1970,7 +1972,12 @@ inline void HasResultAndType(Op opcode, bool *hasResult, bool *hasResultType) {
     case OpSubgroupAnyKHR: *hasResult = true; *hasResultType = true; break;
     case OpSubgroupAllEqualKHR: *hasResult = true; *hasResultType = true; break;
     case OpSubgroupReadInvocationKHR: *hasResult = true; *hasResultType = true; break;
-    case OpTypeRayQueryProvisionalKHR: *hasResult = true; *hasResultType = false; break;
+    case OpTraceRayKHR: *hasResult = false; *hasResultType = false; break;
+    case OpExecuteCallableKHR: *hasResult = false; *hasResultType = false; break;
+    case OpConvertUToAccelerationStructureKHR: *hasResult = true; *hasResultType = true; break;
+    case OpIgnoreIntersectionKHR: *hasResult = false; *hasResultType = false; break;
+    case OpTerminateRayKHR: *hasResult = false; *hasResultType = false; break;
+    case OpTypeRayQueryKHR: *hasResult = true; *hasResultType = false; break;
     case OpRayQueryInitializeKHR: *hasResult = false; *hasResultType = false; break;
     case OpRayQueryTerminateKHR: *hasResult = false; *hasResultType = false; break;
     case OpRayQueryGenerateIntersectionKHR: *hasResult = false; *hasResultType = false; break;

Test/baseResults/rayQuery-allOps.comp.out

@@ -5,7 +5,7 @@ rayQuery-allOps.comp
 
                               Capability Shader
                               Capability RayQueryProvisionalKHR
-                              Capability RayTraversalPrimitiveCullingProvisionalKHR
+                              Capability RayTraversalPrimitiveCullingKHR
                               Extension  "SPV_KHR_ray_query"
                1:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
@@ -86,7 +86,7 @@ rayQuery-allOps.comp
               35:             TypePointer Function 8(float)
               37:     18(int) Constant 3
               38:    8(float) Constant 1176255488
-              45:             TypeRayQueryProvisionalKHR
+              45:             TypeRayQueryKHR
               46:             TypePointer Function 45
               48:             TypeAccelerationStructureKHR
               49:             TypePointer UniformConstant 48

Test/baseResults/rayQuery-allOps.frag.out

 rayQuery-allOps.frag
+Validation failed
 // Module Version 10000
 // Generated by (magic number): 8000a
 // Id's are bound by 257
@@ -85,7 +86,7 @@ rayQuery-allOps.frag
               35:             TypePointer Function 8(float)
               37:     18(int) Constant 3
               38:    8(float) Constant 1176255488
-              45:             TypeRayQueryProvisionalKHR
+              45:             TypeRayQueryKHR
               46:             TypePointer Function 45
               48:             TypeAccelerationStructureKHR
               49:             TypePointer UniformConstant 48

Test/baseResults/rayQuery-allOps.rgen.out

 rayQuery-allOps.rgen
+Validation failed
 // Module Version 10000
 // Generated by (magic number): 8000a
 // Id's are bound by 257
@@ -85,7 +86,7 @@ rayQuery-allOps.rgen
               35:             TypePointer Function 8(float)
               37:     18(int) Constant 3
               38:    8(float) Constant 1176255488
-              45:             TypeRayQueryProvisionalKHR
+              45:             TypeRayQueryKHR
               46:             TypePointer Function 45
               48:             TypeAccelerationStructureKHR
               49:             TypePointer UniformConstant 48

Test/baseResults/rayQuery-initialize.rgen.out

 rayQuery-initialize.rgen
+Validation failed
 // Module Version 10000
 // Generated by (magic number): 8000a
 // Id's are bound by 103
@@ -55,7 +56,7 @@ rayQuery-initialize.rgen
                3:             TypeFunction 2
                6:             TypeInt 32 0
                7:             TypeFunction 6(int)
-              10:             TypeRayQueryProvisionalKHR
+              10:             TypeRayQueryKHR
               11:             TypePointer Function 10
               12:             TypeFloat 32
               13:             TypeVector 12(float) 3

Test/baseResults/rayQuery-no-cse.rgen.out

 rayQuery-no-cse.rgen
+Validation failed
 // Module Version 10000
 // Generated by (magic number): 8000a
 // Id's are bound by 107
@@ -57,7 +58,7 @@ rayQuery-no-cse.rgen
                3:             TypeFunction 2
                6:             TypeInt 32 0
                7:             TypeFunction 6(int)
-              10:             TypeRayQueryProvisionalKHR
+              10:             TypeRayQueryKHR
               11:             TypePointer Function 10
               12:             TypeFloat 32
               13:             TypeVector 12(float) 3

Test/baseResults/rayQuery.rgen.out

 rayQuery.rgen
+Validation failed
 // Module Version 10000
 // Generated by (magic number): 8000a
 // Id's are bound by 44
@@ -39,7 +40,7 @@ rayQuery.rgen
               11:             TypePointer Function 10(float)
               13:   10(float) Constant 0
               15:   10(float) Constant 1148846080
-              16:             TypeRayQueryProvisionalKHR
+              16:             TypeRayQueryKHR
               17:             TypePointer Function 16
               19:             TypeAccelerationStructureKHR
               20:             TypePointer UniformConstant 19

Test/baseResults/spv.AnyHitShader.rahit.out

 spv.AnyHitShader.rahit
+Validation failed
 // Module Version 10000
 // Generated by (magic number): 8000a
 // Id's are bound by 81

Test/baseResults/spv.ClosestHitShader.rchit.out

 spv.ClosestHitShader.rchit
+Validation failed
 // Module Version 10000
 // Generated by (magic number): 8000a
 // Id's are bound by 88

Test/baseResults/spv.MissShader.rmiss.out

 spv.MissShader.rmiss
+Validation failed
 // Module Version 10000
 // Generated by (magic number): 8000a
 // Id's are bound by 60

Test/baseResults/spv.RayCallable.rcall.out

 spv.RayCallable.rcall
+Validation failed
 // Module Version 10000
 // Generated by (magic number): 8000a
 // Id's are bound by 30

Test/baseResults/spv.RayConstants.rgen.out

 spv.RayConstants.rgen
+Validation failed
 // Module Version 10000
 // Generated by (magic number): 8000a
 // Id's are bound by 27

Test/baseResults/spv.RayGenShader.rgen.out

 spv.RayGenShader.rgen
+Validation failed
 // Module Version 10000
 // Generated by (magic number): 8000a
 // Id's are bound by 54

Test/baseResults/spv.RayGenShader11.rgen.out

 spv.RayGenShader11.rgen
+Validation failed
 // Module Version 10300
 // Generated by (magic number): 8000a
 // Id's are bound by 53

Test/baseResults/spv.RayGenShaderArray.rgen.out

 spv.RayGenShaderArray.rgen
+Validation failed
 // Module Version 10000
 // Generated by (magic number): 8000a
 // Id's are bound by 89

Test/baseResults/spv.ext.AnyHitShader.rahit.out

 spv.ext.AnyHitShader.rahit
+Validation failed
 // Module Version 10400
 // Generated by (magic number): 8000a
 // Id's are bound by 94

Test/baseResults/spv.ext.ClosestHitShader.rchit.out

 spv.ext.ClosestHitShader.rchit
+Validation failed
 // Module Version 10400
 // Generated by (magic number): 8000a
 // Id's are bound by 101

Test/baseResults/spv.ext.IntersectShader.rint.out

 spv.ext.IntersectShader.rint
+Validation failed
 // Module Version 10400
 // Generated by (magic number): 8000a
 // Id's are bound by 81

Test/baseResults/spv.ext.MissShader.rmiss.out

 spv.ext.MissShader.rmiss
+Validation failed
 // Module Version 10400
 // Generated by (magic number): 8000a
 // Id's are bound by 54

Test/baseResults/spv.ext.RayCallable.rcall.out

 spv.ext.RayCallable.rcall
+Validation failed
 // Module Version 10400
 // Generated by (magic number): 8000a
 // Id's are bound by 30

Test/baseResults/spv.ext.RayConstants.rgen.out

 spv.ext.RayConstants.rgen
+Validation failed
 // Module Version 10400
 // Generated by (magic number): 8000a
 // Id's are bound by 27

Test/baseResults/spv.ext.RayGenShader.rgen.out

@@ -3,7 +3,7 @@ spv.ext.RayGenShader.rgen
 // Generated by (magic number): 8000a
 // Id's are bound by 58
 
-                              Capability RayTraversalPrimitiveCullingProvisionalKHR
+                              Capability RayTraversalPrimitiveCullingKHR
                               Capability RayTracingProvisionalKHR
                               Extension  "SPV_KHR_ray_tracing"
                1:             ExtInstImport  "GLSL.std.450"

Test/baseResults/spv.ext.RayGenShader11.rgen.out

 spv.ext.RayGenShader11.rgen
+Validation failed
 // Module Version 10400
 // Generated by (magic number): 8000a
 // Id's are bound by 53

Test/baseResults/spv.ext.RayGenShaderArray.rgen.out

 spv.ext.RayGenShaderArray.rgen
+Validation failed
 // Module Version 10400
 // Generated by (magic number): 8000a
 // Id's are bound by 89

Test/baseResults/spv.ext.World3x4.rahit.out

 spv.ext.World3x4.rahit
+Validation failed
 // Module Version 10400
 // Generated by (magic number): 8000a
 // Id's are bound by 90

Test/baseResults/spv.meshShaderPerViewBuiltins.mesh.out

 spv.meshShaderPerViewBuiltins.mesh
-Validation failed
 // Module Version 10000
 // Generated by (magic number): 8000a
 // Id's are bound by 126

known_good.json

@@ -5,14 +5,14 @@
       "site" : "github",
       "subrepo" : "KhronosGroup/SPIRV-Tools",
       "subdir" : "External/spirv-tools",
-      "commit" : "56d0f50357a192602216bfc4873e714905323e35"
+      "commit" : "cd590fa3341284cd6d1ee82366155786cfd44c96"
     },
     {
       "name" : "spirv-tools/external/spirv-headers",
       "site" : "github",
       "subrepo" : "KhronosGroup/SPIRV-Headers",
       "subdir" : "External/spirv-tools/external/spirv-headers",
-      "commit" : "05836bdba63e7debce9fa9feaed42f20cd43af9d"
+      "commit" : "104ecc356c1bea4476320faca64440cd1df655a3"
     }
   ]
 }