Skip to content

Commit

Permalink
Merge branch 'main' of github.com:KhronosGroup/SPIRV-Headers into hea…
Browse files Browse the repository at this point in the history
…der_4_hlsl
  • Loading branch information
devsh committed Jun 26, 2024
2 parents e4b70d0 + 2acb319 commit dbf584b
Show file tree
Hide file tree
Showing 13 changed files with 5,683 additions and 82 deletions.
4 changes: 2 additions & 2 deletions include/spirv/spir-v.xml
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
sure to fill in the vendor attribute, and preferably add a contact
person/address in a comment attribute. -->
<!-- Example new block: <ids type="opcode" start="XXXX" end="XXXX+64n-1" vendor="Add vendor" comment="Contact TBD"/> -->
<ids type="opcode" start="6656" end="65535" comment="Opcode range reservable for future use by vendors"/>
<ids type="opcode" start="6720" end="65535" comment="Opcode range reservable for future use by vendors"/>
<!-- End reservations of opcodes -->


Expand Down Expand Up @@ -190,7 +190,7 @@
sure to fill in the vendor attribute, and preferably add a contact
person/address in a comment attribute. -->
<!-- Example new block: <ids type="enumerant" start="XXXX" end="XXXX+64n-1" vendor="Add vendor" comment="Contact TBD"/> -->
<ids type="enumerant" start="6656" end="4294967295" comment="Enumerant range reservable for future use by vendors"/>
<ids type="enumerant" start="6720" end="4294967295" comment="Enumerant range reservable for future use by vendors"/>
<!-- End reservations of enumerants -->


Expand Down
8 changes: 8 additions & 0 deletions include/spirv/unified1/spirv.bf
Original file line number Diff line number Diff line change
Expand Up @@ -1050,6 +1050,7 @@ namespace Spv
TileImageColorReadAccessEXT = 4166,
TileImageDepthReadAccessEXT = 4167,
TileImageStencilReadAccessEXT = 4168,
CooperativeMatrixLayoutsARM = 4201,
FragmentShadingRateKHR = 4422,
SubgroupBallotKHR = 4423,
DrawParameters = 4427,
Expand Down Expand Up @@ -1213,6 +1214,7 @@ namespace Spv
DotProductKHR = 6019,
RayCullMaskKHR = 6020,
CooperativeMatrixKHR = 6022,
ReplicatedCompositesEXT = 6024,
BitInstructions = 6025,
GroupNonUniformRotateKHR = 6026,
FloatControls2 = 6029,
Expand Down Expand Up @@ -1365,6 +1367,8 @@ namespace Spv
{
RowMajorKHR = 0,
ColumnMajorKHR = 1,
RowBlockedInterleavedARM = 4202,
ColumnBlockedInterleavedARM = 4203,
}

[AllowDuplicates, CRepr] public enum CooperativeMatrixUse
Expand Down Expand Up @@ -1780,6 +1784,7 @@ namespace Spv
OpSubgroupAllEqualKHR = 4430,
OpGroupNonUniformRotateKHR = 4431,
OpSubgroupReadInvocationKHR = 4432,
OpExtInstWithForwardRefsKHR = 4433,
OpTraceRayKHR = 4445,
OpExecuteCallableKHR = 4446,
OpConvertUToAccelerationStructureKHR = 4447,
Expand All @@ -1802,6 +1807,9 @@ namespace Spv
OpCooperativeMatrixStoreKHR = 4458,
OpCooperativeMatrixMulAddKHR = 4459,
OpCooperativeMatrixLengthKHR = 4460,
OpConstantCompositeReplicateEXT = 4461,
OpSpecConstantCompositeReplicateEXT = 4462,
OpCompositeConstructReplicateEXT = 4463,
OpTypeRayQueryKHR = 4472,
OpRayQueryInitializeKHR = 4473,
OpRayQueryTerminateKHR = 4474,
Expand Down
Loading

0 comments on commit dbf584b

Please sign in to comment.