Add recently reserved enumerants.
diff --git a/include/spirv/1.0/spirv.core.grammar.json b/include/spirv/1.0/spirv.core.grammar.json
index 74b3869..d937191 100644
--- a/include/spirv/1.0/spirv.core.grammar.json
+++ b/include/spirv/1.0/spirv.core.grammar.json
@@ -560,7 +560,11 @@
{ "kind" : "IdRef", "name" : "'Element'" },
{ "kind" : "IdRef", "quantifier" : "*", "name" : "'Indexes'" }
],
- "capabilities" : [ "Addresses" ]
+ "capabilities" : [
+ "Addresses",
+ "VariablePointers",
+ "VariablePointersStorageBuffer"
+ ]
},
{
"opname" : "OpArrayLength",
@@ -3357,6 +3361,10 @@
{
"enumerant" : "OpenCL_CPP",
"value" : 4
+ },
+ {
+ "enumerant" : "HLSL",
+ "value" : 5
}
]
},
@@ -3678,6 +3686,14 @@
{
"enumerant" : "Image",
"value" : 11
+ },
+ {
+ "enumerant" : "StorageBuffer",
+ "value" : 12,
+ "extensions" : [
+ "SPV_KHR_storage_buffer_storage_class",
+ "SPV_KHR_variable_pointers"
+ ]
}
]
},
@@ -5240,14 +5256,31 @@
"extensions" : [ "SPV_KHR_subgroup_vote" ]
},
{
+ "enumerant" : "StorageBuffer16BitAccess",
+ "value" : 4433,
+ "extensions" : [ "SPV_KHR_16bit_storage" ]
+ },
+ {
"enumerant" : "StorageUniformBufferBlock16",
"value" : 4433,
"extensions" : [ "SPV_KHR_16bit_storage" ]
},
{
+ "enumerant" : "UniformAndStorageBuffer16BitAccess",
+ "value" : 4434,
+ "capabilities" : [
+ "StorageBuffer16BitAccess",
+ "StorageUniformBufferBlock16"
+ ],
+ "extensions" : [ "SPV_KHR_16bit_storage" ]
+ },
+ {
"enumerant" : "StorageUniform16",
"value" : 4434,
- "capabilities" : [ "StorageUniformBufferBlock16" ],
+ "capabilities" : [
+ "StorageBuffer16BitAccess",
+ "StorageUniformBufferBlock16"
+ ],
"extensions" : [ "SPV_KHR_16bit_storage" ]
},
{
@@ -5272,6 +5305,18 @@
"extensions" : [ "SPV_KHR_multiview" ]
},
{
+ "enumerant" : "VariablePointersStorageBuffer",
+ "value" : 4441,
+ "capabilities" : [ "Shader" ],
+ "extensions" : [ "SPV_KHR_variable_pointers" ]
+ },
+ {
+ "enumerant" : "VariablePointers",
+ "value" : 4442,
+ "capabilities" : [ "VariablePointersStorageBuffer" ],
+ "extensions" : [ "SPV_KHR_variable_pointers" ]
+ },
+ {
"enumerant" : "SampleMaskOverrideCoverageNV",
"value" : 5249,
"capabilities" : [ "SampleRateShading" ],
diff --git a/include/spirv/1.0/spirv.h b/include/spirv/1.0/spirv.h
index 8fe7199..1f609ad 100644
--- a/include/spirv/1.0/spirv.h
+++ b/include/spirv/1.0/spirv.h
@@ -65,6 +65,7 @@
SpvSourceLanguageGLSL = 2,
SpvSourceLanguageOpenCL_C = 3,
SpvSourceLanguageOpenCL_CPP = 4,
+ SpvSourceLanguageHLSL = 5,
SpvSourceLanguageMax = 0x7fffffff,
} SpvSourceLanguage;
@@ -141,6 +142,7 @@
SpvStorageClassPushConstant = 9,
SpvStorageClassAtomicCounter = 10,
SpvStorageClassImage = 11,
+ SpvStorageClassStorageBuffer = 12,
SpvStorageClassMax = 0x7fffffff,
} SpvStorageClass;
@@ -620,12 +622,16 @@
SpvCapabilitySubgroupBallotKHR = 4423,
SpvCapabilityDrawParameters = 4427,
SpvCapabilitySubgroupVoteKHR = 4431,
+ SpvCapabilityStorageBuffer16BitAccess = 4433,
SpvCapabilityStorageUniformBufferBlock16 = 4433,
SpvCapabilityStorageUniform16 = 4434,
+ SpvCapabilityUniformAndStorageBuffer16BitAccess = 4434,
SpvCapabilityStoragePushConstant16 = 4435,
SpvCapabilityStorageInputOutput16 = 4436,
SpvCapabilityDeviceGroup = 4437,
SpvCapabilityMultiView = 4439,
+ SpvCapabilityVariablePointersStorageBuffer = 4441,
+ SpvCapabilityVariablePointers = 4442,
SpvCapabilitySampleMaskOverrideCoverageNV = 5249,
SpvCapabilityGeometryShaderPassthroughNV = 5251,
SpvCapabilityShaderViewportIndexLayerNV = 5254,
diff --git a/include/spirv/1.0/spirv.hpp b/include/spirv/1.0/spirv.hpp
index 5580c40..91cb59e 100644
--- a/include/spirv/1.0/spirv.hpp
+++ b/include/spirv/1.0/spirv.hpp
@@ -61,6 +61,7 @@
SourceLanguageGLSL = 2,
SourceLanguageOpenCL_C = 3,
SourceLanguageOpenCL_CPP = 4,
+ SourceLanguageHLSL = 5,
SourceLanguageMax = 0x7fffffff,
};
@@ -137,6 +138,7 @@
StorageClassPushConstant = 9,
StorageClassAtomicCounter = 10,
StorageClassImage = 11,
+ StorageClassStorageBuffer = 12,
StorageClassMax = 0x7fffffff,
};
@@ -616,12 +618,16 @@
CapabilitySubgroupBallotKHR = 4423,
CapabilityDrawParameters = 4427,
CapabilitySubgroupVoteKHR = 4431,
+ CapabilityStorageBuffer16BitAccess = 4433,
CapabilityStorageUniformBufferBlock16 = 4433,
CapabilityStorageUniform16 = 4434,
+ CapabilityUniformAndStorageBuffer16BitAccess = 4434,
CapabilityStoragePushConstant16 = 4435,
CapabilityStorageInputOutput16 = 4436,
CapabilityDeviceGroup = 4437,
CapabilityMultiView = 4439,
+ CapabilityVariablePointersStorageBuffer = 4441,
+ CapabilityVariablePointers = 4442,
CapabilitySampleMaskOverrideCoverageNV = 5249,
CapabilityGeometryShaderPassthroughNV = 5251,
CapabilityShaderViewportIndexLayerNV = 5254,
diff --git a/include/spirv/1.0/spirv.hpp11 b/include/spirv/1.0/spirv.hpp11
index c3be791..51aefa5 100644
--- a/include/spirv/1.0/spirv.hpp11
+++ b/include/spirv/1.0/spirv.hpp11
@@ -61,6 +61,7 @@
GLSL = 2,
OpenCL_C = 3,
OpenCL_CPP = 4,
+ HLSL = 5,
Max = 0x7fffffff,
};
@@ -137,6 +138,7 @@
PushConstant = 9,
AtomicCounter = 10,
Image = 11,
+ StorageBuffer = 12,
Max = 0x7fffffff,
};
@@ -616,12 +618,16 @@
SubgroupBallotKHR = 4423,
DrawParameters = 4427,
SubgroupVoteKHR = 4431,
+ StorageBuffer16BitAccess = 4433,
StorageUniformBufferBlock16 = 4433,
StorageUniform16 = 4434,
+ UniformAndStorageBuffer16BitAccess = 4434,
StoragePushConstant16 = 4435,
StorageInputOutput16 = 4436,
DeviceGroup = 4437,
MultiView = 4439,
+ VariablePointersStorageBuffer = 4441,
+ VariablePointers = 4442,
SampleMaskOverrideCoverageNV = 5249,
GeometryShaderPassthroughNV = 5251,
ShaderViewportIndexLayerNV = 5254,
diff --git a/include/spirv/1.0/spirv.json b/include/spirv/1.0/spirv.json
index f1a4404..37081b2 100644
--- a/include/spirv/1.0/spirv.json
+++ b/include/spirv/1.0/spirv.json
@@ -67,7 +67,8 @@
"ESSL": 1,
"GLSL": 2,
"OpenCL_C": 3,
- "OpenCL_CPP": 4
+ "OpenCL_CPP": 4,
+ "HLSL": 5
}
},
{
@@ -158,7 +159,8 @@
"Generic": 8,
"PushConstant": 9,
"AtomicCounter": 10,
- "Image": 11
+ "Image": 11,
+ "StorageBuffer": 12
}
},
{
@@ -643,12 +645,16 @@
"SubgroupBallotKHR": 4423,
"DrawParameters": 4427,
"SubgroupVoteKHR": 4431,
+ "StorageBuffer16BitAccess": 4433,
"StorageUniformBufferBlock16": 4433,
"StorageUniform16": 4434,
+ "UniformAndStorageBuffer16BitAccess": 4434,
"StoragePushConstant16": 4435,
"StorageInputOutput16": 4436,
"DeviceGroup": 4437,
"MultiView": 4439,
+ "VariablePointersStorageBuffer": 4441,
+ "VariablePointers": 4442,
"SampleMaskOverrideCoverageNV": 5249,
"GeometryShaderPassthroughNV": 5251,
"ShaderViewportIndexLayerNV": 5254,
diff --git a/include/spirv/1.0/spirv.lua b/include/spirv/1.0/spirv.lua
index 6ca96d1..ef8ce13 100644
--- a/include/spirv/1.0/spirv.lua
+++ b/include/spirv/1.0/spirv.lua
@@ -52,6 +52,7 @@
GLSL = 2,
OpenCL_C = 3,
OpenCL_CPP = 4,
+ HLSL = 5,
},
ExecutionModel = {
@@ -123,6 +124,7 @@
PushConstant = 9,
AtomicCounter = 10,
Image = 11,
+ StorageBuffer = 12,
},
Dim = {
@@ -578,12 +580,16 @@
SubgroupBallotKHR = 4423,
DrawParameters = 4427,
SubgroupVoteKHR = 4431,
+ StorageBuffer16BitAccess = 4433,
StorageUniformBufferBlock16 = 4433,
StorageUniform16 = 4434,
+ UniformAndStorageBuffer16BitAccess = 4434,
StoragePushConstant16 = 4435,
StorageInputOutput16 = 4436,
DeviceGroup = 4437,
MultiView = 4439,
+ VariablePointersStorageBuffer = 4441,
+ VariablePointers = 4442,
SampleMaskOverrideCoverageNV = 5249,
GeometryShaderPassthroughNV = 5251,
ShaderViewportIndexLayerNV = 5254,
diff --git a/include/spirv/1.0/spirv.py b/include/spirv/1.0/spirv.py
index 483096e..d37de61 100644
--- a/include/spirv/1.0/spirv.py
+++ b/include/spirv/1.0/spirv.py
@@ -52,6 +52,7 @@
'GLSL' : 2,
'OpenCL_C' : 3,
'OpenCL_CPP' : 4,
+ 'HLSL' : 5,
},
'ExecutionModel' : {
@@ -123,6 +124,7 @@
'PushConstant' : 9,
'AtomicCounter' : 10,
'Image' : 11,
+ 'StorageBuffer' : 12,
},
'Dim' : {
@@ -578,12 +580,16 @@
'SubgroupBallotKHR' : 4423,
'DrawParameters' : 4427,
'SubgroupVoteKHR' : 4431,
+ 'StorageBuffer16BitAccess' : 4433,
'StorageUniformBufferBlock16' : 4433,
'StorageUniform16' : 4434,
+ 'UniformAndStorageBuffer16BitAccess' : 4434,
'StoragePushConstant16' : 4435,
'StorageInputOutput16' : 4436,
'DeviceGroup' : 4437,
'MultiView' : 4439,
+ 'VariablePointersStorageBuffer' : 4441,
+ 'VariablePointers' : 4442,
'SampleMaskOverrideCoverageNV' : 5249,
'GeometryShaderPassthroughNV' : 5251,
'ShaderViewportIndexLayerNV' : 5254,
diff --git a/include/spirv/1.1/spirv.core.grammar.json b/include/spirv/1.1/spirv.core.grammar.json
index e45302f..c3c62d3 100644
--- a/include/spirv/1.1/spirv.core.grammar.json
+++ b/include/spirv/1.1/spirv.core.grammar.json
@@ -560,7 +560,11 @@
{ "kind" : "IdRef", "name" : "'Element'" },
{ "kind" : "IdRef", "quantifier" : "*", "name" : "'Indexes'" }
],
- "capabilities" : [ "Addresses" ]
+ "capabilities" : [
+ "Addresses",
+ "VariablePointers",
+ "VariablePointersStorageBuffer"
+ ]
},
{
"opname" : "OpArrayLength",
@@ -3471,6 +3475,10 @@
{
"enumerant" : "OpenCL_CPP",
"value" : 4
+ },
+ {
+ "enumerant" : "HLSL",
+ "value" : 5
}
]
},
@@ -3818,6 +3826,14 @@
{
"enumerant" : "Image",
"value" : 11
+ },
+ {
+ "enumerant" : "StorageBuffer",
+ "value" : 12,
+ "extensions" : [
+ "SPV_KHR_storage_buffer_storage_class",
+ "SPV_KHR_variable_pointers"
+ ]
}
]
},
@@ -5403,14 +5419,31 @@
"extensions" : [ "SPV_KHR_subgroup_vote" ]
},
{
+ "enumerant" : "StorageBuffer16BitAccess",
+ "value" : 4433,
+ "extensions" : [ "SPV_KHR_16bit_storage" ]
+ },
+ {
"enumerant" : "StorageUniformBufferBlock16",
"value" : 4433,
"extensions" : [ "SPV_KHR_16bit_storage" ]
},
{
+ "enumerant" : "UniformAndStorageBuffer16BitAccess",
+ "value" : 4434,
+ "capabilities" : [
+ "StorageBuffer16BitAccess",
+ "StorageUniformBufferBlock16"
+ ],
+ "extensions" : [ "SPV_KHR_16bit_storage" ]
+ },
+ {
"enumerant" : "StorageUniform16",
"value" : 4434,
- "capabilities" : [ "StorageUniformBufferBlock16" ],
+ "capabilities" : [
+ "StorageBuffer16BitAccess",
+ "StorageUniformBufferBlock16"
+ ],
"extensions" : [ "SPV_KHR_16bit_storage" ]
},
{
@@ -5435,6 +5468,18 @@
"extensions" : [ "SPV_KHR_multiview" ]
},
{
+ "enumerant" : "VariablePointersStorageBuffer",
+ "value" : 4441,
+ "capabilities" : [ "Shader" ],
+ "extensions" : [ "SPV_KHR_variable_pointers" ]
+ },
+ {
+ "enumerant" : "VariablePointers",
+ "value" : 4442,
+ "capabilities" : [ "VariablePointersStorageBuffer" ],
+ "extensions" : [ "SPV_KHR_variable_pointers" ]
+ },
+ {
"enumerant" : "SampleMaskOverrideCoverageNV",
"value" : 5249,
"capabilities" : [ "SampleRateShading" ],
diff --git a/include/spirv/1.1/spirv.h b/include/spirv/1.1/spirv.h
index 89354c0..65a50ef 100644
--- a/include/spirv/1.1/spirv.h
+++ b/include/spirv/1.1/spirv.h
@@ -65,6 +65,7 @@
SpvSourceLanguageGLSL = 2,
SpvSourceLanguageOpenCL_C = 3,
SpvSourceLanguageOpenCL_CPP = 4,
+ SpvSourceLanguageHLSL = 5,
SpvSourceLanguageMax = 0x7fffffff,
} SpvSourceLanguage;
@@ -145,6 +146,7 @@
SpvStorageClassPushConstant = 9,
SpvStorageClassAtomicCounter = 10,
SpvStorageClassImage = 11,
+ SpvStorageClassStorageBuffer = 12,
SpvStorageClassMax = 0x7fffffff,
} SpvStorageClass;
@@ -632,12 +634,16 @@
SpvCapabilitySubgroupBallotKHR = 4423,
SpvCapabilityDrawParameters = 4427,
SpvCapabilitySubgroupVoteKHR = 4431,
+ SpvCapabilityStorageBuffer16BitAccess = 4433,
SpvCapabilityStorageUniformBufferBlock16 = 4433,
SpvCapabilityStorageUniform16 = 4434,
+ SpvCapabilityUniformAndStorageBuffer16BitAccess = 4434,
SpvCapabilityStoragePushConstant16 = 4435,
SpvCapabilityStorageInputOutput16 = 4436,
SpvCapabilityDeviceGroup = 4437,
SpvCapabilityMultiView = 4439,
+ SpvCapabilityVariablePointersStorageBuffer = 4441,
+ SpvCapabilityVariablePointers = 4442,
SpvCapabilitySampleMaskOverrideCoverageNV = 5249,
SpvCapabilityGeometryShaderPassthroughNV = 5251,
SpvCapabilityShaderViewportIndexLayerNV = 5254,
diff --git a/include/spirv/1.1/spirv.hpp b/include/spirv/1.1/spirv.hpp
index 1bac2c0..a70c595 100644
--- a/include/spirv/1.1/spirv.hpp
+++ b/include/spirv/1.1/spirv.hpp
@@ -61,6 +61,7 @@
SourceLanguageGLSL = 2,
SourceLanguageOpenCL_C = 3,
SourceLanguageOpenCL_CPP = 4,
+ SourceLanguageHLSL = 5,
SourceLanguageMax = 0x7fffffff,
};
@@ -141,6 +142,7 @@
StorageClassPushConstant = 9,
StorageClassAtomicCounter = 10,
StorageClassImage = 11,
+ StorageClassStorageBuffer = 12,
StorageClassMax = 0x7fffffff,
};
@@ -628,12 +630,16 @@
CapabilitySubgroupBallotKHR = 4423,
CapabilityDrawParameters = 4427,
CapabilitySubgroupVoteKHR = 4431,
+ CapabilityStorageBuffer16BitAccess = 4433,
CapabilityStorageUniformBufferBlock16 = 4433,
CapabilityStorageUniform16 = 4434,
+ CapabilityUniformAndStorageBuffer16BitAccess = 4434,
CapabilityStoragePushConstant16 = 4435,
CapabilityStorageInputOutput16 = 4436,
CapabilityDeviceGroup = 4437,
CapabilityMultiView = 4439,
+ CapabilityVariablePointersStorageBuffer = 4441,
+ CapabilityVariablePointers = 4442,
CapabilitySampleMaskOverrideCoverageNV = 5249,
CapabilityGeometryShaderPassthroughNV = 5251,
CapabilityShaderViewportIndexLayerNV = 5254,
diff --git a/include/spirv/1.1/spirv.hpp11 b/include/spirv/1.1/spirv.hpp11
index b993963..cb089a7 100644
--- a/include/spirv/1.1/spirv.hpp11
+++ b/include/spirv/1.1/spirv.hpp11
@@ -61,6 +61,7 @@
GLSL = 2,
OpenCL_C = 3,
OpenCL_CPP = 4,
+ HLSL = 5,
Max = 0x7fffffff,
};
@@ -141,6 +142,7 @@
PushConstant = 9,
AtomicCounter = 10,
Image = 11,
+ StorageBuffer = 12,
Max = 0x7fffffff,
};
@@ -628,12 +630,16 @@
SubgroupBallotKHR = 4423,
DrawParameters = 4427,
SubgroupVoteKHR = 4431,
+ StorageBuffer16BitAccess = 4433,
StorageUniformBufferBlock16 = 4433,
StorageUniform16 = 4434,
+ UniformAndStorageBuffer16BitAccess = 4434,
StoragePushConstant16 = 4435,
StorageInputOutput16 = 4436,
DeviceGroup = 4437,
MultiView = 4439,
+ VariablePointersStorageBuffer = 4441,
+ VariablePointers = 4442,
SampleMaskOverrideCoverageNV = 5249,
GeometryShaderPassthroughNV = 5251,
ShaderViewportIndexLayerNV = 5254,
diff --git a/include/spirv/1.1/spirv.json b/include/spirv/1.1/spirv.json
index a966cfb..b5a77d0 100644
--- a/include/spirv/1.1/spirv.json
+++ b/include/spirv/1.1/spirv.json
@@ -67,7 +67,8 @@
"ESSL": 1,
"GLSL": 2,
"OpenCL_C": 3,
- "OpenCL_CPP": 4
+ "OpenCL_CPP": 4,
+ "HLSL": 5
}
},
{
@@ -162,7 +163,8 @@
"Generic": 8,
"PushConstant": 9,
"AtomicCounter": 10,
- "Image": 11
+ "Image": 11,
+ "StorageBuffer": 12
}
},
{
@@ -653,12 +655,16 @@
"SubgroupBallotKHR": 4423,
"DrawParameters": 4427,
"SubgroupVoteKHR": 4431,
+ "StorageBuffer16BitAccess": 4433,
"StorageUniformBufferBlock16": 4433,
"StorageUniform16": 4434,
+ "UniformAndStorageBuffer16BitAccess": 4434,
"StoragePushConstant16": 4435,
"StorageInputOutput16": 4436,
"DeviceGroup": 4437,
"MultiView": 4439,
+ "VariablePointersStorageBuffer": 4441,
+ "VariablePointers": 4442,
"SampleMaskOverrideCoverageNV": 5249,
"GeometryShaderPassthroughNV": 5251,
"ShaderViewportIndexLayerNV": 5254,
diff --git a/include/spirv/1.1/spirv.lua b/include/spirv/1.1/spirv.lua
index 421c1f4..743ba71 100644
--- a/include/spirv/1.1/spirv.lua
+++ b/include/spirv/1.1/spirv.lua
@@ -52,6 +52,7 @@
GLSL = 2,
OpenCL_C = 3,
OpenCL_CPP = 4,
+ HLSL = 5,
},
ExecutionModel = {
@@ -127,6 +128,7 @@
PushConstant = 9,
AtomicCounter = 10,
Image = 11,
+ StorageBuffer = 12,
},
Dim = {
@@ -590,12 +592,16 @@
SubgroupBallotKHR = 4423,
DrawParameters = 4427,
SubgroupVoteKHR = 4431,
+ StorageBuffer16BitAccess = 4433,
StorageUniformBufferBlock16 = 4433,
StorageUniform16 = 4434,
+ UniformAndStorageBuffer16BitAccess = 4434,
StoragePushConstant16 = 4435,
StorageInputOutput16 = 4436,
DeviceGroup = 4437,
MultiView = 4439,
+ VariablePointersStorageBuffer = 4441,
+ VariablePointers = 4442,
SampleMaskOverrideCoverageNV = 5249,
GeometryShaderPassthroughNV = 5251,
ShaderViewportIndexLayerNV = 5254,
diff --git a/include/spirv/1.1/spirv.py b/include/spirv/1.1/spirv.py
index d0bce4d..75f42dc 100644
--- a/include/spirv/1.1/spirv.py
+++ b/include/spirv/1.1/spirv.py
@@ -52,6 +52,7 @@
'GLSL' : 2,
'OpenCL_C' : 3,
'OpenCL_CPP' : 4,
+ 'HLSL' : 5,
},
'ExecutionModel' : {
@@ -127,6 +128,7 @@
'PushConstant' : 9,
'AtomicCounter' : 10,
'Image' : 11,
+ 'StorageBuffer' : 12,
},
'Dim' : {
@@ -590,12 +592,16 @@
'SubgroupBallotKHR' : 4423,
'DrawParameters' : 4427,
'SubgroupVoteKHR' : 4431,
+ 'StorageBuffer16BitAccess' : 4433,
'StorageUniformBufferBlock16' : 4433,
'StorageUniform16' : 4434,
+ 'UniformAndStorageBuffer16BitAccess' : 4434,
'StoragePushConstant16' : 4435,
'StorageInputOutput16' : 4436,
'DeviceGroup' : 4437,
'MultiView' : 4439,
+ 'VariablePointersStorageBuffer' : 4441,
+ 'VariablePointers' : 4442,
'SampleMaskOverrideCoverageNV' : 5249,
'GeometryShaderPassthroughNV' : 5251,
'ShaderViewportIndexLayerNV' : 5254,
