Skip to content

Commit

Permalink
Add provisional key to grammar
Browse files Browse the repository at this point in the history
  • Loading branch information
@spencer-lunarg
spencer-lunarg committed Nov 13, 2024
1 parent 996c728 commit 75ce22d
Show file tree
Hide file tree
Showing 8 changed files with 237 additions and 13 deletions.
27 changes: 27 additions & 0 deletions include/spirv/unified1/spirv.core.grammar.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5373,6 +5373,7 @@
{ "kind" : "IdRef", "name": "'Node Index'" }
],
"capabilities" : [ "ShaderEnqueueAMDX" ],
"provisional" : true,
"version" : "None"
},
{
Expand All @@ -5383,6 +5384,7 @@
{ "kind" : "IdRef", "name": "'Payload Array'" }
],
"capabilities" : [ "ShaderEnqueueAMDX" ],
"provisional" : true,
"version" : "None"
},
{
Expand All @@ -5394,6 +5396,7 @@
{ "kind" : "IdRef", "name": "'Payload Type'" }
],
"capabilities" : [ "ShaderEnqueueAMDX" ],
"provisional" : true,
"version" : "None"
},
{
Expand All @@ -5406,6 +5409,7 @@
{ "kind" : "IdRef", "name": "'Payload'" }
],
"capabilities" : [ "ShaderEnqueueAMDX" ],
"provisional" : true,
"version" : "None"
},
{
Expand All @@ -5418,6 +5422,7 @@
{ "kind" : "IdRef", "name": "'Payload Array'" }
],
"capabilities" : [ "ShaderEnqueueAMDX" ],
"provisional" : true,
"version" : "None"
},
{
Expand All @@ -5431,6 +5436,7 @@
{ "kind" : "IdRef", "name": "'Node Index'" }
],
"capabilities" : [ "ShaderEnqueueAMDX" ],
"provisional" : true,
"version": "None"
},
{
Expand All @@ -5442,6 +5448,7 @@
{ "kind" : "LiteralString", "name": "'Literal String'" }
],
"capabilities" : [ "ShaderEnqueueAMDX" ],
"provisional" : true,
"version": "None"
},
{
Expand All @@ -5453,6 +5460,7 @@
{ "kind" : "LiteralString", "name": "'Literal String'" }
],
"capabilities" : [ "ShaderEnqueueAMDX" ],
"provisional" : true,
"version": "None"
},
{
Expand Down Expand Up @@ -11610,6 +11618,7 @@
"enumerant" : "CoalescingAMDX",
"value" : 5069,
"capabilities" : [ "ShaderEnqueueAMDX" ],
"provisional" : true,
"version" : "None"
},
{
Expand All @@ -11619,6 +11628,7 @@
"parameters" : [
{ "kind" : "IdRef", "name" : "'Is Entry'" }
],
"provisional" : true,
"version" : "None"
},
{
Expand All @@ -11628,6 +11638,7 @@
"parameters" : [
{ "kind" : "IdRef", "name" : "'Number of recursions'" }
],
"provisional" : true,
"version" : "None"
},
{
Expand All @@ -11639,6 +11650,7 @@
{ "kind" : "IdRef", "name" : "'y size'" },
{ "kind" : "IdRef", "name" : "'z size'" }
],
"provisional" : true,
"version" : "None"
},
{
Expand All @@ -11648,6 +11660,7 @@
"parameters" : [
{ "kind" : "IdRef", "name" : "'Shader Index'" }
],
"provisional" : true,
"version" : "None"
},
{
Expand All @@ -11659,6 +11672,7 @@
{ "kind" : "IdRef", "name" : "'y size'" },
{ "kind" : "IdRef", "name" : "'z size'" }
],
"provisional" : true,
"version" : "None"
},
{
Expand Down Expand Up @@ -11723,6 +11737,7 @@
{ "kind" : "IdRef", "name" : "'Node Name'" },
{ "kind" : "IdRef", "name" : "'Shader Index'" }
],
"provisional" : true,
"version" : "None"
},
{
Expand Down Expand Up @@ -12066,6 +12081,7 @@
"enumerant" : "NodePayloadAMDX",
"value" : 5068,
"capabilities" : [ "ShaderEnqueueAMDX" ],
"provisional" : true,
"version" : "None"
},
{
Expand Down Expand Up @@ -13409,6 +13425,7 @@
"parameters" : [
{ "kind" : "IdRef", "name" : "'Payload Type'" }
],
"provisional" : true,
"version" : "None"
},
{
Expand All @@ -13418,12 +13435,14 @@
"parameters" : [
{ "kind" : "IdRef", "name" : "'Max number of payloads'" }
],
"provisional" : true,
"version" : "None"
},
{
"enumerant" : "TrackFinishWritingAMDX",
"value" : 5078,
"capabilities" : [ "ShaderEnqueueAMDX" ],
"provisional" : true,
"version" : "None"
},
{
Expand All @@ -13433,6 +13452,7 @@
"parameters" : [
{ "kind" : "IdRef", "name" : "'Node Name'" }
],
"provisional" : true,
"version" : "None"
},
{
Expand All @@ -13442,12 +13462,14 @@
"parameters" : [
{ "kind" : "IdRef", "name" : "'Base Index'" }
],
"provisional" : true,
"version" : "None"
},
{
"enumerant" : "PayloadNodeSparseArrayAMDX",
"value" : 5099,
"capabilities" : [ "ShaderEnqueueAMDX" ],
"provisional" : true,
"version" : "None"
},
{
Expand All @@ -13457,12 +13479,14 @@
"parameters" : [
{ "kind" : "IdRef", "name" : "'Array Size'" }
],
"provisional" : true,
"version" : "None"
},
{
"enumerant" : "PayloadDispatchIndirectAMDX",
"value" : 5105,
"capabilities" : [ "ShaderEnqueueAMDX" ],
"provisional" : true,
"version" : "None"
},
{
Expand Down Expand Up @@ -14544,12 +14568,14 @@
"enumerant" : "RemainingRecursionLevelsAMDX",
"value" : 5021,
"capabilities" : [ "ShaderEnqueueAMDX" ],
"provisional" : true,
"version" : "None"
},
{
"enumerant" : "ShaderIndexAMDX",
"value" : 5073,
"capabilities" : [ "ShaderEnqueueAMDX" ],
"provisional" : true,
"version" : "None"
},
{
Expand Down Expand Up @@ -15733,6 +15759,7 @@
"value" : 5067,
"capabilities" : [ "Shader" ],
"extensions" : [ "SPV_AMDX_shader_enqueue" ],
"provisional" : true,
"version" : "None"
},
{
Expand Down
56 changes: 55 additions & 1 deletion include/spirv/unified1/spirv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
**
** MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS
** STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND
** HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
** HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
**
** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
** OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
Expand Down Expand Up @@ -177,12 +177,24 @@ typedef enum SpvExecutionMode_ {
SpvExecutionModeRoundingModeRTZ = 4463,
SpvExecutionModeEarlyAndLateFragmentTestsAMD = 5017,
SpvExecutionModeStencilRefReplacingEXT = 5027,
#ifdef SPV_ENABLE_BETA_EXTENSIONS
SpvExecutionModeCoalescingAMDX = 5069,
#endif
#ifdef SPV_ENABLE_BETA_EXTENSIONS
SpvExecutionModeIsApiEntryAMDX = 5070,
#endif
#ifdef SPV_ENABLE_BETA_EXTENSIONS
SpvExecutionModeMaxNodeRecursionAMDX = 5071,
#endif
#ifdef SPV_ENABLE_BETA_EXTENSIONS
SpvExecutionModeStaticNumWorkgroupsAMDX = 5072,
#endif
#ifdef SPV_ENABLE_BETA_EXTENSIONS
SpvExecutionModeShaderIndexAMDX = 5073,
#endif
#ifdef SPV_ENABLE_BETA_EXTENSIONS
SpvExecutionModeMaxNumWorkgroupsAMDX = 5077,
#endif
SpvExecutionModeStencilRefUnchangedFrontAMD = 5079,
SpvExecutionModeStencilRefGreaterFrontAMD = 5080,
SpvExecutionModeStencilRefLessFrontAMD = 5081,
Expand All @@ -191,7 +203,9 @@ typedef enum SpvExecutionMode_ {
SpvExecutionModeStencilRefLessBackAMD = 5084,
SpvExecutionModeQuadDerivativesKHR = 5088,
SpvExecutionModeRequireFullQuadsKHR = 5089,
#ifdef SPV_ENABLE_BETA_EXTENSIONS
SpvExecutionModeSharesInputWithAMDX = 5102,
#endif
SpvExecutionModeOutputLinesEXT = 5269,
SpvExecutionModeOutputLinesNV = 5269,
SpvExecutionModeOutputPrimitivesEXT = 5270,
Expand Down Expand Up @@ -244,7 +258,9 @@ typedef enum SpvStorageClass_ {
SpvStorageClassImage = 11,
SpvStorageClassStorageBuffer = 12,
SpvStorageClassTileImageEXT = 4172,
#ifdef SPV_ENABLE_BETA_EXTENSIONS
SpvStorageClassNodePayloadAMDX = 5068,
#endif
SpvStorageClassCallableDataKHR = 5328,
SpvStorageClassCallableDataNV = 5328,
SpvStorageClassIncomingCallableDataKHR = 5329,
Expand Down Expand Up @@ -553,14 +569,30 @@ typedef enum SpvDecoration_ {
SpvDecorationBlockMatchTextureQCOM = 4488,
SpvDecorationBlockMatchSamplerQCOM = 4499,
SpvDecorationExplicitInterpAMD = 4999,
#ifdef SPV_ENABLE_BETA_EXTENSIONS
SpvDecorationNodeSharesPayloadLimitsWithAMDX = 5019,
#endif
#ifdef SPV_ENABLE_BETA_EXTENSIONS
SpvDecorationNodeMaxPayloadsAMDX = 5020,
#endif
#ifdef SPV_ENABLE_BETA_EXTENSIONS
SpvDecorationTrackFinishWritingAMDX = 5078,
#endif
#ifdef SPV_ENABLE_BETA_EXTENSIONS
SpvDecorationPayloadNodeNameAMDX = 5091,
#endif
#ifdef SPV_ENABLE_BETA_EXTENSIONS
SpvDecorationPayloadNodeBaseIndexAMDX = 5098,
#endif
#ifdef SPV_ENABLE_BETA_EXTENSIONS
SpvDecorationPayloadNodeSparseArrayAMDX = 5099,
#endif
#ifdef SPV_ENABLE_BETA_EXTENSIONS
SpvDecorationPayloadNodeArraySizeAMDX = 5100,
#endif
#ifdef SPV_ENABLE_BETA_EXTENSIONS
SpvDecorationPayloadDispatchIndirectAMDX = 5105,
#endif
SpvDecorationOverrideCoverageNV = 5248,
SpvDecorationPassthroughNV = 5250,
SpvDecorationViewportRelativeNV = 5252,
Expand Down Expand Up @@ -724,8 +756,12 @@ typedef enum SpvBuiltIn_ {
SpvBuiltInBaryCoordSmoothSampleAMD = 4997,
SpvBuiltInBaryCoordPullModelAMD = 4998,
SpvBuiltInFragStencilRefEXT = 5014,
#ifdef SPV_ENABLE_BETA_EXTENSIONS
SpvBuiltInRemainingRecursionLevelsAMDX = 5021,
#endif
#ifdef SPV_ENABLE_BETA_EXTENSIONS
SpvBuiltInShaderIndexAMDX = 5073,
#endif
SpvBuiltInViewportMaskNV = 5253,
SpvBuiltInSecondaryPositionNV = 5257,
SpvBuiltInSecondaryViewportMaskNV = 5258,
Expand Down Expand Up @@ -1103,7 +1139,9 @@ typedef enum SpvCapability_ {
SpvCapabilityImageReadWriteLodAMD = 5015,
SpvCapabilityInt64ImageEXT = 5016,
SpvCapabilityShaderClockKHR = 5055,
#ifdef SPV_ENABLE_BETA_EXTENSIONS
SpvCapabilityShaderEnqueueAMDX = 5067,
#endif
SpvCapabilityQuadControlKHR = 5087,
SpvCapabilitySampleMaskOverrideCoverageNV = 5249,
SpvCapabilityGeometryShaderPassthroughNV = 5251,
Expand Down Expand Up @@ -1900,14 +1938,30 @@ typedef enum SpvOp_ {
SpvOpFragmentMaskFetchAMD = 5011,
SpvOpFragmentFetchAMD = 5012,
SpvOpReadClockKHR = 5056,
#ifdef SPV_ENABLE_BETA_EXTENSIONS
SpvOpAllocateNodePayloadsAMDX = 5074,
#endif
#ifdef SPV_ENABLE_BETA_EXTENSIONS
SpvOpEnqueueNodePayloadsAMDX = 5075,
#endif
#ifdef SPV_ENABLE_BETA_EXTENSIONS
SpvOpTypeNodePayloadArrayAMDX = 5076,
#endif
#ifdef SPV_ENABLE_BETA_EXTENSIONS
SpvOpFinishWritingNodePayloadAMDX = 5078,
#endif
#ifdef SPV_ENABLE_BETA_EXTENSIONS
SpvOpNodePayloadArrayLengthAMDX = 5090,
#endif
#ifdef SPV_ENABLE_BETA_EXTENSIONS
SpvOpIsNodePayloadValidAMDX = 5101,
#endif
#ifdef SPV_ENABLE_BETA_EXTENSIONS
SpvOpConstantStringAMDX = 5103,
#endif
#ifdef SPV_ENABLE_BETA_EXTENSIONS
SpvOpSpecConstantStringAMDX = 5104,
#endif
SpvOpGroupNonUniformQuadAllKHR = 5110,
SpvOpGroupNonUniformQuadAnyKHR = 5111,
SpvOpHitObjectRecordHitMotionNV = 5249,
Expand Down
Loading

0 comments on commit 75ce22d

Please sign in to comment.