Skip to content

Commit dbf584b

Browse files
author
devsh
committed
Merge branch 'main' of github.com:KhronosGroup/SPIRV-Headers into header_4_hlsl
2 parents e4b70d0 + 2acb319 commit dbf584b

File tree

13 files changed

+5683
-82
lines changed

13 files changed

+5683
-82
lines changed

include/spirv/spir-v.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@
157157
sure to fill in the vendor attribute, and preferably add a contact
158158
person/address in a comment attribute. -->
159159
<!-- Example new block: <ids type="opcode" start="XXXX" end="XXXX+64n-1" vendor="Add vendor" comment="Contact TBD"/> -->
160-
<ids type="opcode" start="6656" end="65535" comment="Opcode range reservable for future use by vendors"/>
160+
<ids type="opcode" start="6720" end="65535" comment="Opcode range reservable for future use by vendors"/>
161161
<!-- End reservations of opcodes -->
162162

163163

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

196196

include/spirv/unified1/spirv.bf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1050,6 +1050,7 @@ namespace Spv
10501050
TileImageColorReadAccessEXT = 4166,
10511051
TileImageDepthReadAccessEXT = 4167,
10521052
TileImageStencilReadAccessEXT = 4168,
1053+
CooperativeMatrixLayoutsARM = 4201,
10531054
FragmentShadingRateKHR = 4422,
10541055
SubgroupBallotKHR = 4423,
10551056
DrawParameters = 4427,
@@ -1213,6 +1214,7 @@ namespace Spv
12131214
DotProductKHR = 6019,
12141215
RayCullMaskKHR = 6020,
12151216
CooperativeMatrixKHR = 6022,
1217+
ReplicatedCompositesEXT = 6024,
12161218
BitInstructions = 6025,
12171219
GroupNonUniformRotateKHR = 6026,
12181220
FloatControls2 = 6029,
@@ -1365,6 +1367,8 @@ namespace Spv
13651367
{
13661368
RowMajorKHR = 0,
13671369
ColumnMajorKHR = 1,
1370+
RowBlockedInterleavedARM = 4202,
1371+
ColumnBlockedInterleavedARM = 4203,
13681372
}
13691373

13701374
[AllowDuplicates, CRepr] public enum CooperativeMatrixUse
@@ -1780,6 +1784,7 @@ namespace Spv
17801784
OpSubgroupAllEqualKHR = 4430,
17811785
OpGroupNonUniformRotateKHR = 4431,
17821786
OpSubgroupReadInvocationKHR = 4432,
1787+
OpExtInstWithForwardRefsKHR = 4433,
17831788
OpTraceRayKHR = 4445,
17841789
OpExecuteCallableKHR = 4446,
17851790
OpConvertUToAccelerationStructureKHR = 4447,
@@ -1802,6 +1807,9 @@ namespace Spv
18021807
OpCooperativeMatrixStoreKHR = 4458,
18031808
OpCooperativeMatrixMulAddKHR = 4459,
18041809
OpCooperativeMatrixLengthKHR = 4460,
1810+
OpConstantCompositeReplicateEXT = 4461,
1811+
OpSpecConstantCompositeReplicateEXT = 4462,
1812+
OpCompositeConstructReplicateEXT = 4463,
18051813
OpTypeRayQueryKHR = 4472,
18061814
OpRayQueryInitializeKHR = 4473,
18071815
OpRayQueryTerminateKHR = 4474,

0 commit comments

Comments
 (0)