Skip to content

Commit 6a74600

Browse files
committed
Merge branch 'main' of github.com:KhronosGroup/SPIRV-Headers into header_4_hlsl
2 parents b407e38 + aa6cef1 commit 6a74600

File tree

15 files changed

+763
-212
lines changed

15 files changed

+763
-212
lines changed

include/spirv/spir-v.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
<id value="37" vendor="heroseh" tool="Hero C Compiler" comment="https://github.com/heroseh/hcc"/>
9191
<id value="38" vendor="Meta" tool="SparkSL" comment="Contact Dunfan Lu, [email protected], https://sparkar.facebook.com/ar-studio/learn/sparksl/sparksl-overview"/>
9292
<id value="39" vendor="SirLynix" tool="Nazara ShaderLang Compiler" comment="Contact Jérôme Leclercq, https://github.com/NazaraEngine/ShaderLang"/>
93-
<id value="40" vendor="NVIDIA" tool="Slang Compiler" comment="Contact Theresa Foley, [email protected], https://github.com/shader-slang/slang/"/>
93+
<id value="40" vendor="Khronos" tool="Slang Compiler" comment="https://shader-slang.org"/>
9494
<id value="41" vendor="Zig Software Foundation" tool="Zig Compiler" comment="Contact Robin Voetter, https://github.com/Snektron"/>
9595
<id value="42" vendor="Rendong Liang" tool="spq" comment="Contact Rendong Liang, [email protected], https://github.com/PENGUINLIONG/spq-rs"/>
9696
<id value="43" vendor="LLVM" tool="LLVM SPIR-V Backend" comment="Contact Michal Paszkowski, [email protected], https://github.com/llvm/llvm-project/tree/main/llvm/lib/Target/SPIRV"/>

include/spirv/unified1/NonSemanticClspvReflection.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ extern "C" {
3333
#endif
3434

3535
enum {
36-
NonSemanticClspvReflectionRevision = 6,
36+
NonSemanticClspvReflectionRevision = 7,
3737
NonSemanticClspvReflectionRevision_BitWidthPadding = 0x7fffffff
3838
};
3939

@@ -79,6 +79,7 @@ enum NonSemanticClspvReflectionInstructions {
7979
NonSemanticClspvReflectionPrintfBufferStorageBuffer = 39,
8080
NonSemanticClspvReflectionPrintfBufferPointerPushConstant = 40,
8181
NonSemanticClspvReflectionNormalizedSamplerMaskPushConstant = 41,
82+
NonSemanticClspvReflectionWorkgroupVariableSize = 42,
8283
NonSemanticClspvReflectionInstructionsMax = 0x7fffffff
8384
};
8485

include/spirv/unified1/extinst.nonsemantic.clspvreflection.grammar.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"revision" : 6,
2+
"revision" : 7,
33
"instructions" : [
44
{
55
"opname" : "Kernel",
@@ -405,6 +405,14 @@
405405
{ "kind" : "IdRef", "name" : "Offset" },
406406
{ "kind" : "IdRef", "name" : "Size" }
407407
]
408+
},
409+
{
410+
"opname" : "WorkgroupVariableSize",
411+
"opcode" : 42,
412+
"operands" : [
413+
{ "kind" : "IdRef", "name" : "Variable" },
414+
{ "kind" : "IdRef", "name" : "Size" }
415+
]
408416
}
409417
],
410418
"operand_kinds" : [

include/spirv/unified1/spirv.bf

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,8 @@ namespace Spv
173173
SignedZeroInfNanPreserve = 4461,
174174
RoundingModeRTE = 4462,
175175
RoundingModeRTZ = 4463,
176+
NonCoherentTileAttachmentReadQCOM = 4489,
177+
TileShadingRateQCOM = 4490,
176178
EarlyAndLateFragmentTestsAMD = 5017,
177179
StencilRefReplacingEXT = 5027,
178180
CoalescingAMDX = 5069,
@@ -243,6 +245,7 @@ namespace Spv
243245
Image = 11,
244246
StorageBuffer = 12,
245247
TileImageEXT = 4172,
248+
TileAttachmentQCOM = 4491,
246249
NodePayloadAMDX = 5068,
247250
CallableDataKHR = 5328,
248251
CallableDataNV = 5328,
@@ -387,9 +390,15 @@ namespace Spv
387390
Float = 14,
388391
UnormInt24 = 15,
389392
UnormInt101010_2 = 16,
393+
UnormInt10X6EXT = 17,
390394
UnsignedIntRaw10EXT = 19,
391395
UnsignedIntRaw12EXT = 20,
392396
UnormInt2_101010EXT = 21,
397+
UnsignedInt10X6EXT = 22,
398+
UnsignedInt12X4EXT = 23,
399+
UnsignedInt14X2EXT = 24,
400+
UnormInt12X4EXT = 25,
401+
UnormInt14X2EXT = 26,
393402
Max = 0x7fffffff,
394403
}
395404

@@ -731,6 +740,9 @@ namespace Spv
731740
DeviceIndex = 4438,
732741
ViewIndex = 4440,
733742
ShadingRateKHR = 4444,
743+
TileOffsetQCOM = 4492,
744+
TileDimensionQCOM = 4493,
745+
TileApronSizeQCOM = 4494,
734746
BaryCoordNoPerspAMD = 4992,
735747
BaryCoordNoPerspCentroidAMD = 4993,
736748
BaryCoordNoPerspSampleAMD = 4994,
@@ -1133,6 +1145,7 @@ namespace Spv
11331145
TextureSampleWeightedQCOM = 4484,
11341146
TextureBoxFilterQCOM = 4485,
11351147
TextureBlockMatchQCOM = 4486,
1148+
TileShadingQCOM = 4495,
11361149
TextureBlockMatch2QCOM = 4498,
11371150
Float16ImageAMD = 5008,
11381151
ImageGatherBiasLodAMD = 5009,
@@ -1143,6 +1156,9 @@ namespace Spv
11431156
ShaderClockKHR = 5055,
11441157
ShaderEnqueueAMDX = 5067,
11451158
QuadControlKHR = 5087,
1159+
BFloat16TypeKHR = 5116,
1160+
BFloat16DotProductKHR = 5117,
1161+
BFloat16CooperativeMatrixKHR = 5118,
11461162
SampleMaskOverrideCoverageNV = 5249,
11471163
GeometryShaderPassthroughNV = 5251,
11481164
ShaderViewportIndexLayerEXT = 5254,
@@ -1291,6 +1307,7 @@ namespace Spv
12911307
ArithmeticFenceEXT = 6144,
12921308
FPGAClusterAttributesV2INTEL = 6150,
12931309
FPGAKernelAttributesv2INTEL = 6161,
1310+
TaskSequenceINTEL = 6162,
12941311
FPMaxErrorINTEL = 6169,
12951312
FPGALatencyControlINTEL = 6171,
12961313
FPGAArgumentInterfacesINTEL = 6174,
@@ -1301,7 +1318,9 @@ namespace Spv
13011318
Subgroup2DBlockTransformINTEL = 6229,
13021319
Subgroup2DBlockTransposeINTEL = 6230,
13031320
SubgroupMatrixMultiplyAccumulateINTEL = 6236,
1321+
TernaryBitwiseFunctionINTEL = 6241,
13041322
GroupUniformArithmeticKHR = 6400,
1323+
TensorFloat32RoundingINTEL = 6425,
13051324
MaskedGatherScatterINTEL = 6427,
13061325
CacheControlsINTEL = 6441,
13071326
RegisterLimitsINTEL = 6460,
@@ -1597,6 +1616,7 @@ namespace Spv
15971616

15981617
[AllowDuplicates, CRepr] public enum FPEncoding
15991618
{
1619+
BFloat16KHR = 0,
16001620
Max = 0x7fffffff,
16011621
}
16021622

@@ -2412,13 +2432,19 @@ namespace Spv
24122432
OpControlBarrierArriveINTEL = 6142,
24132433
OpControlBarrierWaitINTEL = 6143,
24142434
OpArithmeticFenceEXT = 6145,
2435+
OpTaskSequenceCreateINTEL = 6163,
2436+
OpTaskSequenceAsyncINTEL = 6164,
2437+
OpTaskSequenceGetINTEL = 6165,
2438+
OpTaskSequenceReleaseINTEL = 6166,
2439+
OpTypeTaskSequenceINTEL = 6199,
24152440
OpSubgroupBlockPrefetchINTEL = 6221,
24162441
OpSubgroup2DBlockLoadINTEL = 6231,
24172442
OpSubgroup2DBlockLoadTransformINTEL = 6232,
24182443
OpSubgroup2DBlockLoadTransposeINTEL = 6233,
24192444
OpSubgroup2DBlockPrefetchINTEL = 6234,
24202445
OpSubgroup2DBlockStoreINTEL = 6235,
24212446
OpSubgroupMatrixMultiplyAccumulateINTEL = 6237,
2447+
OpBitwiseFunctionINTEL = 6242,
24222448
OpGroupIMulKHR = 6401,
24232449
OpGroupFMulKHR = 6402,
24242450
OpGroupBitwiseAndKHR = 6403,
@@ -2427,6 +2453,7 @@ namespace Spv
24272453
OpGroupLogicalAndKHR = 6406,
24282454
OpGroupLogicalOrKHR = 6407,
24292455
OpGroupLogicalXorKHR = 6408,
2456+
OpRoundFToTF32INTEL = 6426,
24302457
OpMaskedGatherINTEL = 6428,
24312458
OpMaskedScatterINTEL = 6429,
24322459
Max = 0x7fffffff,

0 commit comments

Comments
 (0)