Skip to content

S
swiftshader
Commit d79f17cf by Ben Clayton
Options

Mend git merge history for SPIRV-Headers and SPIRV-Tools

https://swiftshader-review.googlesource.com/c/SwiftShader/+/50749 squashed together the changes from two `git subtree pull` commands (for SPIRV-Headers and SPIRV-Tools), which resulted in a change with a single parent. `git subtree` expects a merge commit with a single set of `git-subtree-*` metadata tags. The squash resulted in a change description with two sets of these, confusing `git subtree` even further. The process to fix this is probably not the easiest, but the first one I found that works: # Rollback to the parent change of 50749 git checkout 43bb60e1 # Perform the subtree pull again for SPIRV-Headers (to 104ecc356) git subtree pull --prefix third_party/SPIRV-Headers https://github.com/KhronosGroup/SPIRV-Headers 104ecc356c1bea4476320faca64440cd1df655a3 --squash -m "Update SPIR-V Headers" # Note the second parent of the merge for the SPIRV-Headers (Merge: 43bb60e1 ded361b4) git show -1 # Perform the subtree pull again for SPIRV-Tools (to b0e22d28f) git subtree pull --prefix third_party/SPIRV-Tools https://github.com/KhronosGroup/SPIRV-Tools b0e22d28f5ec891d6b256703575d08fce4228bd9 --squash -m "Update SPIR-V Tools" # Note the second parent of the merge for the SPIRV-Tools (Merge: a00ce432a9d bdb9eea9) git show -1 # Jump back to master git checkout origin/master # Revert 50749 git revert 9dff6a3b # Re-merge the squashed update change for SPIRV-Headers ** this change ** git merge -Xsubtree="third_party/SPIRV-Headers" ded361b4 # Re-merge the squashed update change for SPIRV-Tools git merge -Xsubtree="third_party/SPIRV-Tools" bdb9eea9 Bug: b/174239232 Change-Id: Ibab851eb610b1448193f57a628eb95bdb58057ee
parents 24d6bf7f ded361b4
Showing with 94 additions and 54 deletions
third_party/SPIRV-Headers/include/spirv/spir-v.xml
...@@ -77,7 +77,8 @@ ...@@ -77,7 +77,8 @@
<id value="24" vendor="Google" tool="ANGLE Shader Compiler" comment="Contact Shahbaz Youssefi, syoussefi@google.com"/> <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="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="26" vendor="Xenia" tool="Xenia Emulator Microcode Translator" comment="Contact Vitaliy Kuzmin, triang3l@yandex.ru, https://github.com/xenia-project/xenia"/>
<unused start="27" end="0xFFFF" comment="Tool ID range reservable for future use by vendors"/> <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> </ids>
<!-- SECTION: SPIR-V Opcodes and Enumerants --> <!-- SECTION: SPIR-V Opcodes and Enumerants -->
...@@ -179,8 +180,8 @@ ...@@ -179,8 +180,8 @@
<!-- Reserved loop control bits --> <!-- 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="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="16" end="23" 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="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"/> <ids type="LoopControl" start="31" end="31" vendor="Khronos" comment="Reserved LoopControl bit, not available to vendors"/>
......
third_party/SPIRV-Headers/include/spirv/unified1/spirv.cs
...@@ -903,7 +903,9 @@ namespace Spv ...@@ -903,7 +903,9 @@ namespace Spv
RoundingModeRTE = 4467, RoundingModeRTE = 4467,
RoundingModeRTZ = 4468, RoundingModeRTZ = 4468,
RayQueryProvisionalKHR = 4471, RayQueryProvisionalKHR = 4471,
RayTraversalPrimitiveCullingProvisionalKHR = 4478, RayQueryKHR = 4472,
RayTraversalPrimitiveCullingKHR = 4478,
RayTracingKHR = 4479,
Float16ImageAMD = 5008, Float16ImageAMD = 5008,
ImageGatherBiasLodAMD = 5009, ImageGatherBiasLodAMD = 5009,
FragmentMaskAMD = 5010, FragmentMaskAMD = 5010,
...@@ -1404,7 +1406,12 @@ namespace Spv ...@@ -1404,7 +1406,12 @@ namespace Spv
OpSubgroupAnyKHR = 4429, OpSubgroupAnyKHR = 4429,
OpSubgroupAllEqualKHR = 4430, OpSubgroupAllEqualKHR = 4430,
OpSubgroupReadInvocationKHR = 4432, OpSubgroupReadInvocationKHR = 4432,
OpTypeRayQueryProvisionalKHR = 4472, OpTraceRayKHR = 4445,
OpExecuteCallableKHR = 4446,
OpConvertUToAccelerationStructureKHR = 4447,
OpIgnoreIntersectionKHR = 4448,
OpTerminateRayKHR = 4449,
OpTypeRayQueryKHR = 4472,
OpRayQueryInitializeKHR = 4473, OpRayQueryInitializeKHR = 4473,
OpRayQueryTerminateKHR = 4474, OpRayQueryTerminateKHR = 4474,
OpRayQueryGenerateIntersectionKHR = 4475, OpRayQueryGenerateIntersectionKHR = 4475,
...@@ -1427,15 +1434,11 @@ namespace Spv ...@@ -1427,15 +1434,11 @@ namespace Spv
OpWritePackedPrimitiveIndices4x8NV = 5299, OpWritePackedPrimitiveIndices4x8NV = 5299,
OpReportIntersectionKHR = 5334, OpReportIntersectionKHR = 5334,
OpReportIntersectionNV = 5334, OpReportIntersectionNV = 5334,
OpIgnoreIntersectionKHR = 5335,
OpIgnoreIntersectionNV = 5335, OpIgnoreIntersectionNV = 5335,
OpTerminateRayKHR = 5336,
OpTerminateRayNV = 5336, OpTerminateRayNV = 5336,
OpTraceNV = 5337, OpTraceNV = 5337,
OpTraceRayKHR = 5337,
OpTypeAccelerationStructureKHR = 5341, OpTypeAccelerationStructureKHR = 5341,
OpTypeAccelerationStructureNV = 5341, OpTypeAccelerationStructureNV = 5341,
OpExecuteCallableKHR = 5344,
OpExecuteCallableNV = 5344, OpExecuteCallableNV = 5344,
OpTypeCooperativeMatrixNV = 5358, OpTypeCooperativeMatrixNV = 5358,
OpCooperativeMatrixLoadNV = 5359, OpCooperativeMatrixLoadNV = 5359,
......
third_party/SPIRV-Headers/include/spirv/unified1/spirv.h
...@@ -903,7 +903,9 @@ typedef enum SpvCapability_ { ...@@ -903,7 +903,9 @@ typedef enum SpvCapability_ {
SpvCapabilityRoundingModeRTE = 4467, SpvCapabilityRoundingModeRTE = 4467,
SpvCapabilityRoundingModeRTZ = 4468, SpvCapabilityRoundingModeRTZ = 4468,
SpvCapabilityRayQueryProvisionalKHR = 4471, SpvCapabilityRayQueryProvisionalKHR = 4471,
SpvCapabilityRayTraversalPrimitiveCullingProvisionalKHR = 4478, SpvCapabilityRayQueryKHR = 4472,
SpvCapabilityRayTraversalPrimitiveCullingKHR = 4478,
SpvCapabilityRayTracingKHR = 4479,
SpvCapabilityFloat16ImageAMD = 5008, SpvCapabilityFloat16ImageAMD = 5008,
SpvCapabilityImageGatherBiasLodAMD = 5009, SpvCapabilityImageGatherBiasLodAMD = 5009,
SpvCapabilityFragmentMaskAMD = 5010, SpvCapabilityFragmentMaskAMD = 5010,
...@@ -1402,7 +1404,12 @@ typedef enum SpvOp_ { ...@@ -1402,7 +1404,12 @@ typedef enum SpvOp_ {
SpvOpSubgroupAnyKHR = 4429, SpvOpSubgroupAnyKHR = 4429,
SpvOpSubgroupAllEqualKHR = 4430, SpvOpSubgroupAllEqualKHR = 4430,
SpvOpSubgroupReadInvocationKHR = 4432, SpvOpSubgroupReadInvocationKHR = 4432,
SpvOpTypeRayQueryProvisionalKHR = 4472, SpvOpTraceRayKHR = 4445,
SpvOpExecuteCallableKHR = 4446,
SpvOpConvertUToAccelerationStructureKHR = 4447,
SpvOpIgnoreIntersectionKHR = 4448,
SpvOpTerminateRayKHR = 4449,
SpvOpTypeRayQueryKHR = 4472,
SpvOpRayQueryInitializeKHR = 4473, SpvOpRayQueryInitializeKHR = 4473,
SpvOpRayQueryTerminateKHR = 4474, SpvOpRayQueryTerminateKHR = 4474,
SpvOpRayQueryGenerateIntersectionKHR = 4475, SpvOpRayQueryGenerateIntersectionKHR = 4475,
...@@ -1425,15 +1432,11 @@ typedef enum SpvOp_ { ...@@ -1425,15 +1432,11 @@ typedef enum SpvOp_ {
SpvOpWritePackedPrimitiveIndices4x8NV = 5299, SpvOpWritePackedPrimitiveIndices4x8NV = 5299,
SpvOpReportIntersectionKHR = 5334, SpvOpReportIntersectionKHR = 5334,
SpvOpReportIntersectionNV = 5334, SpvOpReportIntersectionNV = 5334,
SpvOpIgnoreIntersectionKHR = 5335,
SpvOpIgnoreIntersectionNV = 5335, SpvOpIgnoreIntersectionNV = 5335,
SpvOpTerminateRayKHR = 5336,
SpvOpTerminateRayNV = 5336, SpvOpTerminateRayNV = 5336,
SpvOpTraceNV = 5337, SpvOpTraceNV = 5337,
SpvOpTraceRayKHR = 5337,
SpvOpTypeAccelerationStructureKHR = 5341, SpvOpTypeAccelerationStructureKHR = 5341,
SpvOpTypeAccelerationStructureNV = 5341, SpvOpTypeAccelerationStructureNV = 5341,
SpvOpExecuteCallableKHR = 5344,
SpvOpExecuteCallableNV = 5344, SpvOpExecuteCallableNV = 5344,
SpvOpTypeCooperativeMatrixNV = 5358, SpvOpTypeCooperativeMatrixNV = 5358,
SpvOpCooperativeMatrixLoadNV = 5359, SpvOpCooperativeMatrixLoadNV = 5359,
...@@ -1973,7 +1976,12 @@ inline void SpvHasResultAndType(SpvOp opcode, bool *hasResult, bool *hasResultTy ...@@ -1973,7 +1976,12 @@ inline void SpvHasResultAndType(SpvOp opcode, bool *hasResult, bool *hasResultTy
case SpvOpSubgroupAnyKHR: *hasResult = true; *hasResultType = true; break; case SpvOpSubgroupAnyKHR: *hasResult = true; *hasResultType = true; break;
case SpvOpSubgroupAllEqualKHR: *hasResult = true; *hasResultType = true; break; case SpvOpSubgroupAllEqualKHR: *hasResult = true; *hasResultType = true; break;
case SpvOpSubgroupReadInvocationKHR: *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 SpvOpRayQueryInitializeKHR: *hasResult = false; *hasResultType = false; break;
case SpvOpRayQueryTerminateKHR: *hasResult = false; *hasResultType = false; break; case SpvOpRayQueryTerminateKHR: *hasResult = false; *hasResultType = false; break;
case SpvOpRayQueryGenerateIntersectionKHR: *hasResult = false; *hasResultType = false; break; case SpvOpRayQueryGenerateIntersectionKHR: *hasResult = false; *hasResultType = false; break;
......
third_party/SPIRV-Headers/include/spirv/unified1/spirv.hpp
...@@ -899,7 +899,9 @@ enum Capability { ...@@ -899,7 +899,9 @@ enum Capability {
CapabilityRoundingModeRTE = 4467, CapabilityRoundingModeRTE = 4467,
CapabilityRoundingModeRTZ = 4468, CapabilityRoundingModeRTZ = 4468,
CapabilityRayQueryProvisionalKHR = 4471, CapabilityRayQueryProvisionalKHR = 4471,
CapabilityRayTraversalPrimitiveCullingProvisionalKHR = 4478, CapabilityRayQueryKHR = 4472,
CapabilityRayTraversalPrimitiveCullingKHR = 4478,
CapabilityRayTracingKHR = 4479,
CapabilityFloat16ImageAMD = 5008, CapabilityFloat16ImageAMD = 5008,
CapabilityImageGatherBiasLodAMD = 5009, CapabilityImageGatherBiasLodAMD = 5009,
CapabilityFragmentMaskAMD = 5010, CapabilityFragmentMaskAMD = 5010,
...@@ -1398,7 +1400,12 @@ enum Op { ...@@ -1398,7 +1400,12 @@ enum Op {
OpSubgroupAnyKHR = 4429, OpSubgroupAnyKHR = 4429,
OpSubgroupAllEqualKHR = 4430, OpSubgroupAllEqualKHR = 4430,
OpSubgroupReadInvocationKHR = 4432, OpSubgroupReadInvocationKHR = 4432,
OpTypeRayQueryProvisionalKHR = 4472, OpTraceRayKHR = 4445,
OpExecuteCallableKHR = 4446,
OpConvertUToAccelerationStructureKHR = 4447,
OpIgnoreIntersectionKHR = 4448,
OpTerminateRayKHR = 4449,
OpTypeRayQueryKHR = 4472,
OpRayQueryInitializeKHR = 4473, OpRayQueryInitializeKHR = 4473,
OpRayQueryTerminateKHR = 4474, OpRayQueryTerminateKHR = 4474,
OpRayQueryGenerateIntersectionKHR = 4475, OpRayQueryGenerateIntersectionKHR = 4475,
...@@ -1421,15 +1428,11 @@ enum Op { ...@@ -1421,15 +1428,11 @@ enum Op {
OpWritePackedPrimitiveIndices4x8NV = 5299, OpWritePackedPrimitiveIndices4x8NV = 5299,
OpReportIntersectionKHR = 5334, OpReportIntersectionKHR = 5334,
OpReportIntersectionNV = 5334, OpReportIntersectionNV = 5334,
OpIgnoreIntersectionKHR = 5335,
OpIgnoreIntersectionNV = 5335, OpIgnoreIntersectionNV = 5335,
OpTerminateRayKHR = 5336,
OpTerminateRayNV = 5336, OpTerminateRayNV = 5336,
OpTraceNV = 5337, OpTraceNV = 5337,
OpTraceRayKHR = 5337,
OpTypeAccelerationStructureKHR = 5341, OpTypeAccelerationStructureKHR = 5341,
OpTypeAccelerationStructureNV = 5341, OpTypeAccelerationStructureNV = 5341,
OpExecuteCallableKHR = 5344,
OpExecuteCallableNV = 5344, OpExecuteCallableNV = 5344,
OpTypeCooperativeMatrixNV = 5358, OpTypeCooperativeMatrixNV = 5358,
OpCooperativeMatrixLoadNV = 5359, OpCooperativeMatrixLoadNV = 5359,
...@@ -1969,7 +1972,12 @@ inline void HasResultAndType(Op opcode, bool *hasResult, bool *hasResultType) { ...@@ -1969,7 +1972,12 @@ inline void HasResultAndType(Op opcode, bool *hasResult, bool *hasResultType) {
case OpSubgroupAnyKHR: *hasResult = true; *hasResultType = true; break; case OpSubgroupAnyKHR: *hasResult = true; *hasResultType = true; break;
case OpSubgroupAllEqualKHR: *hasResult = true; *hasResultType = true; break; case OpSubgroupAllEqualKHR: *hasResult = true; *hasResultType = true; break;
case OpSubgroupReadInvocationKHR: *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 OpRayQueryInitializeKHR: *hasResult = false; *hasResultType = false; break;
case OpRayQueryTerminateKHR: *hasResult = false; *hasResultType = false; break; case OpRayQueryTerminateKHR: *hasResult = false; *hasResultType = false; break;
case OpRayQueryGenerateIntersectionKHR: *hasResult = false; *hasResultType = false; break; case OpRayQueryGenerateIntersectionKHR: *hasResult = false; *hasResultType = false; break;
......
third_party/SPIRV-Headers/include/spirv/unified1/spirv.hpp11
...@@ -899,7 +899,9 @@ enum class Capability : unsigned { ...@@ -899,7 +899,9 @@ enum class Capability : unsigned {
RoundingModeRTE = 4467, RoundingModeRTE = 4467,
RoundingModeRTZ = 4468, RoundingModeRTZ = 4468,
RayQueryProvisionalKHR = 4471, RayQueryProvisionalKHR = 4471,
RayTraversalPrimitiveCullingProvisionalKHR = 4478, RayQueryKHR = 4472,
RayTraversalPrimitiveCullingKHR = 4478,
RayTracingKHR = 4479,
Float16ImageAMD = 5008, Float16ImageAMD = 5008,
ImageGatherBiasLodAMD = 5009, ImageGatherBiasLodAMD = 5009,
FragmentMaskAMD = 5010, FragmentMaskAMD = 5010,
...@@ -1398,7 +1400,12 @@ enum class Op : unsigned { ...@@ -1398,7 +1400,12 @@ enum class Op : unsigned {
OpSubgroupAnyKHR = 4429, OpSubgroupAnyKHR = 4429,
OpSubgroupAllEqualKHR = 4430, OpSubgroupAllEqualKHR = 4430,
OpSubgroupReadInvocationKHR = 4432, OpSubgroupReadInvocationKHR = 4432,
OpTypeRayQueryProvisionalKHR = 4472, OpTraceRayKHR = 4445,
OpExecuteCallableKHR = 4446,
OpConvertUToAccelerationStructureKHR = 4447,
OpIgnoreIntersectionKHR = 4448,
OpTerminateRayKHR = 4449,
OpTypeRayQueryKHR = 4472,
OpRayQueryInitializeKHR = 4473, OpRayQueryInitializeKHR = 4473,
OpRayQueryTerminateKHR = 4474, OpRayQueryTerminateKHR = 4474,
OpRayQueryGenerateIntersectionKHR = 4475, OpRayQueryGenerateIntersectionKHR = 4475,
...@@ -1421,15 +1428,11 @@ enum class Op : unsigned { ...@@ -1421,15 +1428,11 @@ enum class Op : unsigned {
OpWritePackedPrimitiveIndices4x8NV = 5299, OpWritePackedPrimitiveIndices4x8NV = 5299,
OpReportIntersectionKHR = 5334, OpReportIntersectionKHR = 5334,
OpReportIntersectionNV = 5334, OpReportIntersectionNV = 5334,
OpIgnoreIntersectionKHR = 5335,
OpIgnoreIntersectionNV = 5335, OpIgnoreIntersectionNV = 5335,
OpTerminateRayKHR = 5336,
OpTerminateRayNV = 5336, OpTerminateRayNV = 5336,
OpTraceNV = 5337, OpTraceNV = 5337,
OpTraceRayKHR = 5337,
OpTypeAccelerationStructureKHR = 5341, OpTypeAccelerationStructureKHR = 5341,
OpTypeAccelerationStructureNV = 5341, OpTypeAccelerationStructureNV = 5341,
OpExecuteCallableKHR = 5344,
OpExecuteCallableNV = 5344, OpExecuteCallableNV = 5344,
OpTypeCooperativeMatrixNV = 5358, OpTypeCooperativeMatrixNV = 5358,
OpCooperativeMatrixLoadNV = 5359, OpCooperativeMatrixLoadNV = 5359,
...@@ -1969,7 +1972,12 @@ inline void HasResultAndType(Op opcode, bool *hasResult, bool *hasResultType) { ...@@ -1969,7 +1972,12 @@ inline void HasResultAndType(Op opcode, bool *hasResult, bool *hasResultType) {
case Op::OpSubgroupAnyKHR: *hasResult = true; *hasResultType = true; break; case Op::OpSubgroupAnyKHR: *hasResult = true; *hasResultType = true; break;
case Op::OpSubgroupAllEqualKHR: *hasResult = true; *hasResultType = true; break; case Op::OpSubgroupAllEqualKHR: *hasResult = true; *hasResultType = true; break;
case Op::OpSubgroupReadInvocationKHR: *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::OpRayQueryInitializeKHR: *hasResult = false; *hasResultType = false; break;
case Op::OpRayQueryTerminateKHR: *hasResult = false; *hasResultType = false; break; case Op::OpRayQueryTerminateKHR: *hasResult = false; *hasResultType = false; break;
case Op::OpRayQueryGenerateIntersectionKHR: *hasResult = false; *hasResultType = false; break; case Op::OpRayQueryGenerateIntersectionKHR: *hasResult = false; *hasResultType = false; break;
......
third_party/SPIRV-Headers/include/spirv/unified1/spirv.json
...@@ -889,7 +889,9 @@ ...@@ -889,7 +889,9 @@
"RoundingModeRTE": 4467, "RoundingModeRTE": 4467,
"RoundingModeRTZ": 4468, "RoundingModeRTZ": 4468,
"RayQueryProvisionalKHR": 4471, "RayQueryProvisionalKHR": 4471,
"RayTraversalPrimitiveCullingProvisionalKHR": 4478, "RayQueryKHR": 4472,
"RayTraversalPrimitiveCullingKHR": 4478,
"RayTracingKHR": 4479,
"Float16ImageAMD": 5008, "Float16ImageAMD": 5008,
"ImageGatherBiasLodAMD": 5009, "ImageGatherBiasLodAMD": 5009,
"FragmentMaskAMD": 5010, "FragmentMaskAMD": 5010,
...@@ -1384,7 +1386,12 @@ ...@@ -1384,7 +1386,12 @@
"OpSubgroupAnyKHR": 4429, "OpSubgroupAnyKHR": 4429,
"OpSubgroupAllEqualKHR": 4430, "OpSubgroupAllEqualKHR": 4430,
"OpSubgroupReadInvocationKHR": 4432, "OpSubgroupReadInvocationKHR": 4432,
"OpTypeRayQueryProvisionalKHR": 4472, "OpTraceRayKHR": 4445,
"OpExecuteCallableKHR": 4446,
"OpConvertUToAccelerationStructureKHR": 4447,
"OpIgnoreIntersectionKHR": 4448,
"OpTerminateRayKHR": 4449,
"OpTypeRayQueryKHR": 4472,
"OpRayQueryInitializeKHR": 4473, "OpRayQueryInitializeKHR": 4473,
"OpRayQueryTerminateKHR": 4474, "OpRayQueryTerminateKHR": 4474,
"OpRayQueryGenerateIntersectionKHR": 4475, "OpRayQueryGenerateIntersectionKHR": 4475,
...@@ -1407,15 +1414,11 @@ ...@@ -1407,15 +1414,11 @@
"OpWritePackedPrimitiveIndices4x8NV": 5299, "OpWritePackedPrimitiveIndices4x8NV": 5299,
"OpReportIntersectionKHR": 5334, "OpReportIntersectionKHR": 5334,
"OpReportIntersectionNV": 5334, "OpReportIntersectionNV": 5334,
"OpIgnoreIntersectionKHR": 5335,
"OpIgnoreIntersectionNV": 5335, "OpIgnoreIntersectionNV": 5335,
"OpTerminateRayKHR": 5336,
"OpTerminateRayNV": 5336, "OpTerminateRayNV": 5336,
"OpTraceNV": 5337, "OpTraceNV": 5337,
"OpTraceRayKHR": 5337,
"OpTypeAccelerationStructureKHR": 5341, "OpTypeAccelerationStructureKHR": 5341,
"OpTypeAccelerationStructureNV": 5341, "OpTypeAccelerationStructureNV": 5341,
"OpExecuteCallableKHR": 5344,
"OpExecuteCallableNV": 5344, "OpExecuteCallableNV": 5344,
"OpTypeCooperativeMatrixNV": 5358, "OpTypeCooperativeMatrixNV": 5358,
"OpCooperativeMatrixLoadNV": 5359, "OpCooperativeMatrixLoadNV": 5359,
......
third_party/SPIRV-Headers/include/spirv/unified1/spirv.lua
...@@ -861,7 +861,9 @@ spv = { ...@@ -861,7 +861,9 @@ spv = {
RoundingModeRTE = 4467, RoundingModeRTE = 4467,
RoundingModeRTZ = 4468, RoundingModeRTZ = 4468,
RayQueryProvisionalKHR = 4471, RayQueryProvisionalKHR = 4471,
RayTraversalPrimitiveCullingProvisionalKHR = 4478, RayQueryKHR = 4472,
RayTraversalPrimitiveCullingKHR = 4478,
RayTracingKHR = 4479,
Float16ImageAMD = 5008, Float16ImageAMD = 5008,
ImageGatherBiasLodAMD = 5009, ImageGatherBiasLodAMD = 5009,
FragmentMaskAMD = 5010, FragmentMaskAMD = 5010,
...@@ -1354,7 +1356,12 @@ spv = { ...@@ -1354,7 +1356,12 @@ spv = {
OpSubgroupAnyKHR = 4429, OpSubgroupAnyKHR = 4429,
OpSubgroupAllEqualKHR = 4430, OpSubgroupAllEqualKHR = 4430,
OpSubgroupReadInvocationKHR = 4432, OpSubgroupReadInvocationKHR = 4432,
OpTypeRayQueryProvisionalKHR = 4472, OpTraceRayKHR = 4445,
OpExecuteCallableKHR = 4446,
OpConvertUToAccelerationStructureKHR = 4447,
OpIgnoreIntersectionKHR = 4448,
OpTerminateRayKHR = 4449,
OpTypeRayQueryKHR = 4472,
OpRayQueryInitializeKHR = 4473, OpRayQueryInitializeKHR = 4473,
OpRayQueryTerminateKHR = 4474, OpRayQueryTerminateKHR = 4474,
OpRayQueryGenerateIntersectionKHR = 4475, OpRayQueryGenerateIntersectionKHR = 4475,
...@@ -1377,15 +1384,11 @@ spv = { ...@@ -1377,15 +1384,11 @@ spv = {
OpWritePackedPrimitiveIndices4x8NV = 5299, OpWritePackedPrimitiveIndices4x8NV = 5299,
OpReportIntersectionKHR = 5334, OpReportIntersectionKHR = 5334,
OpReportIntersectionNV = 5334, OpReportIntersectionNV = 5334,
OpIgnoreIntersectionKHR = 5335,
OpIgnoreIntersectionNV = 5335, OpIgnoreIntersectionNV = 5335,
OpTerminateRayKHR = 5336,
OpTerminateRayNV = 5336, OpTerminateRayNV = 5336,
OpTraceNV = 5337, OpTraceNV = 5337,
OpTraceRayKHR = 5337,
OpTypeAccelerationStructureKHR = 5341, OpTypeAccelerationStructureKHR = 5341,
OpTypeAccelerationStructureNV = 5341, OpTypeAccelerationStructureNV = 5341,
OpExecuteCallableKHR = 5344,
OpExecuteCallableNV = 5344, OpExecuteCallableNV = 5344,
OpTypeCooperativeMatrixNV = 5358, OpTypeCooperativeMatrixNV = 5358,
OpCooperativeMatrixLoadNV = 5359, OpCooperativeMatrixLoadNV = 5359,
......
third_party/SPIRV-Headers/include/spirv/unified1/spirv.py
...@@ -861,7 +861,9 @@ spv = { ...@@ -861,7 +861,9 @@ spv = {
'RoundingModeRTE' : 4467, 'RoundingModeRTE' : 4467,
'RoundingModeRTZ' : 4468, 'RoundingModeRTZ' : 4468,
'RayQueryProvisionalKHR' : 4471, 'RayQueryProvisionalKHR' : 4471,
'RayTraversalPrimitiveCullingProvisionalKHR' : 4478, 'RayQueryKHR' : 4472,
'RayTraversalPrimitiveCullingKHR' : 4478,
'RayTracingKHR' : 4479,
'Float16ImageAMD' : 5008, 'Float16ImageAMD' : 5008,
'ImageGatherBiasLodAMD' : 5009, 'ImageGatherBiasLodAMD' : 5009,
'FragmentMaskAMD' : 5010, 'FragmentMaskAMD' : 5010,
...@@ -1354,7 +1356,12 @@ spv = { ...@@ -1354,7 +1356,12 @@ spv = {
'OpSubgroupAnyKHR' : 4429, 'OpSubgroupAnyKHR' : 4429,
'OpSubgroupAllEqualKHR' : 4430, 'OpSubgroupAllEqualKHR' : 4430,
'OpSubgroupReadInvocationKHR' : 4432, 'OpSubgroupReadInvocationKHR' : 4432,
'OpTypeRayQueryProvisionalKHR' : 4472, 'OpTraceRayKHR' : 4445,
'OpExecuteCallableKHR' : 4446,
'OpConvertUToAccelerationStructureKHR' : 4447,
'OpIgnoreIntersectionKHR' : 4448,
'OpTerminateRayKHR' : 4449,
'OpTypeRayQueryKHR' : 4472,
'OpRayQueryInitializeKHR' : 4473, 'OpRayQueryInitializeKHR' : 4473,
'OpRayQueryTerminateKHR' : 4474, 'OpRayQueryTerminateKHR' : 4474,
'OpRayQueryGenerateIntersectionKHR' : 4475, 'OpRayQueryGenerateIntersectionKHR' : 4475,
...@@ -1377,15 +1384,11 @@ spv = { ...@@ -1377,15 +1384,11 @@ spv = {
'OpWritePackedPrimitiveIndices4x8NV' : 5299, 'OpWritePackedPrimitiveIndices4x8NV' : 5299,
'OpReportIntersectionKHR' : 5334, 'OpReportIntersectionKHR' : 5334,
'OpReportIntersectionNV' : 5334, 'OpReportIntersectionNV' : 5334,
'OpIgnoreIntersectionKHR' : 5335,
'OpIgnoreIntersectionNV' : 5335, 'OpIgnoreIntersectionNV' : 5335,
'OpTerminateRayKHR' : 5336,
'OpTerminateRayNV' : 5336, 'OpTerminateRayNV' : 5336,
'OpTraceNV' : 5337, 'OpTraceNV' : 5337,
'OpTraceRayKHR' : 5337,
'OpTypeAccelerationStructureKHR' : 5341, 'OpTypeAccelerationStructureKHR' : 5341,
'OpTypeAccelerationStructureNV' : 5341, 'OpTypeAccelerationStructureNV' : 5341,
'OpExecuteCallableKHR' : 5344,
'OpExecuteCallableNV' : 5344, 'OpExecuteCallableNV' : 5344,
'OpTypeCooperativeMatrixNV' : 5358, 'OpTypeCooperativeMatrixNV' : 5358,
'OpCooperativeMatrixLoadNV' : 5359, 'OpCooperativeMatrixLoadNV' : 5359,
......
third_party/SPIRV-Headers/include/spirv/unified1/spv.d
...@@ -906,7 +906,9 @@ enum Capability : uint ...@@ -906,7 +906,9 @@ enum Capability : uint
RoundingModeRTE = 4467, RoundingModeRTE = 4467,
RoundingModeRTZ = 4468, RoundingModeRTZ = 4468,
RayQueryProvisionalKHR = 4471, RayQueryProvisionalKHR = 4471,
RayTraversalPrimitiveCullingProvisionalKHR = 4478, RayQueryKHR = 4472,
RayTraversalPrimitiveCullingKHR = 4478,
RayTracingKHR = 4479,
Float16ImageAMD = 5008, Float16ImageAMD = 5008,
ImageGatherBiasLodAMD = 5009, ImageGatherBiasLodAMD = 5009,
FragmentMaskAMD = 5010, FragmentMaskAMD = 5010,
...@@ -1407,7 +1409,12 @@ enum Op : uint ...@@ -1407,7 +1409,12 @@ enum Op : uint
OpSubgroupAnyKHR = 4429, OpSubgroupAnyKHR = 4429,
OpSubgroupAllEqualKHR = 4430, OpSubgroupAllEqualKHR = 4430,
OpSubgroupReadInvocationKHR = 4432, OpSubgroupReadInvocationKHR = 4432,
OpTypeRayQueryProvisionalKHR = 4472, OpTraceRayKHR = 4445,
OpExecuteCallableKHR = 4446,
OpConvertUToAccelerationStructureKHR = 4447,
OpIgnoreIntersectionKHR = 4448,
OpTerminateRayKHR = 4449,
OpTypeRayQueryKHR = 4472,
OpRayQueryInitializeKHR = 4473, OpRayQueryInitializeKHR = 4473,
OpRayQueryTerminateKHR = 4474, OpRayQueryTerminateKHR = 4474,
OpRayQueryGenerateIntersectionKHR = 4475, OpRayQueryGenerateIntersectionKHR = 4475,
...@@ -1430,15 +1437,11 @@ enum Op : uint ...@@ -1430,15 +1437,11 @@ enum Op : uint
OpWritePackedPrimitiveIndices4x8NV = 5299, OpWritePackedPrimitiveIndices4x8NV = 5299,
OpReportIntersectionKHR = 5334, OpReportIntersectionKHR = 5334,
OpReportIntersectionNV = 5334, OpReportIntersectionNV = 5334,
OpIgnoreIntersectionKHR = 5335,
OpIgnoreIntersectionNV = 5335, OpIgnoreIntersectionNV = 5335,
OpTerminateRayKHR = 5336,
OpTerminateRayNV = 5336, OpTerminateRayNV = 5336,
OpTraceNV = 5337, OpTraceNV = 5337,
OpTraceRayKHR = 5337,
OpTypeAccelerationStructureKHR = 5341, OpTypeAccelerationStructureKHR = 5341,
OpTypeAccelerationStructureNV = 5341, OpTypeAccelerationStructureNV = 5341,
OpExecuteCallableKHR = 5344,
OpExecuteCallableNV = 5344, OpExecuteCallableNV = 5344,
OpTypeCooperativeMatrixNV = 5358, OpTypeCooperativeMatrixNV = 5358,
OpCooperativeMatrixLoadNV = 5359, OpCooperativeMatrixLoadNV = 5359,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment