Skip to content

Commit 622742f

Browse files
committed
Merge branch 'main' of github.com:KhronosGroup/SPIRV-Headers into header_4_hlsl
2 parents 66e6a49 + 97e96f9 commit 622742f

File tree

10 files changed

+35
-9
lines changed

10 files changed

+35
-9
lines changed

include/spirv/unified1/spirv.bf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2046,6 +2046,7 @@ namespace Spv
20462046
OpGroupNonUniformRotateKHR = 4431,
20472047
OpSubgroupReadInvocationKHR = 4432,
20482048
OpExtInstWithForwardRefsKHR = 4433,
2049+
OpUntypedGroupAsyncCopyKHR = 4434,
20492050
OpTraceRayKHR = 4445,
20502051
OpExecuteCallableKHR = 4446,
20512052
OpConvertUToAccelerationStructureKHR = 4447,

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

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4574,7 +4574,6 @@
45744574
"capabilities" : [
45754575
"UntypedPointersKHR"
45764576
],
4577-
"provisional" : true,
45784577
"version" : "None",
45794578
"operands" : [
45804579
{ "kind" : "IdResult" },
@@ -4586,7 +4585,6 @@
45864585
"class" : "Memory",
45874586
"opcode" : 4418,
45884587
"capabilities" : [ "UntypedPointersKHR" ],
4589-
"provisional" : true,
45904588
"version" : "None",
45914589
"operands" : [
45924590
{ "kind" : "IdResultType" },
@@ -4601,7 +4599,6 @@
46014599
"class" : "Memory",
46024600
"opcode" : 4419,
46034601
"capabilities" : [ "UntypedPointersKHR" ],
4604-
"provisional" : true,
46054602
"version" : "None",
46064603
"operands" : [
46074604
{ "kind" : "IdResultType" },
@@ -4616,7 +4613,6 @@
46164613
"class" : "Memory",
46174614
"opcode" : 4420,
46184615
"capabilities" : [ "UntypedPointersKHR" ],
4619-
"provisional" : true,
46204616
"version" : "None",
46214617
"operands" : [
46224618
{ "kind" : "IdResultType" },
@@ -4657,7 +4653,6 @@
46574653
"class" : "Memory",
46584654
"opcode" : 4423,
46594655
"capabilities" : [ "UntypedPointersKHR" ],
4660-
"provisional" : true,
46614656
"version" : "None",
46624657
"operands" : [
46634658
{ "kind" : "IdResultType" },
@@ -4673,7 +4668,6 @@
46734668
"class" : "Memory",
46744669
"opcode" : 4424,
46754670
"capabilities" : [ "UntypedPointersKHR" ],
4676-
"provisional" : true,
46774671
"version" : "None",
46784672
"operands" : [
46794673
{ "kind" : "IdResultType" },
@@ -4689,7 +4683,6 @@
46894683
"class" : "Memory",
46904684
"opcode" : 4425,
46914685
"capabilities" : [ "UntypedPointersKHR" ],
4692-
"provisional" : true,
46934686
"version" : "None",
46944687
"operands" : [
46954688
{ "kind" : "IdResultType" },
@@ -4704,7 +4697,6 @@
47044697
"class" : "Memory",
47054698
"opcode" : 4426,
47064699
"capabilities" : [ "UntypedPointersKHR" ],
4707-
"provisional" : true,
47084700
"version" : "None",
47094701
"operands" : [
47104702
{ "kind" : "IdRef", "name" : "Pointer Type" },
@@ -4802,6 +4794,26 @@
48024794
"extensions" : [ "SPV_KHR_relaxed_extended_instruction" ],
48034795
"version": "None"
48044796
},
4797+
{
4798+
"opname" : "OpUntypedGroupAsyncCopyKHR",
4799+
"class" : "Group",
4800+
"opcode" : 4434,
4801+
"capabilities" : [ "UntypedPointersKHR" ],
4802+
"version" : "None",
4803+
"operands" : [
4804+
{ "kind" : "IdResultType" },
4805+
{ "kind" : "IdResult" },
4806+
{ "kind" : "IdRef", "name" : "Execution" },
4807+
{ "kind" : "IdRef", "name" : "Destination" },
4808+
{ "kind" : "IdRef", "name" : "Source" },
4809+
{ "kind" : "IdRef", "name" : "Element Num Bytes" },
4810+
{ "kind" : "IdRef", "name" : "Num Elements" },
4811+
{ "kind" : "IdRef", "name" : "Stride" },
4812+
{ "kind" : "IdRef", "name" : "Event" },
4813+
{ "kind" : "MemoryAccess", "quantifier" : "?", "name" : "Destination Memory Operands" },
4814+
{ "kind" : "MemoryAccess", "quantifier" : "?", "name" : "Source Memory Operands" }
4815+
]
4816+
},
48054817
{
48064818
"opname" : "OpTraceRayKHR",
48074819
"class" : "Reserved",
@@ -16695,7 +16707,6 @@
1669516707
"enumerant" : "UntypedPointersKHR",
1669616708
"value" : 4473,
1669716709
"extensions" : [ "SPV_KHR_untyped_pointers" ],
16698-
"provisional" : true,
1669916710
"version" : "None"
1670016711
},
1670116712
{

include/spirv/unified1/spirv.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2045,6 +2045,7 @@ public enum Op
20452045
OpGroupNonUniformRotateKHR = 4431,
20462046
OpSubgroupReadInvocationKHR = 4432,
20472047
OpExtInstWithForwardRefsKHR = 4433,
2048+
OpUntypedGroupAsyncCopyKHR = 4434,
20482049
OpTraceRayKHR = 4445,
20492050
OpExecuteCallableKHR = 4446,
20502051
OpConvertUToAccelerationStructureKHR = 4447,

include/spirv/unified1/spirv.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1980,6 +1980,7 @@ typedef enum SpvOp_ {
19801980
SpvOpGroupNonUniformRotateKHR = 4431,
19811981
SpvOpSubgroupReadInvocationKHR = 4432,
19821982
SpvOpExtInstWithForwardRefsKHR = 4433,
1983+
SpvOpUntypedGroupAsyncCopyKHR = 4434,
19831984
SpvOpTraceRayKHR = 4445,
19841985
SpvOpExecuteCallableKHR = 4446,
19851986
SpvOpConvertUToAccelerationStructureKHR = 4447,
@@ -2821,6 +2822,7 @@ inline void SpvHasResultAndType(SpvOp opcode, bool *hasResult, bool *hasResultTy
28212822
case SpvOpGroupNonUniformRotateKHR: *hasResult = true; *hasResultType = true; break;
28222823
case SpvOpSubgroupReadInvocationKHR: *hasResult = true; *hasResultType = true; break;
28232824
case SpvOpExtInstWithForwardRefsKHR: *hasResult = true; *hasResultType = true; break;
2825+
case SpvOpUntypedGroupAsyncCopyKHR: *hasResult = true; *hasResultType = true; break;
28242826
case SpvOpTraceRayKHR: *hasResult = false; *hasResultType = false; break;
28252827
case SpvOpExecuteCallableKHR: *hasResult = false; *hasResultType = false; break;
28262828
case SpvOpConvertUToAccelerationStructureKHR: *hasResult = true; *hasResultType = true; break;
@@ -4809,6 +4811,7 @@ inline const char* SpvOpToString(SpvOp value) {
48094811
case SpvOpGroupNonUniformRotateKHR: return "OpGroupNonUniformRotateKHR";
48104812
case SpvOpSubgroupReadInvocationKHR: return "OpSubgroupReadInvocationKHR";
48114813
case SpvOpExtInstWithForwardRefsKHR: return "OpExtInstWithForwardRefsKHR";
4814+
case SpvOpUntypedGroupAsyncCopyKHR: return "OpUntypedGroupAsyncCopyKHR";
48124815
case SpvOpTraceRayKHR: return "OpTraceRayKHR";
48134816
case SpvOpExecuteCallableKHR: return "OpExecuteCallableKHR";
48144817
case SpvOpConvertUToAccelerationStructureKHR: return "OpConvertUToAccelerationStructureKHR";

include/spirv/unified1/spirv.hpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1976,6 +1976,7 @@ enum Op {
19761976
OpGroupNonUniformRotateKHR = 4431,
19771977
OpSubgroupReadInvocationKHR = 4432,
19781978
OpExtInstWithForwardRefsKHR = 4433,
1979+
OpUntypedGroupAsyncCopyKHR = 4434,
19791980
OpTraceRayKHR = 4445,
19801981
OpExecuteCallableKHR = 4446,
19811982
OpConvertUToAccelerationStructureKHR = 4447,
@@ -2817,6 +2818,7 @@ inline void HasResultAndType(Op opcode, bool *hasResult, bool *hasResultType) {
28172818
case OpGroupNonUniformRotateKHR: *hasResult = true; *hasResultType = true; break;
28182819
case OpSubgroupReadInvocationKHR: *hasResult = true; *hasResultType = true; break;
28192820
case OpExtInstWithForwardRefsKHR: *hasResult = true; *hasResultType = true; break;
2821+
case OpUntypedGroupAsyncCopyKHR: *hasResult = true; *hasResultType = true; break;
28202822
case OpTraceRayKHR: *hasResult = false; *hasResultType = false; break;
28212823
case OpExecuteCallableKHR: *hasResult = false; *hasResultType = false; break;
28222824
case OpConvertUToAccelerationStructureKHR: *hasResult = true; *hasResultType = true; break;
@@ -4805,6 +4807,7 @@ inline const char* OpToString(Op value) {
48054807
case OpGroupNonUniformRotateKHR: return "OpGroupNonUniformRotateKHR";
48064808
case OpSubgroupReadInvocationKHR: return "OpSubgroupReadInvocationKHR";
48074809
case OpExtInstWithForwardRefsKHR: return "OpExtInstWithForwardRefsKHR";
4810+
case OpUntypedGroupAsyncCopyKHR: return "OpUntypedGroupAsyncCopyKHR";
48084811
case OpTraceRayKHR: return "OpTraceRayKHR";
48094812
case OpExecuteCallableKHR: return "OpExecuteCallableKHR";
48104813
case OpConvertUToAccelerationStructureKHR: return "OpConvertUToAccelerationStructureKHR";

include/spirv/unified1/spirv.hpp11

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1976,6 +1976,7 @@ enum class Op : unsigned {
19761976
OpGroupNonUniformRotateKHR = 4431,
19771977
OpSubgroupReadInvocationKHR = 4432,
19781978
OpExtInstWithForwardRefsKHR = 4433,
1979+
OpUntypedGroupAsyncCopyKHR = 4434,
19791980
OpTraceRayKHR = 4445,
19801981
OpExecuteCallableKHR = 4446,
19811982
OpConvertUToAccelerationStructureKHR = 4447,
@@ -2817,6 +2818,7 @@ inline void HasResultAndType(Op opcode, bool *hasResult, bool *hasResultType) {
28172818
case Op::OpGroupNonUniformRotateKHR: *hasResult = true; *hasResultType = true; break;
28182819
case Op::OpSubgroupReadInvocationKHR: *hasResult = true; *hasResultType = true; break;
28192820
case Op::OpExtInstWithForwardRefsKHR: *hasResult = true; *hasResultType = true; break;
2821+
case Op::OpUntypedGroupAsyncCopyKHR: *hasResult = true; *hasResultType = true; break;
28202822
case Op::OpTraceRayKHR: *hasResult = false; *hasResultType = false; break;
28212823
case Op::OpExecuteCallableKHR: *hasResult = false; *hasResultType = false; break;
28222824
case Op::OpConvertUToAccelerationStructureKHR: *hasResult = true; *hasResultType = true; break;
@@ -4805,6 +4807,7 @@ inline const char* OpToString(Op value) {
48054807
case Op::OpGroupNonUniformRotateKHR: return "OpGroupNonUniformRotateKHR";
48064808
case Op::OpSubgroupReadInvocationKHR: return "OpSubgroupReadInvocationKHR";
48074809
case Op::OpExtInstWithForwardRefsKHR: return "OpExtInstWithForwardRefsKHR";
4810+
case Op::OpUntypedGroupAsyncCopyKHR: return "OpUntypedGroupAsyncCopyKHR";
48084811
case Op::OpTraceRayKHR: return "OpTraceRayKHR";
48094812
case Op::OpExecuteCallableKHR: return "OpExecuteCallableKHR";
48104813
case Op::OpConvertUToAccelerationStructureKHR: return "OpConvertUToAccelerationStructureKHR";

include/spirv/unified1/spirv.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1957,6 +1957,7 @@
19571957
"OpGroupNonUniformRotateKHR": 4431,
19581958
"OpSubgroupReadInvocationKHR": 4432,
19591959
"OpExtInstWithForwardRefsKHR": 4433,
1960+
"OpUntypedGroupAsyncCopyKHR": 4434,
19601961
"OpTraceRayKHR": 4445,
19611962
"OpExecuteCallableKHR": 4446,
19621963
"OpConvertUToAccelerationStructureKHR": 4447,

include/spirv/unified1/spirv.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1967,6 +1967,7 @@ spv = {
19671967
OpGroupNonUniformRotateKHR = 4431,
19681968
OpSubgroupReadInvocationKHR = 4432,
19691969
OpExtInstWithForwardRefsKHR = 4433,
1970+
OpUntypedGroupAsyncCopyKHR = 4434,
19701971
OpTraceRayKHR = 4445,
19711972
OpExecuteCallableKHR = 4446,
19721973
OpConvertUToAccelerationStructureKHR = 4447,

include/spirv/unified1/spirv.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1910,6 +1910,7 @@
19101910
'OpGroupNonUniformRotateKHR' : 4431,
19111911
'OpSubgroupReadInvocationKHR' : 4432,
19121912
'OpExtInstWithForwardRefsKHR' : 4433,
1913+
'OpUntypedGroupAsyncCopyKHR' : 4434,
19131914
'OpTraceRayKHR' : 4445,
19141915
'OpExecuteCallableKHR' : 4446,
19151916
'OpConvertUToAccelerationStructureKHR' : 4447,

include/spirv/unified1/spv.d

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2048,6 +2048,7 @@ enum Op : uint
20482048
OpGroupNonUniformRotateKHR = 4431,
20492049
OpSubgroupReadInvocationKHR = 4432,
20502050
OpExtInstWithForwardRefsKHR = 4433,
2051+
OpUntypedGroupAsyncCopyKHR = 4434,
20512052
OpTraceRayKHR = 4445,
20522053
OpExecuteCallableKHR = 4446,
20532054
OpConvertUToAccelerationStructureKHR = 4447,

0 commit comments

Comments
 (0)