Skip to content

Commit b765c35

Browse files
authored
Merge pull request KhronosGroup#279 from dgkoch/SPV_KHR_ray_cull_mask
Add SPV_KHR_ray_cull_mask
2 parents 46b7918 + b74edd5 commit b765c35

File tree

9 files changed

+30
-1
lines changed

9 files changed

+30
-1
lines changed

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12616,6 +12616,13 @@
1261612616
"capabilities" : [ "ShaderSMBuiltinsNV" ],
1261712617
"extensions" : [ "SPV_NV_shader_sm_builtins" ],
1261812618
"version" : "None"
12619+
},
12620+
{
12621+
"enumerant" : "CullMaskKHR",
12622+
"value" : 6021,
12623+
"capabilities" : [ "RayCullMaskKHR" ],
12624+
"extensions" : [ "SPV_KHR_ray_cull_mask" ],
12625+
"version" : "None"
1261912626
}
1262012627
]
1262112628
},
@@ -14004,6 +14011,12 @@
1400414011
"extensions" : [ "SPV_KHR_integer_dot_product" ],
1400514012
"version" : "1.6"
1400614013
},
14014+
{
14015+
"enumerant" : "RayCullMaskKHR",
14016+
"value" : 6020,
14017+
"extensions" : [ "SPV_KHR_ray_cull_mask" ],
14018+
"version" : "None"
14019+
},
1400714020
{
1400814021
"enumerant" : "BitInstructions",
1400914022
"value" : 6025,

include/spirv/unified1/spirv.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -675,6 +675,7 @@ public enum BuiltIn
675675
SMCountNV = 5375,
676676
WarpIDNV = 5376,
677677
SMIDNV = 5377,
678+
CullMaskKHR = 6021,
678679
}
679680

680681
public enum SelectionControlShift
@@ -1082,6 +1083,7 @@ public enum Capability
10821083
DotProductInput4x8BitPackedKHR = 6018,
10831084
DotProduct = 6019,
10841085
DotProductKHR = 6019,
1086+
RayCullMaskKHR = 6020,
10851087
BitInstructions = 6025,
10861088
GroupNonUniformRotateKHR = 6026,
10871089
AtomicFloat32AddEXT = 6033,

include/spirv/unified1/spirv.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -681,6 +681,7 @@ typedef enum SpvBuiltIn_ {
681681
SpvBuiltInSMCountNV = 5375,
682682
SpvBuiltInWarpIDNV = 5376,
683683
SpvBuiltInSMIDNV = 5377,
684+
SpvBuiltInCullMaskKHR = 6021,
684685
SpvBuiltInMax = 0x7fffffff,
685686
} SpvBuiltIn;
686687

@@ -1082,6 +1083,7 @@ typedef enum SpvCapability_ {
10821083
SpvCapabilityDotProductInput4x8BitPackedKHR = 6018,
10831084
SpvCapabilityDotProduct = 6019,
10841085
SpvCapabilityDotProductKHR = 6019,
1086+
SpvCapabilityRayCullMaskKHR = 6020,
10851087
SpvCapabilityBitInstructions = 6025,
10861088
SpvCapabilityGroupNonUniformRotateKHR = 6026,
10871089
SpvCapabilityAtomicFloat32AddEXT = 6033,

include/spirv/unified1/spirv.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -677,6 +677,7 @@ enum BuiltIn {
677677
BuiltInSMCountNV = 5375,
678678
BuiltInWarpIDNV = 5376,
679679
BuiltInSMIDNV = 5377,
680+
BuiltInCullMaskKHR = 6021,
680681
BuiltInMax = 0x7fffffff,
681682
};
682683

@@ -1078,6 +1079,7 @@ enum Capability {
10781079
CapabilityDotProductInput4x8BitPackedKHR = 6018,
10791080
CapabilityDotProduct = 6019,
10801081
CapabilityDotProductKHR = 6019,
1082+
CapabilityRayCullMaskKHR = 6020,
10811083
CapabilityBitInstructions = 6025,
10821084
CapabilityGroupNonUniformRotateKHR = 6026,
10831085
CapabilityAtomicFloat32AddEXT = 6033,

include/spirv/unified1/spirv.hpp11

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -677,6 +677,7 @@ enum class BuiltIn : unsigned {
677677
SMCountNV = 5375,
678678
WarpIDNV = 5376,
679679
SMIDNV = 5377,
680+
CullMaskKHR = 6021,
680681
Max = 0x7fffffff,
681682
};
682683

@@ -1078,6 +1079,7 @@ enum class Capability : unsigned {
10781079
DotProductInput4x8BitPackedKHR = 6018,
10791080
DotProduct = 6019,
10801081
DotProductKHR = 6019,
1082+
RayCullMaskKHR = 6020,
10811083
BitInstructions = 6025,
10821084
GroupNonUniformRotateKHR = 6026,
10831085
AtomicFloat32AddEXT = 6033,

include/spirv/unified1/spirv.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,8 @@
705705
"WarpsPerSMNV": 5374,
706706
"SMCountNV": 5375,
707707
"WarpIDNV": 5376,
708-
"SMIDNV": 5377
708+
"SMIDNV": 5377,
709+
"CullMaskKHR": 6021
709710
}
710711
},
711712
{
@@ -1060,6 +1061,7 @@
10601061
"DotProductInput4x8BitPackedKHR": 6018,
10611062
"DotProduct": 6019,
10621063
"DotProductKHR": 6019,
1064+
"RayCullMaskKHR": 6020,
10631065
"BitInstructions": 6025,
10641066
"GroupNonUniformRotateKHR": 6026,
10651067
"AtomicFloat32AddEXT": 6033,

include/spirv/unified1/spirv.lua

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -649,6 +649,7 @@ spv = {
649649
SMCountNV = 5375,
650650
WarpIDNV = 5376,
651651
SMIDNV = 5377,
652+
CullMaskKHR = 6021,
652653
},
653654

654655
SelectionControlShift = {
@@ -1040,6 +1041,7 @@ spv = {
10401041
DotProductInput4x8BitPackedKHR = 6018,
10411042
DotProduct = 6019,
10421043
DotProductKHR = 6019,
1044+
RayCullMaskKHR = 6020,
10431045
BitInstructions = 6025,
10441046
GroupNonUniformRotateKHR = 6026,
10451047
AtomicFloat32AddEXT = 6033,

include/spirv/unified1/spirv.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -649,6 +649,7 @@
649649
'SMCountNV' : 5375,
650650
'WarpIDNV' : 5376,
651651
'SMIDNV' : 5377,
652+
'CullMaskKHR' : 6021,
652653
},
653654

654655
'SelectionControlShift' : {
@@ -1040,6 +1041,7 @@
10401041
'DotProductInput4x8BitPackedKHR' : 6018,
10411042
'DotProduct' : 6019,
10421043
'DotProductKHR' : 6019,
1044+
'RayCullMaskKHR' : 6020,
10431045
'BitInstructions' : 6025,
10441046
'GroupNonUniformRotateKHR' : 6026,
10451047
'AtomicFloat32AddEXT' : 6033,

include/spirv/unified1/spv.d

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -678,6 +678,7 @@ enum BuiltIn : uint
678678
SMCountNV = 5375,
679679
WarpIDNV = 5376,
680680
SMIDNV = 5377,
681+
CullMaskKHR = 6021,
681682
}
682683

683684
enum SelectionControlShift : uint
@@ -1085,6 +1086,7 @@ enum Capability : uint
10851086
DotProductInput4x8BitPackedKHR = 6018,
10861087
DotProduct = 6019,
10871088
DotProductKHR = 6019,
1089+
RayCullMaskKHR = 6020,
10881090
BitInstructions = 6025,
10891091
GroupNonUniformRotateKHR = 6026,
10901092
AtomicFloat32AddEXT = 6033,

0 commit comments

Comments
 (0)