Skip to content

Commit 5b2ed7b

Browse files
AnastaZIukAnastaZIuk
committed
Merge branch 'main' of github.com:KhronosGroup/SPIRV-Headers into header_4_hlsl
2 parents 2c85dc0 + a380cd2 commit 5b2ed7b

File tree

23 files changed

+187
-63
lines changed

23 files changed

+187
-63
lines changed

‎BUILD.bazel‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ cc_library(
133133
"include/spirv/unified1/GLSL.std.450.h",
134134
"include/spirv/unified1/NonSemanticClspvReflection.h",
135135
"include/spirv/unified1/NonSemanticDebugPrintf.h",
136+
"include/spirv/unified1/NonSemanticShaderDebugInfo100.h",
136137
"include/spirv/unified1/NonSemanticVkspReflection.h",
137138
"include/spirv/unified1/OpenCL.std.h",
138139
],

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
2525
# MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
2626
cmake_minimum_required(VERSION 3.14)
27-
project(SPIRV-Headers LANGUAGES CXX VERSION 1.5.5)
27+
project(SPIRV-Headers LANGUAGES C CXX VERSION 1.5.5)
2828

2929
if (CMAKE_VERSION VERSION_LESS "3.21")
3030
# https://cmake.org/cmake/help/latest/variable/PROJECT_IS_TOP_LEVEL.html

‎include/spirv/spir-v.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@
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"/>
9797
<id value="44" vendor="Robert Konrad" tool="Kongruent" comment="Contact Robert Konrad, https://github.com/Kode/Kongruent"/>
9898
<id value="45" vendor="Kitsunebi Games" tool="Nuvk SPIR-V Emitter and DLSL compiler" comment="Contact Luna Nielsen, [email protected], https://github.com/Inochi2D/nuvk"/>
99-
<unused start="46" end="0xFFFF" comment="Tool ID range reservable for future use by vendors"/>
99+
<id value="46" vendor="Nintendo" comment="Contact Steve Urquhart, [email protected]"/>
100+
<unused start="47" end="0xFFFF" comment="Tool ID range reservable for future use by vendors"/>
100101
</ids>
101102

102103
<!-- SECTION: SPIR-V Opcodes and Enumerants -->

‎include/spirv/unified1/spirv.bf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//
1313
// MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS
1414
// STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND
15-
// HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
15+
// HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
1616
//
1717
// THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
1818
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

‎include/spirv/unified1/spirv.core.grammar.json‎

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4450,6 +4450,7 @@
44504450
"capabilities" : [
44514451
"UntypedPointersKHR"
44524452
],
4453+
"provisional" : true,
44534454
"version" : "None",
44544455
"operands" : [
44554456
{ "kind" : "IdResult" },
@@ -4461,6 +4462,7 @@
44614462
"class" : "Memory",
44624463
"opcode" : 4418,
44634464
"capabilities" : [ "UntypedPointersKHR" ],
4465+
"provisional" : true,
44644466
"version" : "None",
44654467
"operands" : [
44664468
{ "kind" : "IdResultType" },
@@ -4475,6 +4477,7 @@
44754477
"class" : "Memory",
44764478
"opcode" : 4419,
44774479
"capabilities" : [ "UntypedPointersKHR" ],
4480+
"provisional" : true,
44784481
"version" : "None",
44794482
"operands" : [
44804483
{ "kind" : "IdResultType" },
@@ -4489,6 +4492,7 @@
44894492
"class" : "Memory",
44904493
"opcode" : 4420,
44914494
"capabilities" : [ "UntypedPointersKHR" ],
4495+
"provisional" : true,
44924496
"version" : "None",
44934497
"operands" : [
44944498
{ "kind" : "IdResultType" },
@@ -4529,6 +4533,7 @@
45294533
"class" : "Memory",
45304534
"opcode" : 4423,
45314535
"capabilities" : [ "UntypedPointersKHR" ],
4536+
"provisional" : true,
45324537
"version" : "None",
45334538
"operands" : [
45344539
{ "kind" : "IdResultType" },
@@ -4544,6 +4549,7 @@
45444549
"class" : "Memory",
45454550
"opcode" : 4424,
45464551
"capabilities" : [ "UntypedPointersKHR" ],
4552+
"provisional" : true,
45474553
"version" : "None",
45484554
"operands" : [
45494555
{ "kind" : "IdResultType" },
@@ -4559,6 +4565,7 @@
45594565
"class" : "Memory",
45604566
"opcode" : 4425,
45614567
"capabilities" : [ "UntypedPointersKHR" ],
4568+
"provisional" : true,
45624569
"version" : "None",
45634570
"operands" : [
45644571
{ "kind" : "IdResultType" },
@@ -4573,6 +4580,7 @@
45734580
"class" : "Memory",
45744581
"opcode" : 4426,
45754582
"capabilities" : [ "UntypedPointersKHR" ],
4583+
"provisional" : true,
45764584
"version" : "None",
45774585
"operands" : [
45784586
{ "kind" : "IdRef", "name" : "'Pointer Type'" },
@@ -5373,6 +5381,7 @@
53735381
{ "kind" : "IdRef", "name": "'Node Index'" }
53745382
],
53755383
"capabilities" : [ "ShaderEnqueueAMDX" ],
5384+
"provisional" : true,
53765385
"version" : "None"
53775386
},
53785387
{
@@ -5383,6 +5392,7 @@
53835392
{ "kind" : "IdRef", "name": "'Payload Array'" }
53845393
],
53855394
"capabilities" : [ "ShaderEnqueueAMDX" ],
5395+
"provisional" : true,
53865396
"version" : "None"
53875397
},
53885398
{
@@ -5394,6 +5404,7 @@
53945404
{ "kind" : "IdRef", "name": "'Payload Type'" }
53955405
],
53965406
"capabilities" : [ "ShaderEnqueueAMDX" ],
5407+
"provisional" : true,
53975408
"version" : "None"
53985409
},
53995410
{
@@ -5406,6 +5417,7 @@
54065417
{ "kind" : "IdRef", "name": "'Payload'" }
54075418
],
54085419
"capabilities" : [ "ShaderEnqueueAMDX" ],
5420+
"provisional" : true,
54095421
"version" : "None"
54105422
},
54115423
{
@@ -5418,6 +5430,7 @@
54185430
{ "kind" : "IdRef", "name": "'Payload Array'" }
54195431
],
54205432
"capabilities" : [ "ShaderEnqueueAMDX" ],
5433+
"provisional" : true,
54215434
"version" : "None"
54225435
},
54235436
{
@@ -5431,6 +5444,7 @@
54315444
{ "kind" : "IdRef", "name": "'Node Index'" }
54325445
],
54335446
"capabilities" : [ "ShaderEnqueueAMDX" ],
5447+
"provisional" : true,
54345448
"version": "None"
54355449
},
54365450
{
@@ -5442,6 +5456,7 @@
54425456
{ "kind" : "LiteralString", "name": "'Literal String'" }
54435457
],
54445458
"capabilities" : [ "ShaderEnqueueAMDX" ],
5459+
"provisional" : true,
54455460
"version": "None"
54465461
},
54475462
{
@@ -5453,6 +5468,7 @@
54535468
{ "kind" : "LiteralString", "name": "'Literal String'" }
54545469
],
54555470
"capabilities" : [ "ShaderEnqueueAMDX" ],
5471+
"provisional" : true,
54565472
"version": "None"
54575473
},
54585474
{
@@ -6970,7 +6986,6 @@
69706986
"class" : "@exclude",
69716987
"opcode" : 5609,
69726988
"operands" : [
6973-
{ "kind" : "IdResultType" },
69746989
{ "kind" : "IdResult" },
69756990
{ "kind" : "LiteralString", "name" : "'Asm target'" }
69766991
],
@@ -11610,6 +11625,7 @@
1161011625
"enumerant" : "CoalescingAMDX",
1161111626
"value" : 5069,
1161211627
"capabilities" : [ "ShaderEnqueueAMDX" ],
11628+
"provisional" : true,
1161311629
"version" : "None"
1161411630
},
1161511631
{
@@ -11619,6 +11635,7 @@
1161911635
"parameters" : [
1162011636
{ "kind" : "IdRef", "name" : "'Is Entry'" }
1162111637
],
11638+
"provisional" : true,
1162211639
"version" : "None"
1162311640
},
1162411641
{
@@ -11628,6 +11645,7 @@
1162811645
"parameters" : [
1162911646
{ "kind" : "IdRef", "name" : "'Number of recursions'" }
1163011647
],
11648+
"provisional" : true,
1163111649
"version" : "None"
1163211650
},
1163311651
{
@@ -11639,6 +11657,7 @@
1163911657
{ "kind" : "IdRef", "name" : "'y size'" },
1164011658
{ "kind" : "IdRef", "name" : "'z size'" }
1164111659
],
11660+
"provisional" : true,
1164211661
"version" : "None"
1164311662
},
1164411663
{
@@ -11648,6 +11667,7 @@
1164811667
"parameters" : [
1164911668
{ "kind" : "IdRef", "name" : "'Shader Index'" }
1165011669
],
11670+
"provisional" : true,
1165111671
"version" : "None"
1165211672
},
1165311673
{
@@ -11659,6 +11679,7 @@
1165911679
{ "kind" : "IdRef", "name" : "'y size'" },
1166011680
{ "kind" : "IdRef", "name" : "'z size'" }
1166111681
],
11682+
"provisional" : true,
1166211683
"version" : "None"
1166311684
},
1166411685
{
@@ -11723,6 +11744,7 @@
1172311744
{ "kind" : "IdRef", "name" : "'Node Name'" },
1172411745
{ "kind" : "IdRef", "name" : "'Shader Index'" }
1172511746
],
11747+
"provisional" : true,
1172611748
"version" : "None"
1172711749
},
1172811750
{
@@ -12066,6 +12088,7 @@
1206612088
"enumerant" : "NodePayloadAMDX",
1206712089
"value" : 5068,
1206812090
"capabilities" : [ "ShaderEnqueueAMDX" ],
12091+
"provisional" : true,
1206912092
"version" : "None"
1207012093
},
1207112094
{
@@ -13409,6 +13432,7 @@
1340913432
"parameters" : [
1341013433
{ "kind" : "IdRef", "name" : "'Payload Type'" }
1341113434
],
13435+
"provisional" : true,
1341213436
"version" : "None"
1341313437
},
1341413438
{
@@ -13418,12 +13442,14 @@
1341813442
"parameters" : [
1341913443
{ "kind" : "IdRef", "name" : "'Max number of payloads'" }
1342013444
],
13445+
"provisional" : true,
1342113446
"version" : "None"
1342213447
},
1342313448
{
1342413449
"enumerant" : "TrackFinishWritingAMDX",
1342513450
"value" : 5078,
1342613451
"capabilities" : [ "ShaderEnqueueAMDX" ],
13452+
"provisional" : true,
1342713453
"version" : "None"
1342813454
},
1342913455
{
@@ -13433,6 +13459,7 @@
1343313459
"parameters" : [
1343413460
{ "kind" : "IdRef", "name" : "'Node Name'" }
1343513461
],
13462+
"provisional" : true,
1343613463
"version" : "None"
1343713464
},
1343813465
{
@@ -13442,12 +13469,14 @@
1344213469
"parameters" : [
1344313470
{ "kind" : "IdRef", "name" : "'Base Index'" }
1344413471
],
13472+
"provisional" : true,
1344513473
"version" : "None"
1344613474
},
1344713475
{
1344813476
"enumerant" : "PayloadNodeSparseArrayAMDX",
1344913477
"value" : 5099,
1345013478
"capabilities" : [ "ShaderEnqueueAMDX" ],
13479+
"provisional" : true,
1345113480
"version" : "None"
1345213481
},
1345313482
{
@@ -13457,12 +13486,14 @@
1345713486
"parameters" : [
1345813487
{ "kind" : "IdRef", "name" : "'Array Size'" }
1345913488
],
13489+
"provisional" : true,
1346013490
"version" : "None"
1346113491
},
1346213492
{
1346313493
"enumerant" : "PayloadDispatchIndirectAMDX",
1346413494
"value" : 5105,
1346513495
"capabilities" : [ "ShaderEnqueueAMDX" ],
13496+
"provisional" : true,
1346613497
"version" : "None"
1346713498
},
1346813499
{
@@ -14544,12 +14575,14 @@
1454414575
"enumerant" : "RemainingRecursionLevelsAMDX",
1454514576
"value" : 5021,
1454614577
"capabilities" : [ "ShaderEnqueueAMDX" ],
14578+
"provisional" : true,
1454714579
"version" : "None"
1454814580
},
1454914581
{
1455014582
"enumerant" : "ShaderIndexAMDX",
1455114583
"value" : 5073,
1455214584
"capabilities" : [ "ShaderEnqueueAMDX" ],
14585+
"provisional" : true,
1455314586
"version" : "None"
1455414587
},
1455514588
{
@@ -15640,6 +15673,7 @@
1564015673
"enumerant" : "UntypedPointersKHR",
1564115674
"value" : 4473,
1564215675
"extensions" : [ "SPV_KHR_untyped_pointers" ],
15676+
"provisional" : true,
1564315677
"version" : "None"
1564415678
},
1564515679
{
@@ -15733,6 +15767,7 @@
1573315767
"value" : 5067,
1573415768
"capabilities" : [ "Shader" ],
1573515769
"extensions" : [ "SPV_AMDX_shader_enqueue" ],
15770+
"provisional" : true,
1573615771
"version" : "None"
1573715772
},
1573815773
{

‎include/spirv/unified1/spirv.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//
1313
// MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS
1414
// STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND
15-
// HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
15+
// HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
1616
//
1717
// THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
1818
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

‎include/spirv/unified1/spirv.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
**
1414
** MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS
1515
** STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND
16-
** HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
16+
** HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
1717
**
1818
** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
1919
** OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -2795,7 +2795,7 @@ inline void SpvHasResultAndType(SpvOp opcode, bool *hasResult, bool *hasResultTy
27952795
case SpvOpUMul32x16INTEL: *hasResult = true; *hasResultType = true; break;
27962796
case SpvOpConstantFunctionPointerINTEL: *hasResult = true; *hasResultType = true; break;
27972797
case SpvOpFunctionPointerCallINTEL: *hasResult = true; *hasResultType = true; break;
2798-
case SpvOpAsmTargetINTEL: *hasResult = true; *hasResultType = true; break;
2798+
case SpvOpAsmTargetINTEL: *hasResult = true; *hasResultType = false; break;
27992799
case SpvOpAsmINTEL: *hasResult = true; *hasResultType = true; break;
28002800
case SpvOpAsmCallINTEL: *hasResult = true; *hasResultType = true; break;
28012801
case SpvOpAtomicFMinEXT: *hasResult = true; *hasResultType = true; break;

‎include/spirv/unified1/spirv.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//
1313
// MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS
1414
// STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND
15-
// HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
15+
// HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
1616
//
1717
// THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
1818
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -2791,7 +2791,7 @@ inline void HasResultAndType(Op opcode, bool *hasResult, bool *hasResultType) {
27912791
case OpUMul32x16INTEL: *hasResult = true; *hasResultType = true; break;
27922792
case OpConstantFunctionPointerINTEL: *hasResult = true; *hasResultType = true; break;
27932793
case OpFunctionPointerCallINTEL: *hasResult = true; *hasResultType = true; break;
2794-
case OpAsmTargetINTEL: *hasResult = true; *hasResultType = true; break;
2794+
case OpAsmTargetINTEL: *hasResult = true; *hasResultType = false; break;
27952795
case OpAsmINTEL: *hasResult = true; *hasResultType = true; break;
27962796
case OpAsmCallINTEL: *hasResult = true; *hasResultType = true; break;
27972797
case OpAtomicFMinEXT: *hasResult = true; *hasResultType = true; break;

‎include/spirv/unified1/spirv.hpp11‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//
1313
// MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS
1414
// STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND
15-
// HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
15+
// HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
1616
//
1717
// THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
1818
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -2791,7 +2791,7 @@ inline void HasResultAndType(Op opcode, bool *hasResult, bool *hasResultType) {
27912791
case Op::OpUMul32x16INTEL: *hasResult = true; *hasResultType = true; break;
27922792
case Op::OpConstantFunctionPointerINTEL: *hasResult = true; *hasResultType = true; break;
27932793
case Op::OpFunctionPointerCallINTEL: *hasResult = true; *hasResultType = true; break;
2794-
case Op::OpAsmTargetINTEL: *hasResult = true; *hasResultType = true; break;
2794+
case Op::OpAsmTargetINTEL: *hasResult = true; *hasResultType = false; break;
27952795
case Op::OpAsmINTEL: *hasResult = true; *hasResultType = true; break;
27962796
case Op::OpAsmCallINTEL: *hasResult = true; *hasResultType = true; break;
27972797
case Op::OpAtomicFMinEXT: *hasResult = true; *hasResultType = true; break;

‎include/spirv/unified1/spirv.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"",
2121
"MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS",
2222
"STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND",
23-
"HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/ ",
23+
"HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/",
2424
"",
2525
"THE MATERIALS ARE PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS",
2626
"OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",

0 commit comments

Comments
 (0)