Skip to content

Commit

Permalink
Move to version 1.4 of SPIR-V.
Browse files Browse the repository at this point in the history
  • Loading branch information
@johnkslang
johnkslang committed May 7, 2019
1 parent a5d33a2 commit c4f8f65
Show file tree
Hide file tree
Showing 12 changed files with 418 additions and 58 deletions.
182 changes: 163 additions & 19 deletions include/spirv/unified1/spirv.core.grammar.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
],
"magic_number" : "0x07230203",
"major_version" : 1,
"minor_version" : 3,
"minor_version" : 4,
"revision" : 1,
"instructions" : [
{
Expand Down Expand Up @@ -519,6 +519,7 @@
"operands" : [
{ "kind" : "IdRef", "name" : "'Target'" },
{ "kind" : "IdRef", "name" : "'Source'" },
{ "kind" : "MemoryAccess", "quantifier" : "?" },
{ "kind" : "MemoryAccess", "quantifier" : "?" }
]
},
Expand All @@ -529,6 +530,7 @@
{ "kind" : "IdRef", "name" : "'Target'" },
{ "kind" : "IdRef", "name" : "'Source'" },
{ "kind" : "IdRef", "name" : "'Size'" },
{ "kind" : "MemoryAccess", "quantifier" : "?" },
{ "kind" : "MemoryAccess", "quantifier" : "?" }
],
"capabilities" : [ "Addresses" ]
Expand Down Expand Up @@ -2100,7 +2102,8 @@
{ "kind" : "IdRef", "name" : "'Value'" },
{ "kind" : "IdRef", "name" : "'Comparator'" }
],
"capabilities" : [ "Kernel" ]
"capabilities" : [ "Kernel" ],
"lastVersion" : "1.3"
},
{
"opname" : "OpAtomicIIncrement",
Expand Down Expand Up @@ -3605,6 +3608,50 @@
"capabilities" : [ "GroupNonUniformQuad" ],
"version" : "1.3"
},
{
"opname" : "OpCopyLogical",
"opcode" : 400,
"operands" : [
{ "kind" : "IdResultType" },
{ "kind" : "IdResult" },
{ "kind" : "IdRef", "name" : "'Operand'" }
],
"version" : "1.4"
},
{
"opname" : "OpPtrEqual",
"opcode" : 401,
"operands" : [
{ "kind" : "IdResultType" },
{ "kind" : "IdResult" },
{ "kind" : "IdRef", "name" : "'Operand 1'" },
{ "kind" : "IdRef", "name" : "'Operand 2'" }
],
"version" : "1.4"
},
{
"opname" : "OpPtrNotEqual",
"opcode" : 402,
"operands" : [
{ "kind" : "IdResultType" },
{ "kind" : "IdResult" },
{ "kind" : "IdRef", "name" : "'Operand 1'" },
{ "kind" : "IdRef", "name" : "'Operand 2'" }
],
"version" : "1.4"
},
{
"opname" : "OpPtrDiff",
"opcode" : 403,
"operands" : [
{ "kind" : "IdResultType" },
{ "kind" : "IdResult" },
{ "kind" : "IdRef", "name" : "'Operand 1'" },
{ "kind" : "IdRef", "name" : "'Operand 2'" }
],
"capabilities" : [ "Addresses", "VariablePointers", "VariablePointersStorageBuffer" ],
"version" : "1.4"
},
{
"opname" : "OpSubgroupBallotKHR",
"opcode" : 4421,
Expand Down Expand Up @@ -4118,6 +4165,16 @@
"capabilities" : [ "SubgroupImageMediaBlockIOINTEL" ],
"version" : "None"
},
{
"opname" : "OpDecorateString",
"opcode" : 5632,
"operands" : [
{ "kind" : "IdRef", "name" : "'Target'" },
{ "kind" : "Decoration" }
],
"extensions" : [ "SPV_GOOGLE_decorate_string", "SPV_GOOGLE_hlsl_functionality1" ],
"version" : "1.4"
},
{
"opname" : "OpDecorateStringGOOGLE",
"opcode" : 5632,
Expand All @@ -4126,7 +4183,18 @@
{ "kind" : "Decoration" }
],
"extensions" : [ "SPV_GOOGLE_decorate_string", "SPV_GOOGLE_hlsl_functionality1" ],
"version" : "None"
"version" : "1.4"
},
{
"opname" : "OpMemberDecorateString",
"opcode" : 5633,
"operands" : [
{ "kind" : "IdRef", "name" : "'Struct Type'" },
{ "kind" : "LiteralInteger", "name" : "'Member'" },
{ "kind" : "Decoration" }
],
"extensions" : [ "SPV_GOOGLE_decorate_string", "SPV_GOOGLE_hlsl_functionality1" ],
"version" : "1.4"
},
{
"opname" : "OpMemberDecorateStringGOOGLE",
Expand All @@ -4137,7 +4205,7 @@
{ "kind" : "Decoration" }
],
"extensions" : [ "SPV_GOOGLE_decorate_string", "SPV_GOOGLE_hlsl_functionality1" ],
"version" : "None"
"version" : "1.4"
},
{
"opname" : "OpVmeImageINTEL",
Expand Down Expand Up @@ -5634,6 +5702,16 @@
"enumerant" : "VolatileTexelKHR",
"value" : "0x0800",
"capabilities" : [ "VulkanMemoryModelKHR" ]
},
{
"enumerant" : "SignExtend",
"value" : "0x1000",
"version" : "1.4"
},
{
"enumerant" : "ZeroExtend",
"value" : "0x2000",
"version" : "1.4"
}
]
},
Expand Down Expand Up @@ -5718,6 +5796,46 @@
{ "kind" : "LiteralInteger" }
],
"version" : "1.1"
},
{
"enumerant" : "MinIterations",
"value" : "0x0010",
"parameters" : [
{ "kind" : "LiteralInteger" }
],
"version" : "1.4"
},
{
"enumerant" : "MaxIterations",
"value" : "0x0020",
"parameters" : [
{ "kind" : "LiteralInteger" }
],
"version" : "1.4"
},
{
"enumerant" : "IterationMultiple",
"value" : "0x0040",
"parameters" : [
{ "kind" : "LiteralInteger" }
],
"version" : "1.4"
},
{
"enumerant" : "PeelCount",
"value" : "0x0080",
"parameters" : [
{ "kind" : "LiteralInteger" }
],
"version" : "1.4"
},
{
"enumerant" : "PartialCount",
"value" : "0x0100",
"parameters" : [
{ "kind" : "LiteralInteger" }
],
"version" : "1.4"
}
]
},
Expand Down Expand Up @@ -6284,15 +6402,15 @@
"extensions" : [ "SPV_KHR_post_depth_coverage" ],
"version" : "None"
},
{
{
"enumerant" : "DenormPreserve",
"value" : 4459,
"capabilities" : [ "DenormPreserve" ],
"extensions" : [ "SPV_KHR_float_controls" ],
"parameters" : [
{ "kind" : "LiteralInteger", "name" : "'Target Width'" }
],
"version" : "None"
"version" : "1.4"
},
{
"enumerant" : "DenormFlushToZero",
Expand All @@ -6302,7 +6420,7 @@
"parameters" : [
{ "kind" : "LiteralInteger", "name" : "'Target Width'" }
],
"version" : "None"
"version" : "1.4"
},
{
"enumerant" : "SignedZeroInfNanPreserve",
Expand All @@ -6312,7 +6430,7 @@
"parameters" : [
{ "kind" : "LiteralInteger", "name" : "'Target Width'" }
],
"version" : "None"
"version" : "1.4"
},
{
"enumerant" : "RoundingModeRTE",
Expand All @@ -6322,7 +6440,7 @@
"parameters" : [
{ "kind" : "LiteralInteger", "name" : "'Target Width'" }
],
"version" : "None"
"version" : "1.4"
},
{
"enumerant" : "RoundingModeRTZ",
Expand All @@ -6332,7 +6450,7 @@
"parameters" : [
{ "kind" : "LiteralInteger", "name" : "'Target Width'" }
],
"version" : "None"
"version" : "1.4"
},
{
"enumerant" : "StencilRefReplacingEXT",
Expand Down Expand Up @@ -7112,7 +7230,8 @@
{
"enumerant" : "BufferBlock",
"value" : 3,
"capabilities" : [ "Shader" ]
"capabilities" : [ "Shader" ],
"lastVersion" : "1.3"
},
{
"enumerant" : "RowMajor",
Expand Down Expand Up @@ -7226,6 +7345,15 @@
"value" : 26,
"capabilities" : [ "Shader" ]
},
{
"enumerant" : "UniformId",
"value" : 27,
"capabilities" : [ "Shader" ],
"parameters" : [
{ "kind" : "IdScope", "name" : "'Execution'" }
],
"version" : "1.4"
},
{
"enumerant" : "SaturatedConversion",
"value" : 28,
Expand Down Expand Up @@ -7387,13 +7515,13 @@
"enumerant" : "NoSignedWrap",
"value" : 4469,
"extensions" : [ "SPV_KHR_no_integer_wrap_decoration" ],
"version" : "None"
"version" : "1.4"
},
{
"enumerant" : "NoUnsignedWrap",
"value" : 4470,
"extensions" : [ "SPV_KHR_no_integer_wrap_decoration" ],
"version" : "None"
"version" : "1.4"
},
{
"enumerant" : "ExplicitInterpAMD",
Expand Down Expand Up @@ -7452,7 +7580,7 @@
"extensions" : [ "SPV_NV_mesh_shader" ],
"version" : "None"
},
{
{
"enumerant" : "PerVertexNV",
"value" : 5285,
"capabilities" : [ "FragmentBarycentricNV" ],
Expand All @@ -7464,6 +7592,14 @@
"value" : 5300,
"capabilities" : [ "ShaderNonUniformEXT" ]
},
{
"enumerant" : "CounterBuffer",
"value" : 5634,
"parameters" : [
{ "kind" : "IdRef", "name" : "'Counter Buffer'" }
],
"version" : "1.4"
},
{
"enumerant" : "HlslCounterBufferGOOGLE",
"value" : 5634,
Expand All @@ -7473,6 +7609,14 @@
"extensions" : [ "SPV_GOOGLE_hlsl_functionality1" ],
"version" : "None"
},
{
"enumerant" : "UserSemantic",
"value" : 5635,
"parameters" : [
{ "kind" : "LiteralString", "name" : "'Semantic'" }
],
"version" : "1.4"
},
{
"enumerant" : "HlslSemanticGOOGLE",
"value" : 5635,
Expand Down Expand Up @@ -8638,31 +8782,31 @@
"enumerant" : "DenormPreserve",
"value" : 4464,
"extensions" : [ "SPV_KHR_float_controls" ],
"version" : "None"
"version" : "1.4"
},
{
"enumerant" : "DenormFlushToZero",
"value" : 4465,
"extensions" : [ "SPV_KHR_float_controls" ],
"version" : "None"
"version" : "1.4"
},
{
"enumerant" : "SignedZeroInfNanPreserve",
"value" : 4466,
"extensions" : [ "SPV_KHR_float_controls" ],
"version" : "None"
"version" : "1.4"
},
{
"enumerant" : "RoundingModeRTE",
"value" : 4467,
"extensions" : [ "SPV_KHR_float_controls" ],
"version" : "None"
"version" : "1.4"
},
{
"enumerant" : "RoundingModeRTZ",
"value" : 4468,
"extensions" : [ "SPV_KHR_float_controls" ],
"version" : "None"
"version" : "1.4"
},
{
"enumerant" : "Float16ImageAMD",
Expand Down
Loading

0 comments on commit c4f8f65

Please sign in to comment.