Skip to content

Commit 057230d

Browse files
Przemog1Przemog1
committed
Merge branch 'main' of https://github.com/KhronosGroup/SPIRV-Headers into header_4_hlsl
2 parents 458f834 + 0a7f626 commit 057230d

18 files changed

Lines changed: 3231 additions & 827 deletions

‎.github/workflows/presubmit.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
validate_json:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v5
11+
- uses: actions/checkout@v6
1212
- name: Validate
1313
run: python3 tools/check_grammar/check_grammar.py include/spirv/unified1/*.json
1414

@@ -19,7 +19,7 @@ jobs:
1919
matrix:
2020
os: [ubuntu-latest, macos-latest, windows-latest]
2121
steps:
22-
- uses: actions/checkout@v5
22+
- uses: actions/checkout@v6
2323
- name: Install Ubuntu packages
2424
if: matrix.os == 'ubuntu-latest'
2525
run: sudo apt install -y dos2unix
@@ -59,7 +59,7 @@ jobs:
5959
test_cmake_min_required:
6060
runs-on: ubuntu-latest
6161
steps:
62-
- uses: actions/checkout@v5
62+
- uses: actions/checkout@v6
6363
- uses: lukka/get-cmake@latest
6464
with:
6565
cmakeVersion: 3.14.0
@@ -71,7 +71,7 @@ jobs:
7171
test_cmake_latest:
7272
runs-on: ubuntu-latest
7373
steps:
74-
- uses: actions/checkout@v5
74+
- uses: actions/checkout@v6
7575
- uses: lukka/get-cmake@latest
7676
- name: CMake build
7777
run: |
@@ -81,7 +81,7 @@ jobs:
8181
add_subdirectory:
8282
runs-on: ubuntu-latest
8383
steps:
84-
- uses: actions/checkout@v5
84+
- uses: actions/checkout@v6
8585
- uses: lukka/get-cmake@latest
8686
with:
8787
cmakeVersion: 3.15.0
@@ -93,7 +93,7 @@ jobs:
9393
find_package:
9494
runs-on: ubuntu-latest
9595
steps:
96-
- uses: actions/checkout@v5
96+
- uses: actions/checkout@v6
9797
- uses: lukka/get-cmake@latest
9898
with:
9999
cmakeVersion: 3.15.0
@@ -109,7 +109,7 @@ jobs:
109109
find_pkg_config:
110110
runs-on: ubuntu-latest
111111
steps:
112-
- uses: actions/checkout@v5
112+
- uses: actions/checkout@v6
113113
- uses: lukka/get-cmake@latest
114114
with:
115115
cmakeVersion: 3.15.0
@@ -126,7 +126,7 @@ jobs:
126126
find_pkg_config_absolute:
127127
runs-on: ubuntu-latest
128128
steps:
129-
- uses: actions/checkout@v5
129+
- uses: actions/checkout@v6
130130
- uses: lukka/get-cmake@latest
131131
with:
132132
cmakeVersion: 3.15.0
@@ -148,6 +148,6 @@ jobs:
148148
container: khronosgroup/docker-images@sha256:724f67d8562445523644abf017d5d192b369fafc122de75e9d26792c649821a0
149149

150150
steps:
151-
- uses: actions/checkout@v5
151+
- uses: actions/checkout@v6
152152
- name: REUSE license checker
153153
run: reuse lint

‎include/spirv/spir-v.xml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@
8181
<id value="46" vendor="Nintendo" comment="Contact Steve Urquhart, steve.urquhart@ntd.nintendo.com"/>
8282
<id value="47" vendor="ARM" comment="Contact Christopher Gautier, christopher.gautier@arm.com"/>
8383
<id value="48" vendor="Goopax" comment="Contact Ingo Josopait, josopait@goopax.com"/>
84-
<unused start="49" end="0xFFFF" comment="Tool ID range reservable for future use by vendors"/>
84+
<id value="49" vendor="Icyllis Milica" tool="Arc3D Shader Compiler" comment="Contact Icyllis Milica, https://github.com/BloCamLimb/Arc3D"/>
85+
<unused start="50" end="0xFFFF" comment="Tool ID range reservable for future use by vendors"/>
8586
</ids>
8687

8788
<!-- SECTION: SPIR-V Opcodes and Enumerants -->
@@ -139,13 +140,14 @@
139140
<ids type="opcode" start="6592" end="6655" vendor="Saarland University" comment="Contact devillers@cg.uni-saarland.de"/>
140141
<ids type="opcode" start="6656" end="6719" vendor="Meta" comment="Contact dunfanlu@meta.com"/>
141142
<ids type="opcode" start="6720" end="6783" vendor="MediaTek" comment="Contact samuel.huang@mediatek.com"/>
143+
<ids type="opcode" start="6784" end="6911" vendor="Intel" comment="Contact mariusz.merecki@intel.com"/>
142144
<!-- Opcode enumerants to reserve for future use. To get a block, allocate
143145
multiples of 64 starting at the lowest available point in this
144146
block and add a corresponding <ids> tag immediately above. Make
145147
sure to fill in the vendor attribute, and preferably add a contact
146148
person/address in a comment attribute. -->
147149
<!-- Example new block: <ids type="opcode" start="XXXX" end="XXXX+64n-1" vendor="Add vendor" comment="Contact TBD"/> -->
148-
<ids type="opcode" start="6784" end="65535" comment="Opcode range reservable for future use by vendors"/>
150+
<ids type="opcode" start="6912" end="65535" comment="Opcode range reservable for future use by vendors"/>
149151
<!-- End reservations of opcodes -->
150152

151153

@@ -173,13 +175,14 @@
173175
<ids type="enumerant" start="6592" end="6655" vendor="Saarland University" comment="Contact devillers@cg.uni-saarland.de"/>
174176
<ids type="enumerant" start="6656" end="6719" vendor="Meta" comment="Contact dunfanlu@meta.com"/>
175177
<ids type="enumerant" start="6720" end="6783" vendor="MediaTek" comment="Contact samuel.huang@mediatek.com"/>
178+
<ids type="enumerant" start="6784" end="6911" vendor="Intel" comment="Contact mariusz.merecki@intel.com"/>
176179
<!-- Enumerants to reserve for future use. To get a block, allocate
177180
multiples of 64 starting at the lowest available point in this
178181
block and add a corresponding <ids> tag immediately above. Make
179182
sure to fill in the vendor attribute, and preferably add a contact
180183
person/address in a comment attribute. -->
181184
<!-- Example new block: <ids type="enumerant" start="XXXX" end="XXXX+64n-1" vendor="Add vendor" comment="Contact TBD"/> -->
182-
<ids type="enumerant" start="6784" end="4294967295" comment="Enumerant range reservable for future use by vendors"/>
185+
<ids type="enumerant" start="6912" end="4294967295" comment="Enumerant range reservable for future use by vendors"/>
183186
<!-- End reservations of enumerants -->
184187

185188

‎include/spirv/unified1/TOSA.001000.1.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ extern "C" {
99
#endif
1010

1111
enum {
12-
TOSAVersion = 1000000,
12+
TOSAVersion = 1000001,
1313
TOSAVersion_BitWidthPadding = 0x7fffffff
1414
};
1515
enum {

‎include/spirv/unified1/extinst.debuginfo.grammar.json‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -432,35 +432,35 @@
432432
"enumerants" : [
433433
{
434434
"enumerant" : "Unspecified",
435-
"value" : "0"
435+
"value" : 0
436436
},
437437
{
438438
"enumerant" : "Address",
439-
"value" : "1"
439+
"value" : 1
440440
},
441441
{
442442
"enumerant" : "Boolean",
443-
"value" : "2"
443+
"value" : 2
444444
},
445445
{
446446
"enumerant" : "Float",
447-
"value" : "4"
447+
"value" : 4
448448
},
449449
{
450450
"enumerant" : "Signed",
451-
"value" : "5"
451+
"value" : 5
452452
},
453453
{
454454
"enumerant" : "SignedChar",
455-
"value" : "6"
455+
"value" : 6
456456
},
457457
{
458458
"enumerant" : "Unsigned",
459-
"value" : "7"
459+
"value" : 7
460460
},
461461
{
462462
"enumerant" : "UnsignedChar",
463-
"value" : "8"
463+
"value" : 8
464464
}
465465
]
466466
},
@@ -470,15 +470,15 @@
470470
"enumerants" : [
471471
{
472472
"enumerant" : "Class",
473-
"value" : "0"
473+
"value" : 0
474474
},
475475
{
476476
"enumerant" : "Structure",
477-
"value" : "1"
477+
"value" : 1
478478
},
479479
{
480480
"enumerant" : "Union",
481-
"value" : "2"
481+
"value" : 2
482482
}
483483
]
484484
},
@@ -488,15 +488,15 @@
488488
"enumerants" : [
489489
{
490490
"enumerant" : "ConstType",
491-
"value" : "0"
491+
"value" : 0
492492
},
493493
{
494494
"enumerant" : "VolatileType",
495-
"value" : "1"
495+
"value" : 1
496496
},
497497
{
498498
"enumerant" : "RestrictType",
499-
"value" : "2"
499+
"value" : 2
500500
}
501501
]
502502
},
@@ -506,46 +506,46 @@
506506
"enumerants" : [
507507
{
508508
"enumerant" : "Deref",
509-
"value" : "0"
509+
"value" : 0
510510
},
511511
{
512512
"enumerant" : "Plus",
513-
"value" : "1"
513+
"value" : 1
514514
},
515515
{
516516
"enumerant" : "Minus",
517-
"value" : "2"
517+
"value" : 2
518518
},
519519
{
520520
"enumerant" : "PlusUconst",
521-
"value" : "3",
521+
"value" : 3,
522522
"parameters" : [
523523
{ "kind" : "LiteralInteger" }
524524
]
525525
},
526526
{
527527
"enumerant" : "BitPiece",
528-
"value" : "4",
528+
"value" : 4,
529529
"parameters" : [
530530
{ "kind" : "LiteralInteger" },
531531
{ "kind" : "LiteralInteger" }
532532
]
533533
},
534534
{
535535
"enumerant" : "Swap",
536-
"value" : "5"
536+
"value" : 5
537537
},
538538
{
539539
"enumerant" : "Xderef",
540-
"value" : "6"
540+
"value" : 6
541541
},
542542
{
543543
"enumerant" : "StackValue",
544-
"value" : "7"
544+
"value" : 7
545545
},
546546
{
547547
"enumerant" : "Constu",
548-
"value" : "8",
548+
"value" : 8,
549549
"parameters" : [
550550
{ "kind" : "LiteralInteger" }
551551
]

0 commit comments

Comments
 (0)