diff options
author | John Kessenich <cepheus@frii.com> | 2017-09-13 16:25:38 -0600 |
---|---|---|
committer | John Kessenich <cepheus@frii.com> | 2017-09-13 16:25:38 -0600 |
commit | 77240d9e86c6ff135f6de8c7b89a0099a2d90e16 (patch) | |
tree | d53c44760ddf4137b86c80084aa98fd070ded9a5 /include/spirv/1.2 | |
parent | b94aced553dbe2db012696afb76c73605805990a (diff) | |
download | SPIRV-Headers-77240d9e86c6ff135f6de8c7b89a0099a2d90e16.tar.gz |
Add new tokens for SPV_AMD_shader_fragment_mask, and rebuild all headers.
Replaces #47.
Diffstat (limited to 'include/spirv/1.2')
-rw-r--r-- | include/spirv/1.2/spirv.core.grammar.json | 32 | ||||
-rw-r--r-- | include/spirv/1.2/spirv.h | 3 | ||||
-rw-r--r-- | include/spirv/1.2/spirv.hpp | 3 | ||||
-rw-r--r-- | include/spirv/1.2/spirv.hpp11 | 3 | ||||
-rw-r--r-- | include/spirv/1.2/spirv.json | 5 | ||||
-rw-r--r-- | include/spirv/1.2/spirv.lua | 3 | ||||
-rwxr-xr-x | include/spirv/1.2/spirv.py | 3 |
7 files changed, 50 insertions, 2 deletions
diff --git a/include/spirv/1.2/spirv.core.grammar.json b/include/spirv/1.2/spirv.core.grammar.json index 63d4a05..e2aba66 100644 --- a/include/spirv/1.2/spirv.core.grammar.json +++ b/include/spirv/1.2/spirv.core.grammar.json @@ -3286,6 +3286,29 @@ { "kind" : "IdRef", "name" : "'X'" } ], "capabilities" : [ "Groups" ] + }, + { + "opname" : "OpFragmentMaskFetchAMD", + "opcode" : 5011, + "operands" : [ + { "kind" : "IdResultType" }, + { "kind" : "IdResult" }, + { "kind" : "IdRef", "name" : "'Image'" }, + { "kind" : "IdRef", "name" : "'Coordinate'" } + ], + "capabilities" : [ "FragmentMaskAMD" ] + }, + { + "opname" : "OpFragmentFetchAMD", + "opcode" : 5012, + "operands" : [ + { "kind" : "IdResultType" }, + { "kind" : "IdResult" }, + { "kind" : "IdRef", "name" : "'Image'" }, + { "kind" : "IdRef", "name" : "'Coordinate'" }, + { "kind" : "IdRef", "name" : "'Fragment Index'" } + ], + "capabilities" : [ "FragmentMaskAMD" ] } ], "operand_kinds" : [ @@ -3980,7 +4003,8 @@ "extensions" : [ "SPV_KHR_storage_buffer_storage_class", "SPV_KHR_variable_pointers" - ] + ], + "capabilities" : [ "Shader" ] } ] }, @@ -5696,6 +5720,12 @@ "extensions" : [ "SPV_AMD_texture_gather_bias_lod" ] }, { + "enumerant" : "FragmentMaskAMD", + "value" : 5010, + "capabilities" : [ "Shader" ], + "extensions" : [ "SPV_AMD_shader_fragment_mask" ] + }, + { "enumerant" : "StencilExportEXT", "value" : 5013, "capabilities" : [ "Shader" ], diff --git a/include/spirv/1.2/spirv.h b/include/spirv/1.2/spirv.h index 7fae157..c202b36 100644 --- a/include/spirv/1.2/spirv.h +++ b/include/spirv/1.2/spirv.h @@ -663,6 +663,7 @@ typedef enum SpvCapability_ { SpvCapabilityAtomicStorageOps = 4445, SpvCapabilitySampleMaskPostDepthCoverage = 4447, SpvCapabilityImageGatherBiasLodAMD = 5009, + SpvCapabilityFragmentMaskAMD = 5010, SpvCapabilityStencilExportEXT = 5013, SpvCapabilityImageReadWriteLodAMD = 5015, SpvCapabilitySampleMaskOverrideCoverageNV = 5249, @@ -996,6 +997,8 @@ typedef enum SpvOp_ { SpvOpGroupFMaxNonUniformAMD = 5005, SpvOpGroupUMaxNonUniformAMD = 5006, SpvOpGroupSMaxNonUniformAMD = 5007, + SpvOpFragmentMaskFetchAMD = 5011, + SpvOpFragmentFetchAMD = 5012, SpvOpMax = 0x7fffffff, } SpvOp; diff --git a/include/spirv/1.2/spirv.hpp b/include/spirv/1.2/spirv.hpp index 16212c7..725827f 100644 --- a/include/spirv/1.2/spirv.hpp +++ b/include/spirv/1.2/spirv.hpp @@ -659,6 +659,7 @@ enum Capability { CapabilityAtomicStorageOps = 4445, CapabilitySampleMaskPostDepthCoverage = 4447, CapabilityImageGatherBiasLodAMD = 5009, + CapabilityFragmentMaskAMD = 5010, CapabilityStencilExportEXT = 5013, CapabilityImageReadWriteLodAMD = 5015, CapabilitySampleMaskOverrideCoverageNV = 5249, @@ -992,6 +993,8 @@ enum Op { OpGroupFMaxNonUniformAMD = 5005, OpGroupUMaxNonUniformAMD = 5006, OpGroupSMaxNonUniformAMD = 5007, + OpFragmentMaskFetchAMD = 5011, + OpFragmentFetchAMD = 5012, OpMax = 0x7fffffff, }; diff --git a/include/spirv/1.2/spirv.hpp11 b/include/spirv/1.2/spirv.hpp11 index 6ae63b0..f0013aa 100644 --- a/include/spirv/1.2/spirv.hpp11 +++ b/include/spirv/1.2/spirv.hpp11 @@ -659,6 +659,7 @@ enum class Capability : unsigned { AtomicStorageOps = 4445, SampleMaskPostDepthCoverage = 4447, ImageGatherBiasLodAMD = 5009, + FragmentMaskAMD = 5010, StencilExportEXT = 5013, ImageReadWriteLodAMD = 5015, SampleMaskOverrideCoverageNV = 5249, @@ -992,6 +993,8 @@ enum class Op : unsigned { OpGroupFMaxNonUniformAMD = 5005, OpGroupUMaxNonUniformAMD = 5006, OpGroupSMaxNonUniformAMD = 5007, + OpFragmentMaskFetchAMD = 5011, + OpFragmentFetchAMD = 5012, Max = 0x7fffffff, }; diff --git a/include/spirv/1.2/spirv.json b/include/spirv/1.2/spirv.json index d5ae7ee..6ade960 100644 --- a/include/spirv/1.2/spirv.json +++ b/include/spirv/1.2/spirv.json @@ -684,6 +684,7 @@ "AtomicStorageOps": 4445, "SampleMaskPostDepthCoverage": 4447, "ImageGatherBiasLodAMD": 5009, + "FragmentMaskAMD": 5010, "StencilExportEXT": 5013, "ImageReadWriteLodAMD": 5015, "SampleMaskOverrideCoverageNV": 5249, @@ -1019,7 +1020,9 @@ "OpGroupSMinNonUniformAMD": 5004, "OpGroupFMaxNonUniformAMD": 5005, "OpGroupUMaxNonUniformAMD": 5006, - "OpGroupSMaxNonUniformAMD": 5007 + "OpGroupSMaxNonUniformAMD": 5007, + "OpFragmentMaskFetchAMD": 5011, + "OpFragmentFetchAMD": 5012 } } ] diff --git a/include/spirv/1.2/spirv.lua b/include/spirv/1.2/spirv.lua index 58acd5a..6578e48 100644 --- a/include/spirv/1.2/spirv.lua +++ b/include/spirv/1.2/spirv.lua @@ -621,6 +621,7 @@ spv = { AtomicStorageOps = 4445, SampleMaskPostDepthCoverage = 4447, ImageGatherBiasLodAMD = 5009, + FragmentMaskAMD = 5010, StencilExportEXT = 5013, ImageReadWriteLodAMD = 5015, SampleMaskOverrideCoverageNV = 5249, @@ -953,6 +954,8 @@ spv = { OpGroupFMaxNonUniformAMD = 5005, OpGroupUMaxNonUniformAMD = 5006, OpGroupSMaxNonUniformAMD = 5007, + OpFragmentMaskFetchAMD = 5011, + OpFragmentFetchAMD = 5012, }, } diff --git a/include/spirv/1.2/spirv.py b/include/spirv/1.2/spirv.py index e56466b..d2b3bca 100755 --- a/include/spirv/1.2/spirv.py +++ b/include/spirv/1.2/spirv.py @@ -621,6 +621,7 @@ spv = { 'AtomicStorageOps' : 4445, 'SampleMaskPostDepthCoverage' : 4447, 'ImageGatherBiasLodAMD' : 5009, + 'FragmentMaskAMD' : 5010, 'StencilExportEXT' : 5013, 'ImageReadWriteLodAMD' : 5015, 'SampleMaskOverrideCoverageNV' : 5249, @@ -953,6 +954,8 @@ spv = { 'OpGroupFMaxNonUniformAMD' : 5005, 'OpGroupUMaxNonUniformAMD' : 5006, 'OpGroupSMaxNonUniformAMD' : 5007, + 'OpFragmentMaskFetchAMD' : 5011, + 'OpFragmentFetchAMD' : 5012, }, } |