spirv-headers issues
https://git.rockylinux.org/archives/patch/spirv-headers/-/issues
2021-05-28T04:47:19Z
https://git.rockylinux.org/archives/patch/spirv-headers/-/issues/1
SPIRV-Tools won't build ostensibly due to mismatched Headers
2021-05-28T04:47:19Z
Neil Hanlon
SPIRV-Tools won't build ostensibly due to mismatched Headers
```
Only in SPIRV-Headers-f027d53ded7e230e008d37c8b47ede7cd308e19d: .git
diff -ru SPIRV-Headers-3fdabd0da2932c276b25b9b4a988ba134eba1aa6/include/spirv/spir-v.xml SPIRV-Headers-f027d53ded7e230e008d37c8b47ede7cd308e19d/include/spirv/spir-v...
```
Only in SPIRV-Headers-f027d53ded7e230e008d37c8b47ede7cd308e19d: .git
diff -ru SPIRV-Headers-3fdabd0da2932c276b25b9b4a988ba134eba1aa6/include/spirv/spir-v.xml SPIRV-Headers-f027d53ded7e230e008d37c8b47ede7cd308e19d/include/spirv/spir-v.xml
--- SPIRV-Headers-3fdabd0da2932c276b25b9b4a988ba134eba1aa6/include/spirv/spir-v.xml 2020-08-03 05:04:37.000000000 -0400
+++ SPIRV-Headers-f027d53ded7e230e008d37c8b47ede7cd308e19d/include/spirv/spir-v.xml 2021-05-28 00:24:56.846553456 -0400
@@ -74,7 +74,11 @@
<id value="21" vendor="Google" tool="Clspv" comment="Contact David Neto, dneto@google.com"/>
<id value="22" vendor="Google" tool="MLIR SPIR-V Serializer" comment="Contact Lei Zhang, antiagainst@google.com"/>
<id value="23" vendor="Google" tool="Tint Compiler" comment="Contact David Neto, dneto@google.com"/>
- <unused start="24" end="0xFFFF" comment="Tool ID range reservable for future use by vendors"/>
+ <id value="24" vendor="Google" tool="ANGLE Shader Compiler" comment="Contact Shahbaz Youssefi, syoussefi@google.com"/>
+ <id value="25" vendor="Netease Games" tool="Messiah Shader Compiler" comment="Contact Yuwen Wu, atyuwen@gmail.com"/>
+ <id value="26" vendor="Xenia" tool="Xenia Emulator Microcode Translator" comment="Contact Vitaliy Kuzmin, triang3l@yandex.ru, https://github.com/xenia-project/xenia"/>
+ <id value="27" vendor="Embark Studios" tool="Rust GPU Compiler Backend" comment="https://github.com/embarkstudios/rust-gpu"/>
+ <unused start="28" end="0xFFFF" comment="Tool ID range reservable for future use by vendors"/>
</ids>
<!-- SECTION: SPIR-V Opcodes and Enumerants -->
@@ -176,8 +180,8 @@
<!-- Reserved loop control bits -->
<ids type="LoopControl" start="0" end="15" vendor="Khronos" comment="Reserved LoopControl bits, not available to vendors - see the SPIR-V Specification"/>
- <ids type="LoopControl" start="16" end="22" vendor="Intel" comment="Contact michael.kinsner@intel.com"/>
- <ids type="LoopControl" start="23" end="30" comment="Unreserved bits reservable for use by vendors"/>
+ <ids type="LoopControl" start="16" end="23" vendor="Intel" comment="Contact michael.kinsner@intel.com"/>
+ <ids type="LoopControl" start="24" end="30" comment="Unreserved bits reservable for use by vendors"/>
<ids type="LoopControl" start="31" end="31" vendor="Khronos" comment="Reserved LoopControl bit, not available to vendors"/>
diff -ru SPIRV-Headers-3fdabd0da2932c276b25b9b4a988ba134eba1aa6/include/spirv/unified1/spirv.core.grammar.json SPIRV-Headers-f027d53ded7e230e008d37c8b47ede7cd308e19d/include/spirv/unified1/spirv.core.grammar.json
--- SPIRV-Headers-3fdabd0da2932c276b25b9b4a988ba134eba1aa6/include/spirv/unified1/spirv.core.grammar.json 2020-08-03 05:04:37.000000000 -0400
+++ SPIRV-Headers-f027d53ded7e230e008d37c8b47ede7cd308e19d/include/spirv/unified1/spirv.core.grammar.json 2021-05-28 00:24:56.849553447 -0400
@@ -27,7 +27,7 @@
"magic_number" : "0x07230203",
"major_version" : 1,
"minor_version" : 5,
- "revision" : 3,
+ "revision" : 4,
"instruction_printing_class" : [
{
"tag" : "@exclude"
@@ -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,97 @@
{
"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"
+ }
+ ]
+ },
+ {
+ "category" : "BitEnum",
+ "kind" : "FragmentShadingRate",
+ "enumerants" : [
+ {
+ "enumerant" : "Vertical2Pixels",
+ "value" : "0x0001",
+ "capabilities" : [ "FragmentShadingRateKHR" ],
+ "version" : "None"
+ },
+ {
+ "enumerant" : "Vertical4Pixels",
+ "value" : "0x0002",
+ "capabilities" : [ "FragmentShadingRateKHR" ],
+ "version" : "None"
+ },
+ {
+ "enumerant" : "Horizontal2Pixels",
+ "value" : "0x0004",
+ "capabilities" : [ "FragmentShadingRateKHR" ],
+ "version" : "None"
+ },
+ {
+ "enumerant" : "Horizontal4Pixels",
+ "value" : "0x0008",
+ "capabilities" : [ "FragmentShadingRateKHR" ],
"version" : "None"
}
]
@@ -7803,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"
}
]
@@ -8434,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"
},
{
@@ -8826,6 +8869,16 @@
"enumerant" : "R8ui",
"value" : 39,
"capabilities" : [ "StorageImageExtendedFormats" ]
+ },
+ {
+ "enumerant" : "R64ui",
+ "value" : 40,
+ "capabilities" : [ "Int64ImageEXT" ]
+ },
+ {
+ "enumerant" : "R64i",
+ "value" : 41,
+ "capabilities" : [ "Int64ImageEXT" ]
}
]
},
@@ -9752,7 +9805,7 @@
{
"enumerant" : "PrimitiveId",
"value" : 7,
- "capabilities" : [ "Geometry", "Tessellation", "RayTracingNV", "RayTracingProvisionalKHR" ]
+ "capabilities" : [ "Geometry", "Tessellation", "RayTracingNV", "RayTracingKHR", "MeshShadingNV" ]
},
{
"enumerant" : "InvocationId",
@@ -9762,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",
@@ -10005,6 +10058,13 @@
"version" : "1.3"
},
{
+ "enumerant" : "PrimitiveShadingRateKHR",
+ "value" : 4432,
+ "capabilities" : [ "FragmentShadingRateKHR" ],
+ "extensions" : [ "SPV_KHR_fragment_shading_rate" ],
+ "version" : "None"
+ },
+ {
"enumerant" : "DeviceIndex",
"value" : 4438,
"capabilities" : [ "DeviceGroup" ],
@@ -10019,6 +10079,13 @@
"version" : "1.3"
},
{
+ "enumerant" : "ShadingRateKHR",
+ "value" : 4444,
+ "capabilities" : [ "FragmentShadingRateKHR" ],
+ "extensions" : [ "SPV_KHR_fragment_shading_rate" ],
+ "version" : "None"
+ },
+ {
"enumerant" : "BaryCoordNoPerspAMD",
"value" : 4992,
"extensions" : [ "SPV_AMD_shader_explicit_vertex_parameter" ],
@@ -10210,203 +10277,196 @@
{
"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" ],
- "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ],
- "version" : "None"
- },
- {
- "enumerant" : "HitTKHR",
- "value" : 5332,
- "capabilities" : [ "RayTracingNV" , "RayTracingProvisionalKHR" ],
- "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ],
+ "capabilities" : [ "RayTracingNV" ],
+ "extensions" : [ "SPV_NV_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"
},
@@ -10479,7 +10539,7 @@
{
"enumerant" : "ShaderCallKHR",
"value" : 6,
- "capabilities" : [ "RayTracingProvisionalKHR" ],
+ "capabilities" : [ "RayTracingKHR" ],
"version" : "None"
}
]
@@ -10902,6 +10962,13 @@
"version" : "1.5"
},
{
+ "enumerant" : "FragmentShadingRateKHR",
+ "value" : 4422,
+ "capabilities" : [ "Shader" ],
+ "extensions" : [ "SPV_KHR_fragment_shading_rate" ],
+ "version" : "None"
+ },
+ {
"enumerant" : "SubgroupBallotKHR",
"value" : 4423,
"extensions" : [ "SPV_KHR_shader_ballot" ],
@@ -11060,13 +11127,27 @@
"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,
"capabilities" : [ "Shader" ],
@@ -11102,6 +11183,13 @@
"version" : "None"
},
{
+ "enumerant" : "Int64ImageEXT",
+ "value" : 5016,
+ "capabilities" : [ "Shader" ],
+ "extensions" : [ "SPV_EXT_shader_image_int64" ],
+ "version" : "None"
+ },
+ {
"enumerant" : "ShaderClockKHR",
"value" : 5055,
"capabilities" : [ "Shader" ],
@@ -11589,13 +11677,13 @@
{
"enumerant" : "RayQueryCandidateIntersectionKHR",
"value" : 0,
- "capabilities" : [ "RayQueryProvisionalKHR" ],
+ "capabilities" : [ "RayQueryKHR" ],
"version" : "None"
},
{
"enumerant" : "RayQueryCommittedIntersectionKHR",
"value" : 1,
- "capabilities" : [ "RayQueryProvisionalKHR" ],
+ "capabilities" : [ "RayQueryKHR" ],
"version" : "None"
}
]
@@ -11607,19 +11695,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"
}
]
@@ -11631,13 +11719,13 @@
{
"enumerant" : "RayQueryCandidateIntersectionTriangleKHR",
"value" : 0,
- "capabilities" : [ "RayQueryProvisionalKHR" ],
+ "capabilities" : [ "RayQueryKHR" ],
"version" : "None"
},
{
"enumerant" : "RayQueryCandidateIntersectionAABBKHR",
"value" : 1,
- "capabilities" : [ "RayQueryProvisionalKHR" ],
+ "capabilities" : [ "RayQueryKHR" ],
"version" : "None"
}
]
diff -ru SPIRV-Headers-3fdabd0da2932c276b25b9b4a988ba134eba1aa6/include/spirv/unified1/spirv.cs SPIRV-Headers-f027d53ded7e230e008d37c8b47ede7cd308e19d/include/spirv/unified1/spirv.cs
--- SPIRV-Headers-3fdabd0da2932c276b25b9b4a988ba134eba1aa6/include/spirv/unified1/spirv.cs 2020-08-03 05:04:37.000000000 -0400
+++ SPIRV-Headers-f027d53ded7e230e008d37c8b47ede7cd308e19d/include/spirv/unified1/spirv.cs 2021-05-28 00:24:56.850553445 -0400
@@ -49,7 +49,7 @@
{
public const uint MagicNumber = 0x07230203;
public const uint Version = 0x00010500;
- public const uint Revision = 3;
+ public const uint Revision = 4;
public const uint OpCodeMask = 0xffff;
public const uint WordCountShift = 16;
@@ -270,6 +270,8 @@
Rg8ui = 37,
R16ui = 38,
R8ui = 39,
+ R64ui = 40,
+ R64i = 41,
}
public enum ImageChannelOrder
@@ -556,8 +558,10 @@
BaseVertex = 4424,
BaseInstance = 4425,
DrawIndex = 4426,
+ PrimitiveShadingRateKHR = 4432,
DeviceIndex = 4438,
ViewIndex = 4440,
+ ShadingRateKHR = 4444,
BaryCoordNoPerspAMD = 4992,
BaryCoordNoPerspCentroidAMD = 4993,
BaryCoordNoPerspSampleAMD = 4994,
@@ -608,7 +612,6 @@
ObjectToWorldNV = 5330,
WorldToObjectKHR = 5331,
WorldToObjectNV = 5331,
- HitTKHR = 5332,
HitTNV = 5332,
HitKindKHR = 5333,
HitKindNV = 5333,
@@ -874,6 +877,7 @@
GroupNonUniformQuad = 68,
ShaderLayer = 69,
ShaderViewportIndex = 70,
+ FragmentShadingRateKHR = 4422,
SubgroupBallotKHR = 4423,
DrawParameters = 4427,
SubgroupVoteKHR = 4431,
@@ -898,12 +902,15 @@
RoundingModeRTE = 4467,
RoundingModeRTZ = 4468,
RayQueryProvisionalKHR = 4471,
- RayTraversalPrimitiveCullingProvisionalKHR = 4478,
+ RayQueryKHR = 4472,
+ RayTraversalPrimitiveCullingKHR = 4478,
+ RayTracingKHR = 4479,
Float16ImageAMD = 5008,
ImageGatherBiasLodAMD = 5009,
FragmentMaskAMD = 5010,
StencilExportEXT = 5013,
ImageReadWriteLodAMD = 5015,
+ Int64ImageEXT = 5016,
ShaderClockKHR = 5055,
SampleMaskOverrideCoverageNV = 5249,
GeometryShaderPassthroughNV = 5251,
@@ -1028,6 +1035,23 @@
RayQueryCandidateIntersectionAABBKHR = 1,
}
+ public enum FragmentShadingRateShift
+ {
+ Vertical2Pixels = 0,
+ Vertical4Pixels = 1,
+ Horizontal2Pixels = 2,
+ Horizontal4Pixels = 3,
+ }
+
+ public enum FragmentShadingRateMask
+ {
+ MaskNone = 0,
+ Vertical2Pixels = 0x00000001,
+ Vertical4Pixels = 0x00000002,
+ Horizontal2Pixels = 0x00000004,
+ Horizontal4Pixels = 0x00000008,
+ }
+
public enum Op
{
OpNop = 0,
@@ -1381,7 +1405,12 @@
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,
@@ -1404,15 +1433,11 @@
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,
diff -ru SPIRV-Headers-3fdabd0da2932c276b25b9b4a988ba134eba1aa6/include/spirv/unified1/spirv.h SPIRV-Headers-f027d53ded7e230e008d37c8b47ede7cd308e19d/include/spirv/unified1/spirv.h
--- SPIRV-Headers-3fdabd0da2932c276b25b9b4a988ba134eba1aa6/include/spirv/unified1/spirv.h 2020-08-03 05:04:37.000000000 -0400
+++ SPIRV-Headers-f027d53ded7e230e008d37c8b47ede7cd308e19d/include/spirv/unified1/spirv.h 2021-05-28 00:24:56.851553442 -0400
@@ -54,11 +54,11 @@
typedef unsigned int SpvId;
#define SPV_VERSION 0x10500
-#define SPV_REVISION 3
+#define SPV_REVISION 4
static const unsigned int SpvMagicNumber = 0x07230203;
static const unsigned int SpvVersion = 0x00010500;
-static const unsigned int SpvRevision = 3;
+static const unsigned int SpvRevision = 4;
static const unsigned int SpvOpCodeMask = 0xffff;
static const unsigned int SpvWordCountShift = 16;
@@ -278,6 +278,8 @@
SpvImageFormatRg8ui = 37,
SpvImageFormatR16ui = 38,
SpvImageFormatR8ui = 39,
+ SpvImageFormatR64ui = 40,
+ SpvImageFormatR64i = 41,
SpvImageFormatMax = 0x7fffffff,
} SpvImageFormat;
@@ -562,8 +564,10 @@
SpvBuiltInBaseVertex = 4424,
SpvBuiltInBaseInstance = 4425,
SpvBuiltInDrawIndex = 4426,
+ SpvBuiltInPrimitiveShadingRateKHR = 4432,
SpvBuiltInDeviceIndex = 4438,
SpvBuiltInViewIndex = 4440,
+ SpvBuiltInShadingRateKHR = 4444,
SpvBuiltInBaryCoordNoPerspAMD = 4992,
SpvBuiltInBaryCoordNoPerspCentroidAMD = 4993,
SpvBuiltInBaryCoordNoPerspSampleAMD = 4994,
@@ -614,7 +618,6 @@
SpvBuiltInObjectToWorldNV = 5330,
SpvBuiltInWorldToObjectKHR = 5331,
SpvBuiltInWorldToObjectNV = 5331,
- SpvBuiltInHitTKHR = 5332,
SpvBuiltInHitTNV = 5332,
SpvBuiltInHitKindKHR = 5333,
SpvBuiltInHitKindNV = 5333,
@@ -874,6 +877,7 @@
SpvCapabilityGroupNonUniformQuad = 68,
SpvCapabilityShaderLayer = 69,
SpvCapabilityShaderViewportIndex = 70,
+ SpvCapabilityFragmentShadingRateKHR = 4422,
SpvCapabilitySubgroupBallotKHR = 4423,
SpvCapabilityDrawParameters = 4427,
SpvCapabilitySubgroupVoteKHR = 4431,
@@ -898,12 +902,15 @@
SpvCapabilityRoundingModeRTE = 4467,
SpvCapabilityRoundingModeRTZ = 4468,
SpvCapabilityRayQueryProvisionalKHR = 4471,
- SpvCapabilityRayTraversalPrimitiveCullingProvisionalKHR = 4478,
+ SpvCapabilityRayQueryKHR = 4472,
+ SpvCapabilityRayTraversalPrimitiveCullingKHR = 4478,
+ SpvCapabilityRayTracingKHR = 4479,
SpvCapabilityFloat16ImageAMD = 5008,
SpvCapabilityImageGatherBiasLodAMD = 5009,
SpvCapabilityFragmentMaskAMD = 5010,
SpvCapabilityStencilExportEXT = 5013,
SpvCapabilityImageReadWriteLodAMD = 5015,
+ SpvCapabilityInt64ImageEXT = 5016,
SpvCapabilityShaderClockKHR = 5055,
SpvCapabilitySampleMaskOverrideCoverageNV = 5249,
SpvCapabilityGeometryShaderPassthroughNV = 5251,
@@ -1028,6 +1035,22 @@
SpvRayQueryCandidateIntersectionTypeMax = 0x7fffffff,
} SpvRayQueryCandidateIntersectionType;
+typedef enum SpvFragmentShadingRateShift_ {
+ SpvFragmentShadingRateVertical2PixelsShift = 0,
+ SpvFragmentShadingRateVertical4PixelsShift = 1,
+ SpvFragmentShadingRateHorizontal2PixelsShift = 2,
+ SpvFragmentShadingRateHorizontal4PixelsShift = 3,
+ SpvFragmentShadingRateMax = 0x7fffffff,
+} SpvFragmentShadingRateShift;
+
+typedef enum SpvFragmentShadingRateMask_ {
+ SpvFragmentShadingRateMaskNone = 0,
+ SpvFragmentShadingRateVertical2PixelsMask = 0x00000001,
+ SpvFragmentShadingRateVertical4PixelsMask = 0x00000002,
+ SpvFragmentShadingRateHorizontal2PixelsMask = 0x00000004,
+ SpvFragmentShadingRateHorizontal4PixelsMask = 0x00000008,
+} SpvFragmentShadingRateMask;
+
typedef enum SpvOp_ {
SpvOpNop = 0,
SpvOpUndef = 1,
@@ -1380,7 +1403,12 @@
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,
@@ -1403,15 +1431,11 @@
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,
@@ -1944,14 +1968,19 @@
case SpvOpPtrEqual: *hasResult = true; *hasResultType = true; break;
case SpvOpPtrNotEqual: *hasResult = true; *hasResultType = true; break;
case SpvOpPtrDiff: *hasResult = true; *hasResultType = true; break;
+ case SpvOpTerminateInvocation: *hasResult = false; *hasResultType = false; break;
case SpvOpSubgroupBallotKHR: *hasResult = true; *hasResultType = true; break;
case SpvOpSubgroupFirstInvocationKHR: *hasResult = true; *hasResultType = true; break;
- case SpvOpTerminateInvocation: *hasResult = false; *hasResultType = false; break;
case SpvOpSubgroupAllKHR: *hasResult = true; *hasResultType = true; break;
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 -ru SPIRV-Headers-3fdabd0da2932c276b25b9b4a988ba134eba1aa6/include/spirv/unified1/spirv.hpp SPIRV-Headers-f027d53ded7e230e008d37c8b47ede7cd308e19d/include/spirv/unified1/spirv.hpp
--- SPIRV-Headers-3fdabd0da2932c276b25b9b4a988ba134eba1aa6/include/spirv/unified1/spirv.hpp 2020-08-03 05:04:37.000000000 -0400
+++ SPIRV-Headers-f027d53ded7e230e008d37c8b47ede7cd308e19d/include/spirv/unified1/spirv.hpp 2021-05-28 00:24:56.852553439 -0400
@@ -50,11 +50,11 @@
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;
@@ -274,6 +274,8 @@
ImageFormatRg8ui = 37,
ImageFormatR16ui = 38,
ImageFormatR8ui = 39,
+ ImageFormatR64ui = 40,
+ ImageFormatR64i = 41,
ImageFormatMax = 0x7fffffff,
};
@@ -558,8 +560,10 @@
BuiltInBaseVertex = 4424,
BuiltInBaseInstance = 4425,
BuiltInDrawIndex = 4426,
+ BuiltInPrimitiveShadingRateKHR = 4432,
BuiltInDeviceIndex = 4438,
BuiltInViewIndex = 4440,
+ BuiltInShadingRateKHR = 4444,
BuiltInBaryCoordNoPerspAMD = 4992,
BuiltInBaryCoordNoPerspCentroidAMD = 4993,
BuiltInBaryCoordNoPerspSampleAMD = 4994,
@@ -610,7 +614,6 @@
BuiltInObjectToWorldNV = 5330,
BuiltInWorldToObjectKHR = 5331,
BuiltInWorldToObjectNV = 5331,
- BuiltInHitTKHR = 5332,
BuiltInHitTNV = 5332,
BuiltInHitKindKHR = 5333,
BuiltInHitKindNV = 5333,
@@ -870,6 +873,7 @@
CapabilityGroupNonUniformQuad = 68,
CapabilityShaderLayer = 69,
CapabilityShaderViewportIndex = 70,
+ CapabilityFragmentShadingRateKHR = 4422,
CapabilitySubgroupBallotKHR = 4423,
CapabilityDrawParameters = 4427,
CapabilitySubgroupVoteKHR = 4431,
@@ -894,12 +898,15 @@
CapabilityRoundingModeRTE = 4467,
CapabilityRoundingModeRTZ = 4468,
CapabilityRayQueryProvisionalKHR = 4471,
- CapabilityRayTraversalPrimitiveCullingProvisionalKHR = 4478,
+ CapabilityRayQueryKHR = 4472,
+ CapabilityRayTraversalPrimitiveCullingKHR = 4478,
+ CapabilityRayTracingKHR = 4479,
CapabilityFloat16ImageAMD = 5008,
CapabilityImageGatherBiasLodAMD = 5009,
CapabilityFragmentMaskAMD = 5010,
CapabilityStencilExportEXT = 5013,
CapabilityImageReadWriteLodAMD = 5015,
+ CapabilityInt64ImageEXT = 5016,
CapabilityShaderClockKHR = 5055,
CapabilitySampleMaskOverrideCoverageNV = 5249,
CapabilityGeometryShaderPassthroughNV = 5251,
@@ -1024,6 +1031,22 @@
RayQueryCandidateIntersectionTypeMax = 0x7fffffff,
};
+enum FragmentShadingRateShift {
+ FragmentShadingRateVertical2PixelsShift = 0,
+ FragmentShadingRateVertical4PixelsShift = 1,
+ FragmentShadingRateHorizontal2PixelsShift = 2,
+ FragmentShadingRateHorizontal4PixelsShift = 3,
+ FragmentShadingRateMax = 0x7fffffff,
+};
+
+enum FragmentShadingRateMask {
+ FragmentShadingRateMaskNone = 0,
+ FragmentShadingRateVertical2PixelsMask = 0x00000001,
+ FragmentShadingRateVertical4PixelsMask = 0x00000002,
+ FragmentShadingRateHorizontal2PixelsMask = 0x00000004,
+ FragmentShadingRateHorizontal4PixelsMask = 0x00000008,
+};
+
enum Op {
OpNop = 0,
OpUndef = 1,
@@ -1376,7 +1399,12 @@
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,
@@ -1399,15 +1427,11 @@
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,
@@ -1940,14 +1964,19 @@
case OpPtrEqual: *hasResult = true; *hasResultType = true; break;
case OpPtrNotEqual: *hasResult = true; *hasResultType = true; break;
case OpPtrDiff: *hasResult = true; *hasResultType = true; break;
+ case OpTerminateInvocation: *hasResult = false; *hasResultType = false; break;
case OpSubgroupBallotKHR: *hasResult = true; *hasResultType = true; break;
case OpSubgroupFirstInvocationKHR: *hasResult = true; *hasResultType = true; break;
- case OpTerminateInvocation: *hasResult = false; *hasResultType = false; break;
case OpSubgroupAllKHR: *hasResult = true; *hasResultType = true; break;
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;
@@ -2166,6 +2195,7 @@
inline MemoryAccessMask operator|(MemoryAccessMask a, MemoryAccessMask b) { return MemoryAccessMask(unsigned(a) | unsigned(b)); }
inline KernelProfilingInfoMask operator|(KernelProfilingInfoMask a, KernelProfilingInfoMask b) { return KernelProfilingInfoMask(unsigned(a) | unsigned(b)); }
inline RayFlagsMask operator|(RayFlagsMask a, RayFlagsMask b) { return RayFlagsMask(unsigned(a) | unsigned(b)); }
+inline FragmentShadingRateMask operator|(FragmentShadingRateMask a, FragmentShadingRateMask b) { return FragmentShadingRateMask(unsigned(a) | unsigned(b)); }
} // end namespace spv
diff -ru SPIRV-Headers-3fdabd0da2932c276b25b9b4a988ba134eba1aa6/include/spirv/unified1/spirv.hpp11 SPIRV-Headers-f027d53ded7e230e008d37c8b47ede7cd308e19d/include/spirv/unified1/spirv.hpp11
--- SPIRV-Headers-3fdabd0da2932c276b25b9b4a988ba134eba1aa6/include/spirv/unified1/spirv.hpp11 2020-08-03 05:04:37.000000000 -0400
+++ SPIRV-Headers-f027d53ded7e230e008d37c8b47ede7cd308e19d/include/spirv/unified1/spirv.hpp11 2021-05-28 00:24:56.853553436 -0400
@@ -50,11 +50,11 @@
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;
@@ -274,6 +274,8 @@
Rg8ui = 37,
R16ui = 38,
R8ui = 39,
+ R64ui = 40,
+ R64i = 41,
Max = 0x7fffffff,
};
@@ -558,8 +560,10 @@
BaseVertex = 4424,
BaseInstance = 4425,
DrawIndex = 4426,
+ PrimitiveShadingRateKHR = 4432,
DeviceIndex = 4438,
ViewIndex = 4440,
+ ShadingRateKHR = 4444,
BaryCoordNoPerspAMD = 4992,
BaryCoordNoPerspCentroidAMD = 4993,
BaryCoordNoPerspSampleAMD = 4994,
@@ -610,7 +614,6 @@
ObjectToWorldNV = 5330,
WorldToObjectKHR = 5331,
WorldToObjectNV = 5331,
- HitTKHR = 5332,
HitTNV = 5332,
HitKindKHR = 5333,
HitKindNV = 5333,
@@ -870,6 +873,7 @@
GroupNonUniformQuad = 68,
ShaderLayer = 69,
ShaderViewportIndex = 70,
+ FragmentShadingRateKHR = 4422,
SubgroupBallotKHR = 4423,
DrawParameters = 4427,
SubgroupVoteKHR = 4431,
@@ -894,12 +898,15 @@
RoundingModeRTE = 4467,
RoundingModeRTZ = 4468,
RayQueryProvisionalKHR = 4471,
- RayTraversalPrimitiveCullingProvisionalKHR = 4478,
+ RayQueryKHR = 4472,
+ RayTraversalPrimitiveCullingKHR = 4478,
+ RayTracingKHR = 4479,
Float16ImageAMD = 5008,
ImageGatherBiasLodAMD = 5009,
FragmentMaskAMD = 5010,
StencilExportEXT = 5013,
ImageReadWriteLodAMD = 5015,
+ Int64ImageEXT = 5016,
ShaderClockKHR = 5055,
SampleMaskOverrideCoverageNV = 5249,
GeometryShaderPassthroughNV = 5251,
@@ -1024,6 +1031,22 @@
Max = 0x7fffffff,
};
+enum class FragmentShadingRateShift : unsigned {
+ Vertical2Pixels = 0,
+ Vertical4Pixels = 1,
+ Horizontal2Pixels = 2,
+ Horizontal4Pixels = 3,
+ Max = 0x7fffffff,
+};
+
+enum class FragmentShadingRateMask : unsigned {
+ MaskNone = 0,
+ Vertical2Pixels = 0x00000001,
+ Vertical4Pixels = 0x00000002,
+ Horizontal2Pixels = 0x00000004,
+ Horizontal4Pixels = 0x00000008,
+};
+
enum class Op : unsigned {
OpNop = 0,
OpUndef = 1,
@@ -1376,7 +1399,12 @@
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,
@@ -1399,15 +1427,11 @@
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,
@@ -1940,14 +1964,19 @@
case Op::OpPtrEqual: *hasResult = true; *hasResultType = true; break;
case Op::OpPtrNotEqual: *hasResult = true; *hasResultType = true; break;
case Op::OpPtrDiff: *hasResult = true; *hasResultType = true; break;
+ case Op::OpTerminateInvocation: *hasResult = false; *hasResultType = false; break;
case Op::OpSubgroupBallotKHR: *hasResult = true; *hasResultType = true; break;
case Op::OpSubgroupFirstInvocationKHR: *hasResult = true; *hasResultType = true; break;
- case Op::OpTerminateInvocation: *hasResult = false; *hasResultType = false; break;
case Op::OpSubgroupAllKHR: *hasResult = true; *hasResultType = true; break;
case Op::OpSubgroupAnyKHR: *hasResult = true; *hasResultType = true; break;
case Op::OpSubgroupAllEqualKHR: *hasResult = true; *hasResultType = true; break;
case Op::OpSubgroupReadInvocationKHR: *hasResult = true; *hasResultType = true; break;
- case Op::OpTypeRayQueryProvisionalKHR: *hasResult = true; *hasResultType = false; break;
+ case Op::OpTraceRayKHR: *hasResult = false; *hasResultType = false; break;
+ case Op::OpExecuteCallableKHR: *hasResult = false; *hasResultType = false; break;
+ case Op::OpConvertUToAccelerationStructureKHR: *hasResult = true; *hasResultType = true; break;
+ case Op::OpIgnoreIntersectionKHR: *hasResult = false; *hasResultType = false; break;
+ case Op::OpTerminateRayKHR: *hasResult = false; *hasResultType = false; break;
+ case Op::OpTypeRayQueryKHR: *hasResult = true; *hasResultType = false; break;
case Op::OpRayQueryInitializeKHR: *hasResult = false; *hasResultType = false; break;
case Op::OpRayQueryTerminateKHR: *hasResult = false; *hasResultType = false; break;
case Op::OpRayQueryGenerateIntersectionKHR: *hasResult = false; *hasResultType = false; break;
@@ -2166,6 +2195,7 @@
inline MemoryAccessMask operator|(MemoryAccessMask a, MemoryAccessMask b) { return MemoryAccessMask(unsigned(a) | unsigned(b)); }
inline KernelProfilingInfoMask operator|(KernelProfilingInfoMask a, KernelProfilingInfoMask b) { return KernelProfilingInfoMask(unsigned(a) | unsigned(b)); }
inline RayFlagsMask operator|(RayFlagsMask a, RayFlagsMask b) { return RayFlagsMask(unsigned(a) | unsigned(b)); }
+inline FragmentShadingRateMask operator|(FragmentShadingRateMask a, FragmentShadingRateMask b) { return FragmentShadingRateMask(unsigned(a) | unsigned(b)); }
} // end namespace spv
diff -ru SPIRV-Headers-3fdabd0da2932c276b25b9b4a988ba134eba1aa6/include/spirv/unified1/spirv.json SPIRV-Headers-f027d53ded7e230e008d37c8b47ede7cd308e19d/include/spirv/unified1/spirv.json
--- SPIRV-Headers-3fdabd0da2932c276b25b9b4a988ba134eba1aa6/include/spirv/unified1/spirv.json 2020-08-03 05:04:37.000000000 -0400
+++ SPIRV-Headers-f027d53ded7e230e008d37c8b47ede7cd308e19d/include/spirv/unified1/spirv.json 2021-05-28 00:24:56.854553433 -0400
@@ -55,7 +55,7 @@
],
"MagicNumber": 119734787,
"Version": 66816,
- "Revision": 3,
+ "Revision": 4,
"OpCodeMask": 65535,
"WordCountShift": 16
},
@@ -307,7 +307,9 @@
"Rg16ui": 36,
"Rg8ui": 37,
"R16ui": 38,
- "R8ui": 39
+ "R8ui": 39,
+ "R64ui": 40,
+ "R64i": 41
}
},
{
@@ -591,8 +593,10 @@
"BaseVertex": 4424,
"BaseInstance": 4425,
"DrawIndex": 4426,
+ "PrimitiveShadingRateKHR": 4432,
"DeviceIndex": 4438,
"ViewIndex": 4440,
+ "ShadingRateKHR": 4444,
"BaryCoordNoPerspAMD": 4992,
"BaryCoordNoPerspCentroidAMD": 4993,
"BaryCoordNoPerspSampleAMD": 4994,
@@ -643,7 +647,6 @@
"ObjectToWorldNV": 5330,
"WorldToObjectKHR": 5331,
"WorldToObjectNV": 5331,
- "HitTKHR": 5332,
"HitTNV": 5332,
"HitKindKHR": 5333,
"HitKindNV": 5333,
@@ -860,6 +863,7 @@
"GroupNonUniformQuad": 68,
"ShaderLayer": 69,
"ShaderViewportIndex": 70,
+ "FragmentShadingRateKHR": 4422,
"SubgroupBallotKHR": 4423,
"DrawParameters": 4427,
"SubgroupVoteKHR": 4431,
@@ -884,12 +888,15 @@
"RoundingModeRTE": 4467,
"RoundingModeRTZ": 4468,
"RayQueryProvisionalKHR": 4471,
- "RayTraversalPrimitiveCullingProvisionalKHR": 4478,
+ "RayQueryKHR": 4472,
+ "RayTraversalPrimitiveCullingKHR": 4478,
+ "RayTracingKHR": 4479,
"Float16ImageAMD": 5008,
"ImageGatherBiasLodAMD": 5009,
"FragmentMaskAMD": 5010,
"StencilExportEXT": 5013,
"ImageReadWriteLodAMD": 5015,
+ "Int64ImageEXT": 5016,
"ShaderClockKHR": 5055,
"SampleMaskOverrideCoverageNV": 5249,
"GeometryShaderPassthroughNV": 5251,
@@ -1012,6 +1019,17 @@
}
},
{
+ "Name": "FragmentShadingRate",
+ "Type": "Bit",
+ "Values":
+ {
+ "Vertical2Pixels": 0,
+ "Vertical4Pixels": 1,
+ "Horizontal2Pixels": 2,
+ "Horizontal4Pixels": 3
+ }
+ },
+ {
"Name": "Op",
"Type": "Value",
"Values":
@@ -1367,7 +1385,12 @@
"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,
@@ -1390,15 +1413,11 @@
"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,
diff -ru SPIRV-Headers-3fdabd0da2932c276b25b9b4a988ba134eba1aa6/include/spirv/unified1/spirv.lua SPIRV-Headers-f027d53ded7e230e008d37c8b47ede7cd308e19d/include/spirv/unified1/spirv.lua
--- SPIRV-Headers-3fdabd0da2932c276b25b9b4a988ba134eba1aa6/include/spirv/unified1/spirv.lua 2020-08-03 05:04:37.000000000 -0400
+++ SPIRV-Headers-f027d53ded7e230e008d37c8b47ede7cd308e19d/include/spirv/unified1/spirv.lua 2021-05-28 00:24:56.855553431 -0400
@@ -45,7 +45,7 @@
spv = {
MagicNumber = 0x07230203,
Version = 0x00010500,
- Revision = 3,
+ Revision = 4,
OpCodeMask = 0xffff,
WordCountShift = 16,
@@ -256,6 +256,8 @@
Rg8ui = 37,
R16ui = 38,
R8ui = 39,
+ R64ui = 40,
+ R64i = 41,
},
ImageChannelOrder = {
@@ -530,8 +532,10 @@
BaseVertex = 4424,
BaseInstance = 4425,
DrawIndex = 4426,
+ PrimitiveShadingRateKHR = 4432,
DeviceIndex = 4438,
ViewIndex = 4440,
+ ShadingRateKHR = 4444,
BaryCoordNoPerspAMD = 4992,
BaryCoordNoPerspCentroidAMD = 4993,
BaryCoordNoPerspSampleAMD = 4994,
@@ -582,7 +586,6 @@
ObjectToWorldNV = 5330,
WorldToObjectKHR = 5331,
WorldToObjectNV = 5331,
- HitTKHR = 5332,
HitTNV = 5332,
HitKindKHR = 5333,
HitKindNV = 5333,
@@ -832,6 +835,7 @@
GroupNonUniformQuad = 68,
ShaderLayer = 69,
ShaderViewportIndex = 70,
+ FragmentShadingRateKHR = 4422,
SubgroupBallotKHR = 4423,
DrawParameters = 4427,
SubgroupVoteKHR = 4431,
@@ -856,12 +860,15 @@
RoundingModeRTE = 4467,
RoundingModeRTZ = 4468,
RayQueryProvisionalKHR = 4471,
- RayTraversalPrimitiveCullingProvisionalKHR = 4478,
+ RayQueryKHR = 4472,
+ RayTraversalPrimitiveCullingKHR = 4478,
+ RayTracingKHR = 4479,
Float16ImageAMD = 5008,
ImageGatherBiasLodAMD = 5009,
FragmentMaskAMD = 5010,
StencilExportEXT = 5013,
ImageReadWriteLodAMD = 5015,
+ Int64ImageEXT = 5016,
ShaderClockKHR = 5055,
SampleMaskOverrideCoverageNV = 5249,
GeometryShaderPassthroughNV = 5251,
@@ -981,6 +988,21 @@
RayQueryCandidateIntersectionAABBKHR = 1,
},
+ FragmentShadingRateShift = {
+ Vertical2Pixels = 0,
+ Vertical4Pixels = 1,
+ Horizontal2Pixels = 2,
+ Horizontal4Pixels = 3,
+ },
+
+ FragmentShadingRateMask = {
+ MaskNone = 0,
+ Vertical2Pixels = 0x00000001,
+ Vertical4Pixels = 0x00000002,
+ Horizontal2Pixels = 0x00000004,
+ Horizontal4Pixels = 0x00000008,
+ },
+
Op = {
OpNop = 0,
OpUndef = 1,
@@ -1333,7 +1355,12 @@
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,
@@ -1356,15 +1383,11 @@
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,
diff -ru SPIRV-Headers-3fdabd0da2932c276b25b9b4a988ba134eba1aa6/include/spirv/unified1/spirv.py SPIRV-Headers-f027d53ded7e230e008d37c8b47ede7cd308e19d/include/spirv/unified1/spirv.py
--- SPIRV-Headers-3fdabd0da2932c276b25b9b4a988ba134eba1aa6/include/spirv/unified1/spirv.py 2020-08-03 05:04:37.000000000 -0400
+++ SPIRV-Headers-f027d53ded7e230e008d37c8b47ede7cd308e19d/include/spirv/unified1/spirv.py 2021-05-28 00:24:56.855553431 -0400
@@ -45,7 +45,7 @@
spv = {
'MagicNumber' : 0x07230203,
'Version' : 0x00010500,
- 'Revision' : 3,
+ 'Revision' : 4,
'OpCodeMask' : 0xffff,
'WordCountShift' : 16,
@@ -256,6 +256,8 @@
'Rg8ui' : 37,
'R16ui' : 38,
'R8ui' : 39,
+ 'R64ui' : 40,
+ 'R64i' : 41,
},
'ImageChannelOrder' : {
@@ -530,8 +532,10 @@
'BaseVertex' : 4424,
'BaseInstance' : 4425,
'DrawIndex' : 4426,
+ 'PrimitiveShadingRateKHR' : 4432,
'DeviceIndex' : 4438,
'ViewIndex' : 4440,
+ 'ShadingRateKHR' : 4444,
'BaryCoordNoPerspAMD' : 4992,
'BaryCoordNoPerspCentroidAMD' : 4993,
'BaryCoordNoPerspSampleAMD' : 4994,
@@ -582,7 +586,6 @@
'ObjectToWorldNV' : 5330,
'WorldToObjectKHR' : 5331,
'WorldToObjectNV' : 5331,
- 'HitTKHR' : 5332,
'HitTNV' : 5332,
'HitKindKHR' : 5333,
'HitKindNV' : 5333,
@@ -832,6 +835,7 @@
'GroupNonUniformQuad' : 68,
'ShaderLayer' : 69,
'ShaderViewportIndex' : 70,
+ 'FragmentShadingRateKHR' : 4422,
'SubgroupBallotKHR' : 4423,
'DrawParameters' : 4427,
'SubgroupVoteKHR' : 4431,
@@ -856,12 +860,15 @@
'RoundingModeRTE' : 4467,
'RoundingModeRTZ' : 4468,
'RayQueryProvisionalKHR' : 4471,
- 'RayTraversalPrimitiveCullingProvisionalKHR' : 4478,
+ 'RayQueryKHR' : 4472,
+ 'RayTraversalPrimitiveCullingKHR' : 4478,
+ 'RayTracingKHR' : 4479,
'Float16ImageAMD' : 5008,
'ImageGatherBiasLodAMD' : 5009,
'FragmentMaskAMD' : 5010,
'StencilExportEXT' : 5013,
'ImageReadWriteLodAMD' : 5015,
+ 'Int64ImageEXT' : 5016,
'ShaderClockKHR' : 5055,
'SampleMaskOverrideCoverageNV' : 5249,
'GeometryShaderPassthroughNV' : 5251,
@@ -981,6 +988,21 @@
'RayQueryCandidateIntersectionAABBKHR' : 1,
},
+ 'FragmentShadingRateShift' : {
+ 'Vertical2Pixels' : 0,
+ 'Vertical4Pixels' : 1,
+ 'Horizontal2Pixels' : 2,
+ 'Horizontal4Pixels' : 3,
+ },
+
+ 'FragmentShadingRateMask' : {
+ 'MaskNone' : 0,
+ 'Vertical2Pixels' : 0x00000001,
+ 'Vertical4Pixels' : 0x00000002,
+ 'Horizontal2Pixels' : 0x00000004,
+ 'Horizontal4Pixels' : 0x00000008,
+ },
+
'Op' : {
'OpNop' : 0,
'OpUndef' : 1,
@@ -1333,7 +1355,12 @@
'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,
@@ -1356,15 +1383,11 @@
'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,
diff -ru SPIRV-Headers-3fdabd0da2932c276b25b9b4a988ba134eba1aa6/include/spirv/unified1/spv.d SPIRV-Headers-f027d53ded7e230e008d37c8b47ede7cd308e19d/include/spirv/unified1/spv.d
--- SPIRV-Headers-3fdabd0da2932c276b25b9b4a988ba134eba1aa6/include/spirv/unified1/spv.d 2020-08-03 05:04:37.000000000 -0400
+++ SPIRV-Headers-f027d53ded7e230e008d37c8b47ede7cd308e19d/include/spirv/unified1/spv.d 2021-05-28 00:24:56.856553428 -0400
@@ -52,7 +52,7 @@
enum uint MagicNumber = 0x07230203;
enum uint Version = 0x00010500;
-enum uint Revision = 3;
+enum uint Revision = 4;
enum uint OpCodeMask = 0xffff;
enum uint WordCountShift = 16;
@@ -273,6 +273,8 @@
Rg8ui = 37,
R16ui = 38,
R8ui = 39,
+ R64ui = 40,
+ R64i = 41,
}
enum ImageChannelOrder : uint
@@ -559,8 +561,10 @@
BaseVertex = 4424,
BaseInstance = 4425,
DrawIndex = 4426,
+ PrimitiveShadingRateKHR = 4432,
DeviceIndex = 4438,
ViewIndex = 4440,
+ ShadingRateKHR = 4444,
BaryCoordNoPerspAMD = 4992,
BaryCoordNoPerspCentroidAMD = 4993,
BaryCoordNoPerspSampleAMD = 4994,
@@ -611,7 +615,6 @@
ObjectToWorldNV = 5330,
WorldToObjectKHR = 5331,
WorldToObjectNV = 5331,
- HitTKHR = 5332,
HitTNV = 5332,
HitKindKHR = 5333,
HitKindNV = 5333,
@@ -877,6 +880,7 @@
GroupNonUniformQuad = 68,
ShaderLayer = 69,
ShaderViewportIndex = 70,
+ FragmentShadingRateKHR = 4422,
SubgroupBallotKHR = 4423,
DrawParameters = 4427,
SubgroupVoteKHR = 4431,
@@ -901,12 +905,15 @@
RoundingModeRTE = 4467,
RoundingModeRTZ = 4468,
RayQueryProvisionalKHR = 4471,
- RayTraversalPrimitiveCullingProvisionalKHR = 4478,
+ RayQueryKHR = 4472,
+ RayTraversalPrimitiveCullingKHR = 4478,
+ RayTracingKHR = 4479,
Float16ImageAMD = 5008,
ImageGatherBiasLodAMD = 5009,
FragmentMaskAMD = 5010,
StencilExportEXT = 5013,
ImageReadWriteLodAMD = 5015,
+ Int64ImageEXT = 5016,
ShaderClockKHR = 5055,
SampleMaskOverrideCoverageNV = 5249,
GeometryShaderPassthroughNV = 5251,
@@ -1031,6 +1038,23 @@
RayQueryCandidateIntersectionAABBKHR = 1,
}
+enum FragmentShadingRateShift : uint
+{
+ Vertical2Pixels = 0,
+ Vertical4Pixels = 1,
+ Horizontal2Pixels = 2,
+ Horizontal4Pixels = 3,
+}
+
+enum FragmentShadingRateMask : uint
+{
+ MaskNone = 0,
+ Vertical2Pixels = 0x00000001,
+ Vertical4Pixels = 0x00000002,
+ Horizontal2Pixels = 0x00000004,
+ Horizontal4Pixels = 0x00000008,
+}
+
enum Op : uint
{
OpNop = 0,
@@ -1384,7 +1408,12 @@
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,
@@ -1407,15 +1436,11 @@
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,
diff -ru SPIRV-Headers-3fdabd0da2932c276b25b9b4a988ba134eba1aa6/tools/buildHeaders/header.cpp SPIRV-Headers-f027d53ded7e230e008d37c8b47ede7cd308e19d/tools/buildHeaders/header.cpp
--- SPIRV-Headers-3fdabd0da2932c276b25b9b4a988ba134eba1aa6/tools/buildHeaders/header.cpp 2020-08-03 05:04:37.000000000 -0400
+++ SPIRV-Headers-f027d53ded7e230e008d37c8b47ede7cd308e19d/tools/buildHeaders/header.cpp 2021-05-28 00:24:51.207569387 -0400
@@ -70,8 +70,8 @@
static const int DocMagicNumber = 0x07230203;
static const int DocVersion = 0x00010500;
- static const int DocRevision = 3;
- #define DocRevisionString "3"
+ static const int DocRevision = 4;
+ #define DocRevisionString "4"
static const std::string DocCopyright;
static const std::string DocComment1;
static const std::string DocComment2;
diff -ru SPIRV-Headers-3fdabd0da2932c276b25b9b4a988ba134eba1aa6/tools/buildHeaders/jsonToSpirv.cpp SPIRV-Headers-f027d53ded7e230e008d37c8b47ede7cd308e19d/tools/buildHeaders/jsonToSpirv.cpp
--- SPIRV-Headers-3fdabd0da2932c276b25b9b4a988ba134eba1aa6/tools/buildHeaders/jsonToSpirv.cpp 2020-08-03 05:04:37.000000000 -0400
+++ SPIRV-Headers-f027d53ded7e230e008d37c8b47ede7cd308e19d/tools/buildHeaders/jsonToSpirv.cpp 2021-05-28 00:24:56.856553428 -0400
@@ -81,6 +81,7 @@
EnumValues RayQueryIntersectionParams;
EnumValues RayQueryCommittedIntersectionTypeParams;
EnumValues RayQueryCandidateIntersectionTypeParams;
+EnumValues FragmentShadingRateParams;
std::pair<bool, std::string> ReadFile(const std::string& path)
{
@@ -215,6 +216,8 @@
type = OperandRayQueryCommittedIntersectionType;
} else if (operandKind == "RayQueryCandidateIntersectionType") {
type = OperandRayQueryCandidateIntersectionType;
+ } else if (operandKind == "FragmentShadingRate") {
+ type = OperandFragmentShadingRate;
}
if (type == OperandNone) {
@@ -483,6 +486,8 @@
establishOperandClass(enumName, OperandRayQueryCommittedIntersectionType, &RayQueryCommittedIntersectionTypeParams, operandEnum, category);
} else if (enumName == "RayQueryCandidateIntersectionType") {
establishOperandClass(enumName, OperandRayQueryCandidateIntersectionType, &RayQueryCandidateIntersectionTypeParams, operandEnum, category);
+ } else if (enumName == "FragmentShadingRate") {
+ establishOperandClass(enumName, OperandFragmentShadingRate, &FragmentShadingRateParams, operandEnum, category);
}
}
}
diff -ru SPIRV-Headers-3fdabd0da2932c276b25b9b4a988ba134eba1aa6/tools/buildHeaders/jsonToSpirv.h SPIRV-Headers-f027d53ded7e230e008d37c8b47ede7cd308e19d/tools/buildHeaders/jsonToSpirv.h
--- SPIRV-Headers-3fdabd0da2932c276b25b9b4a988ba134eba1aa6/tools/buildHeaders/jsonToSpirv.h 2020-08-03 05:04:37.000000000 -0400
+++ SPIRV-Headers-f027d53ded7e230e008d37c8b47ede7cd308e19d/tools/buildHeaders/jsonToSpirv.h 2021-05-28 00:24:56.857553425 -0400
@@ -88,6 +88,7 @@
OperandRayQueryIntersection,
OperandRayQueryCommittedIntersectionType,
OperandRayQueryCandidateIntersectionType,
+ OperandFragmentShadingRate,
OperandOpcode,
```