<div dir="ltr">Acked-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>> </div> <div class="gmail_quote"><div dir="ltr">On Sun, Jul 8, 2018 at 5:29 PM Jose Maria Casanova Crespo <<a href="mailto:jmcasanova@igalia.com">jmcasanova@igalia.com</a>> wrote: </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Update to headers and grammar to ff684ffc6a35d2a58f0f63108877d0064ea33feb --- src/compiler/spirv/spirv.core.grammar.json | 44 ++++++++++++++++++---- src/compiler/spirv/spirv.h | 3 ++ 2 files changed, 40 insertions(+), 7 deletions(-) diff --git a/src/compiler/spirv/spirv.core.grammar.json b/src/compiler/spirv/spirv.core.grammar.json index a03c024335c..cb641420d07 100644 --- a/src/compiler/spirv/spirv.core.grammar.json +++ b/src/compiler/spirv/spirv.core.grammar.json @@ -3914,7 +3914,7 @@ { "kind" : "IdRef", "name" : "'Target'" }, { "kind" : "Decoration" } ], - "extensions" : [ "SPV_GOOGLE_decorate_string" ], + "extensions" : [ "SPV_GOOGLE_decorate_string", "SPV_GOOGLE_hlsl_functionality1" ], "version" : "None" }, { @@ -3925,7 +3925,7 @@ { "kind" : "LiteralInteger", "name" : "'Member'" }, { "kind" : "Decoration" } ], - "extensions" : [ "SPV_GOOGLE_decorate_string" ], + "extensions" : [ "SPV_GOOGLE_decorate_string", "SPV_GOOGLE_hlsl_functionality1" ], "version" : "None" }, { @@ -3991,6 +3991,7 @@ { "enumerant" : "ConstOffsets", "value" : "0x0020", + "capabilities" : [ "ImageGatherExtended" ], "parameters" : [ { "kind" : "IdRef" } ] @@ -5550,12 +5551,14 @@ "enumerant" : "OverrideCoverageNV", "value" : 5248, "capabilities" : [ "SampleMaskOverrideCoverageNV" ], + "extensions" : [ "SPV_NV_sample_mask_override_coverage" ], "version" : "None" }, { "enumerant" : "PassthroughNV", "value" : 5250, "capabilities" : [ "GeometryShaderPassthroughNV" ], + "extensions" : [ "SPV_NV_geometry_shader_passthrough" ], "version" : "None" }, { @@ -5568,6 +5571,7 @@ "enumerant" : "SecondaryViewportRelativeNV", "value" : 5256, "capabilities" : [ "ShaderStereoViewNV" ], + "extensions" : [ "SPV_NV_stereo_view_rendering" ], "version" : "None", "parameters" : [ { "kind" : "LiteralInteger", "name" : "'Offset'" } @@ -5960,12 +5964,14 @@ "enumerant" : "SecondaryPositionNV", "value" : 5257, "capabilities" : [ "ShaderStereoViewNV" ], + "extensions" : [ "SPV_NV_stereo_view_rendering" ], "version" : "None" }, { "enumerant" : "SecondaryViewportMaskNV", "value" : 5258, "capabilities" : [ "ShaderStereoViewNV" ], + "extensions" : [ "SPV_NV_stereo_view_rendering" ], "version" : "None" }, { @@ -6043,17 +6049,23 @@ { "enumerant" : "PartitionedReduceNV", "value" : 6, - "capabilities" : [ "GroupNonUniformPartitionedNV" ] + "capabilities" : [ "GroupNonUniformPartitionedNV" ], + "extensions" : [ "SPV_NV_shader_subgroup_partitioned" ], + "version" : "None" }, { "enumerant" : "PartitionedInclusiveScanNV", "value" : 7, - "capabilities" : [ "GroupNonUniformPartitionedNV" ] + "capabilities" : [ "GroupNonUniformPartitionedNV" ], + "extensions" : [ "SPV_NV_shader_subgroup_partitioned" ], + "version" : "None" }, { "enumerant" : "PartitionedExclusiveScanNV", "value" : 8, - "capabilities" : [ "GroupNonUniformPartitionedNV" ] + "capabilities" : [ "GroupNonUniformPartitionedNV" ], + "extensions" : [ "SPV_NV_shader_subgroup_partitioned" ], + "version" : "None" } ] }, @@ -6260,8 +6272,7 @@ }, { "enumerant" : "Int8", - "value" : 39, - "capabilities" : [ "Kernel" ] + "value" : 39 }, { "enumerant" : "InputAttachment", @@ -6518,6 +6529,25 @@ "extensions" : [ "SPV_KHR_post_depth_coverage" ], "version" : "None" }, + { + "enumerant" : "StorageBuffer8BitAccess", + "value" : 4448, + "extensions" : [ "SPV_KHR_8bit_storage" ], + "version" : "None" + }, + { + "enumerant" : "UniformAndStorageBuffer8BitAccess", + "value" : 4449, + "capabilities" : [ "StorageBuffer8BitAccess" ], + "extensions" : [ "SPV_KHR_8bit_storage" ], + "version" : "None" + }, + { + "enumerant" : "StoragePushConstant8", + "value" : 4450, + "extensions" : [ "SPV_KHR_8bit_storage" ], + "version" : "None" + }, { "enumerant" : "Float16ImageAMD", "value" : 5008, diff --git a/src/compiler/spirv/spirv.h b/src/compiler/spirv/spirv.h index e0a0330ba63..4c90c936ce0 100644 --- a/src/compiler/spirv/spirv.h +++ b/src/compiler/spirv/spirv.h @@ -683,6 +683,9 @@ typedef enum SpvCapability_ { SpvCapabilityVariablePointers = 4442, SpvCapabilityAtomicStorageOps = 4445, SpvCapabilitySampleMaskPostDepthCoverage = 4447, + SpvCapabilityStorageBuffer8BitAccess = 4448, + SpvCapabilityUniformAndStorageBuffer8BitAccess = 4449, + SpvCapabilityStoragePushConstant8 = 4450, SpvCapabilityFloat16ImageAMD = 5008, SpvCapabilityImageGatherBiasLodAMD = 5009, SpvCapabilityFragmentMaskAMD = 5010, -- 2.17.1 _______________________________________________ mesa-dev mailing list <a href="mailto:mesa-dev@lists.freedesktop.org" target="_blank">mesa-dev@lists.freedesktop.org</a> <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a> </blockquote></div>