Skip to content

Commit c141151

Browse files
AnastaZIukAnastaZIuk
committed
Merge remote-tracking branch 'Khronos/main' into header_4_hlsl
2 parents 057230d + 465055f commit c141151

12 files changed

Lines changed: 567 additions & 59 deletions

File tree

‎include/spirv/spir-v.xml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,13 +141,14 @@
141141
<ids type="opcode" start="6656" end="6719" vendor="Meta" comment="Contact dunfanlu@meta.com"/>
142142
<ids type="opcode" start="6720" end="6783" vendor="MediaTek" comment="Contact samuel.huang@mediatek.com"/>
143143
<ids type="opcode" start="6784" end="6911" vendor="Intel" comment="Contact mariusz.merecki@intel.com"/>
144+
<ids type="opcode" start="6912" end="6975" vendor="Valve" comment="Contact michael.blumenkrantz@gmail.com"/>
144145
<!-- Opcode enumerants to reserve for future use. To get a block, allocate
145146
multiples of 64 starting at the lowest available point in this
146147
block and add a corresponding <ids> tag immediately above. Make
147148
sure to fill in the vendor attribute, and preferably add a contact
148149
person/address in a comment attribute. -->
149150
<!-- Example new block: <ids type="opcode" start="XXXX" end="XXXX+64n-1" vendor="Add vendor" comment="Contact TBD"/> -->
150-
<ids type="opcode" start="6912" end="65535" comment="Opcode range reservable for future use by vendors"/>
151+
<ids type="opcode" start="6976" end="65535" comment="Opcode range reservable for future use by vendors"/>
151152
<!-- End reservations of opcodes -->
152153

153154

@@ -176,13 +177,15 @@
176177
<ids type="enumerant" start="6656" end="6719" vendor="Meta" comment="Contact dunfanlu@meta.com"/>
177178
<ids type="enumerant" start="6720" end="6783" vendor="MediaTek" comment="Contact samuel.huang@mediatek.com"/>
178179
<ids type="enumerant" start="6784" end="6911" vendor="Intel" comment="Contact mariusz.merecki@intel.com"/>
180+
<ids type="enumerant" start="6912" end="6975" vendor="Valve" comment="Contact michael.blumenkrantz@gmail.com"/>
181+
<ids type="enumerant" start="6976" end="7039" vendor="Broadcom" comment="Contact gleese@broadcom.com"/>
179182
<!-- Enumerants to reserve for future use. To get a block, allocate
180183
multiples of 64 starting at the lowest available point in this
181184
block and add a corresponding <ids> tag immediately above. Make
182185
sure to fill in the vendor attribute, and preferably add a contact
183186
person/address in a comment attribute. -->
184187
<!-- Example new block: <ids type="enumerant" start="XXXX" end="XXXX+64n-1" vendor="Add vendor" comment="Contact TBD"/> -->
185-
<ids type="enumerant" start="6912" end="4294967295" comment="Enumerant range reservable for future use by vendors"/>
188+
<ids type="enumerant" start="7040" end="4294967295" comment="Enumerant range reservable for future use by vendors"/>
186189
<!-- End reservations of enumerants -->
187190

188191

@@ -244,7 +247,8 @@
244247
<ids type="FPFastMathMode" start="0" end="15" vendor="Khronos" comment="Reserved FPFastMathMode bits, not available to vendors - see the SPIR-V Specification"/>
245248
<ids type="FPFastMathMode" start="16" end="17" vendor="Intel" comment="Contact michael.kinsner@intel.com"/>
246249
<ids type="FPFastMathMode" start="18" end="18" vendor="khronos" comment="Reserved FPFastMathMode bit, not available to vendors - see SPV_KHR_float_controls2"/>
247-
<ids type="FPFastMathMode" start="19" end="31" comment="Unreserved bits reservable for use by vendors"/>
250+
<ids type="FPFastMathMode" start="19" end="20" vendor="Broadcom" comment="Contact gleese@broadcom.com"/>
251+
<ids type="FPFastMathMode" start="21" end="31" comment="Unreserved bits reservable for use by vendors"/>
248252

249253

250254
<!-- SECTION: SPIR-V Memory Operand Bit Reservations -->

‎include/spirv/unified1/spirv.bf‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -574,6 +574,8 @@ namespace Spv
574574
PayloadNodeSparseArrayAMDX = 5099,
575575
PayloadNodeArraySizeAMDX = 5100,
576576
PayloadDispatchIndirectAMDX = 5105,
577+
ArrayStrideIdEXT = 5124,
578+
OffsetIdEXT = 5125,
577579
OverrideCoverageNV = 5248,
578580
PassthroughNV = 5250,
579581
ViewportRelativeNV = 5252,
@@ -590,8 +592,10 @@ namespace Spv
590592
RestrictPointerEXT = 5355,
591593
AliasedPointer = 5356,
592594
AliasedPointerEXT = 5356,
595+
MemberOffsetNV = 5358,
593596
HitObjectShaderRecordBufferNV = 5386,
594597
HitObjectShaderRecordBufferEXT = 5389,
598+
BankNV = 5397,
595599
BindlessSamplerNV = 5398,
596600
BindlessImageNV = 5399,
597601
BoundSamplerNV = 5400,
@@ -786,6 +790,8 @@ namespace Spv
786790
FragStencilRefEXT = 5014,
787791
RemainingRecursionLevelsAMDX = 5021,
788792
ShaderIndexAMDX = 5073,
793+
SamplerHeapEXT = 5122,
794+
ResourceHeapEXT = 5123,
789795
ViewportMaskNV = 5253,
790796
SecondaryPositionNV = 5257,
791797
SecondaryViewportMaskNV = 5258,
@@ -1060,8 +1066,11 @@ namespace Spv
10601066
InclusiveScan = 1,
10611067
ExclusiveScan = 2,
10621068
ClusteredReduce = 3,
1069+
PartitionedReduceEXT = 6,
10631070
PartitionedReduceNV = 6,
1071+
PartitionedInclusiveScanEXT = 7,
10641072
PartitionedInclusiveScanNV = 7,
1073+
PartitionedExclusiveScanEXT = 8,
10651074
PartitionedExclusiveScanNV = 8,
10661075
Max = 0x7fffffff,
10671076
}
@@ -1221,6 +1230,7 @@ namespace Spv
12211230
BFloat16TypeKHR = 5116,
12221231
BFloat16DotProductKHR = 5117,
12231232
BFloat16CooperativeMatrixKHR = 5118,
1233+
DescriptorHeapEXT = 5128,
12241234
SampleMaskOverrideCoverageNV = 5249,
12251235
GeometryShaderPassthroughNV = 5251,
12261236
ShaderViewportIndexLayerEXT = 5254,
@@ -1238,6 +1248,7 @@ namespace Spv
12381248
ComputeDerivativeGroupQuadsNV = 5288,
12391249
FragmentDensityEXT = 5291,
12401250
ShadingRateNV = 5291,
1251+
GroupNonUniformPartitionedEXT = 5297,
12411252
GroupNonUniformPartitionedNV = 5297,
12421253
ShaderNonUniform = 5301,
12431254
ShaderNonUniformEXT = 5301,
@@ -1294,6 +1305,7 @@ namespace Spv
12941305
RawAccessChainsNV = 5414,
12951306
RayTracingSpheresGeometryNV = 5418,
12961307
RayTracingLinearSweptSpheresGeometryNV = 5419,
1308+
PushConstantBanksNV = 5423,
12971309
LongVectorEXT = 5425,
12981310
Shader64BitIndexingEXT = 5426,
12991311
CooperativeMatrixReductionsNV = 5430,
@@ -1415,6 +1427,10 @@ namespace Spv
14151427
CacheControlsINTEL = 6441,
14161428
RegisterLimitsINTEL = 6460,
14171429
BindlessImagesINTEL = 6528,
1430+
DotProductFloat16AccFloat32VALVE = 6912,
1431+
DotProductFloat16AccFloat16VALVE = 6913,
1432+
DotProductBFloat16AccVALVE = 6914,
1433+
DotProductFloat8AccFloat32VALVE = 6915,
14181434
Max = 0x7fffffff,
14191435
}
14201436

@@ -2208,6 +2224,11 @@ namespace Spv
22082224
OpSpecConstantStringAMDX = 5104,
22092225
OpGroupNonUniformQuadAllKHR = 5110,
22102226
OpGroupNonUniformQuadAnyKHR = 5111,
2227+
OpTypeBufferEXT = 5115,
2228+
OpBufferPointerEXT = 5119,
2229+
OpUntypedImageTexelPointerEXT = 5126,
2230+
OpMemberDecorateIdEXT = 5127,
2231+
OpConstantSizeOfEXT = 5129,
22112232
OpHitObjectRecordHitMotionNV = 5249,
22122233
OpHitObjectRecordHitWithIndexMotionNV = 5250,
22132234
OpHitObjectRecordMissMotionNV = 5251,
@@ -2251,6 +2272,7 @@ namespace Spv
22512272
OpCooperativeMatrixConvertNV = 5293,
22522273
OpEmitMeshTasksEXT = 5294,
22532274
OpSetMeshOutputsEXT = 5295,
2275+
OpGroupNonUniformPartitionEXT = 5296,
22542276
OpGroupNonUniformPartitionNV = 5296,
22552277
OpWritePackedPrimitiveIndices4x8NV = 5299,
22562278
OpFetchMicroTriangleVertexPositionNV = 5300,
@@ -2676,6 +2698,9 @@ namespace Spv
26762698
OpConvertHandleToImageINTEL = 6529,
26772699
OpConvertHandleToSamplerINTEL = 6530,
26782700
OpConvertHandleToSampledImageINTEL = 6531,
2701+
OpFDot2MixAcc32VALVE = 6916,
2702+
OpFDot2MixAcc16VALVE = 6917,
2703+
OpFDot4MixAcc32VALVE = 6918,
26792704
Max = 0x7fffffff,
26802705
}
26812706
}

0 commit comments

Comments
 (0)