From 421ce5c979e5be00f1254956bb60e6dbd64bb2ac Mon Sep 17 00:00:00 2001 From: Daniel Koch Date: Wed, 21 Nov 2018 16:11:59 -0500 Subject: Add json support for SPV_EXT_fragment_invocation_density - which aliases the SPV_NV_shading_rate functionality --- include/spirv/unified1/spirv.core.grammar.json | 31 +++++++++++++++++++++----- include/spirv/unified1/spirv.cs | 3 +++ include/spirv/unified1/spirv.h | 3 +++ include/spirv/unified1/spirv.hpp | 3 +++ include/spirv/unified1/spirv.hpp11 | 3 +++ include/spirv/unified1/spirv.json | 3 +++ include/spirv/unified1/spirv.lua | 3 +++ include/spirv/unified1/spirv.py | 3 +++ 8 files changed, 47 insertions(+), 5 deletions(-) diff --git a/include/spirv/unified1/spirv.core.grammar.json b/include/spirv/unified1/spirv.core.grammar.json index 620bb4d..604f69a 100755 --- a/include/spirv/unified1/spirv.core.grammar.json +++ b/include/spirv/unified1/spirv.core.grammar.json @@ -6369,18 +6369,32 @@ "extensions" : [ "SPV_NV_fragment_shader_barycentric" ], "version" : "None" }, + { + "enumerant" : "FragSizeEXT", + "value" : 5292 , + "capabilities" : [ "FragmentDensityEXT", "ShadingRateNV" ], + "extensions" : [ "SPV_EXT_fragment_invocation_density", "SPV_NV_shading_rate" ], + "version" : "None" + }, { "enumerant" : "FragmentSizeNV", "value" : 5292 , - "capabilities" : [ "ShadingRateNV" ], - "extensions" : [ "SPV_NV_shading_rate" ], + "capabilities" : [ "ShadingRateNV", "FragmentDensityEXT" ], + "extensions" : [ "SPV_NV_shading_rate", "SPV_EXT_fragment_invocation_density" ], + "version" : "None" + }, + { + "enumerant" : "FragInvocationCountEXT", + "value" : 5293, + "capabilities" : [ "FragmentDensityEXT", "ShadingRateNV" ], + "extensions" : [ "SPV_EXT_fragment_invocation_density", "SPV_NV_shading_rate" ], "version" : "None" }, { "enumerant" : "InvocationsPerPixelNV", "value" : 5293, - "capabilities" : [ "ShadingRateNV" ], - "extensions" : [ "SPV_NV_shading_rate" ], + "capabilities" : [ "ShadingRateNV", "FragmentDensityEXT" ], + "extensions" : [ "SPV_NV_shading_rate", "SPV_EXT_fragment_invocation_density" ], "version" : "None" }, { @@ -7276,11 +7290,18 @@ "extensions" : [ "SPV_NV_compute_shader_derivatives" ], "version" : "None" }, + { + "enumerant" : "FragmentDensityEXT", + "value" : 5291, + "capabilities" : [ "Shader" ], + "extensions" : [ "SPV_EXT_fragment_invocation_density", "SPV_NV_shading_rate" ], + "version" : "None" + }, { "enumerant" : "ShadingRateNV", "value" : 5291, "capabilities" : [ "Shader" ], - "extensions" : [ "SPV_NV_shading_rate" ], + "extensions" : [ "SPV_NV_shading_rate", "SPV_EXT_fragment_invocation_density" ], "version" : "None" } ] diff --git a/include/spirv/unified1/spirv.cs b/include/spirv/unified1/spirv.cs index 634277d..74db761 100644 --- a/include/spirv/unified1/spirv.cs +++ b/include/spirv/unified1/spirv.cs @@ -511,7 +511,9 @@ namespace Spv MeshViewIndicesNV = 5281, BaryCoordNV = 5286, BaryCoordNoPerspNV = 5287, + FragSizeEXT = 5292, FragmentSizeNV = 5292, + FragInvocationCountEXT = 5293, InvocationsPerPixelNV = 5293, LaunchIdNV = 5319, LaunchSizeNV = 5320, @@ -775,6 +777,7 @@ namespace Spv ImageFootprintNV = 5282, FragmentBarycentricNV = 5284, ComputeDerivativeGroupQuadsNV = 5288, + FragmentDensityEXT = 5291, ShadingRateNV = 5291, GroupNonUniformPartitionedNV = 5297, ShaderNonUniformEXT = 5301, diff --git a/include/spirv/unified1/spirv.h b/include/spirv/unified1/spirv.h index a762f2e..a849a1b 100644 --- a/include/spirv/unified1/spirv.h +++ b/include/spirv/unified1/spirv.h @@ -517,7 +517,9 @@ typedef enum SpvBuiltIn_ { SpvBuiltInMeshViewIndicesNV = 5281, SpvBuiltInBaryCoordNV = 5286, SpvBuiltInBaryCoordNoPerspNV = 5287, + SpvBuiltInFragSizeEXT = 5292, SpvBuiltInFragmentSizeNV = 5292, + SpvBuiltInFragInvocationCountEXT = 5293, SpvBuiltInInvocationsPerPixelNV = 5293, SpvBuiltInLaunchIdNV = 5319, SpvBuiltInLaunchSizeNV = 5320, @@ -775,6 +777,7 @@ typedef enum SpvCapability_ { SpvCapabilityImageFootprintNV = 5282, SpvCapabilityFragmentBarycentricNV = 5284, SpvCapabilityComputeDerivativeGroupQuadsNV = 5288, + SpvCapabilityFragmentDensityEXT = 5291, SpvCapabilityShadingRateNV = 5291, SpvCapabilityGroupNonUniformPartitionedNV = 5297, SpvCapabilityShaderNonUniformEXT = 5301, diff --git a/include/spirv/unified1/spirv.hpp b/include/spirv/unified1/spirv.hpp index 4df1e09..72e577a 100644 --- a/include/spirv/unified1/spirv.hpp +++ b/include/spirv/unified1/spirv.hpp @@ -513,7 +513,9 @@ enum BuiltIn { BuiltInMeshViewIndicesNV = 5281, BuiltInBaryCoordNV = 5286, BuiltInBaryCoordNoPerspNV = 5287, + BuiltInFragSizeEXT = 5292, BuiltInFragmentSizeNV = 5292, + BuiltInFragInvocationCountEXT = 5293, BuiltInInvocationsPerPixelNV = 5293, BuiltInLaunchIdNV = 5319, BuiltInLaunchSizeNV = 5320, @@ -771,6 +773,7 @@ enum Capability { CapabilityImageFootprintNV = 5282, CapabilityFragmentBarycentricNV = 5284, CapabilityComputeDerivativeGroupQuadsNV = 5288, + CapabilityFragmentDensityEXT = 5291, CapabilityShadingRateNV = 5291, CapabilityGroupNonUniformPartitionedNV = 5297, CapabilityShaderNonUniformEXT = 5301, diff --git a/include/spirv/unified1/spirv.hpp11 b/include/spirv/unified1/spirv.hpp11 index f957e58..45f7df0 100644 --- a/include/spirv/unified1/spirv.hpp11 +++ b/include/spirv/unified1/spirv.hpp11 @@ -513,7 +513,9 @@ enum class BuiltIn : unsigned { MeshViewIndicesNV = 5281, BaryCoordNV = 5286, BaryCoordNoPerspNV = 5287, + FragSizeEXT = 5292, FragmentSizeNV = 5292, + FragInvocationCountEXT = 5293, InvocationsPerPixelNV = 5293, LaunchIdNV = 5319, LaunchSizeNV = 5320, @@ -771,6 +773,7 @@ enum class Capability : unsigned { ImageFootprintNV = 5282, FragmentBarycentricNV = 5284, ComputeDerivativeGroupQuadsNV = 5288, + FragmentDensityEXT = 5291, ShadingRateNV = 5291, GroupNonUniformPartitionedNV = 5297, ShaderNonUniformEXT = 5301, diff --git a/include/spirv/unified1/spirv.json b/include/spirv/unified1/spirv.json index 9c136d2..f233480 100644 --- a/include/spirv/unified1/spirv.json +++ b/include/spirv/unified1/spirv.json @@ -552,7 +552,9 @@ "MeshViewIndicesNV": 5281, "BaryCoordNV": 5286, "BaryCoordNoPerspNV": 5287, + "FragSizeEXT": 5292, "FragmentSizeNV": 5292, + "FragInvocationCountEXT": 5293, "InvocationsPerPixelNV": 5293, "LaunchIdNV": 5319, "LaunchSizeNV": 5320, @@ -786,6 +788,7 @@ "ImageFootprintNV": 5282, "FragmentBarycentricNV": 5284, "ComputeDerivativeGroupQuadsNV": 5288, + "FragmentDensityEXT": 5291, "ShadingRateNV": 5291, "GroupNonUniformPartitionedNV": 5297, "ShaderNonUniformEXT": 5301, diff --git a/include/spirv/unified1/spirv.lua b/include/spirv/unified1/spirv.lua index 1c4c027..77adb22 100644 --- a/include/spirv/unified1/spirv.lua +++ b/include/spirv/unified1/spirv.lua @@ -485,7 +485,9 @@ spv = { MeshViewIndicesNV = 5281, BaryCoordNV = 5286, BaryCoordNoPerspNV = 5287, + FragSizeEXT = 5292, FragmentSizeNV = 5292, + FragInvocationCountEXT = 5293, InvocationsPerPixelNV = 5293, LaunchIdNV = 5319, LaunchSizeNV = 5320, @@ -733,6 +735,7 @@ spv = { ImageFootprintNV = 5282, FragmentBarycentricNV = 5284, ComputeDerivativeGroupQuadsNV = 5288, + FragmentDensityEXT = 5291, ShadingRateNV = 5291, GroupNonUniformPartitionedNV = 5297, ShaderNonUniformEXT = 5301, diff --git a/include/spirv/unified1/spirv.py b/include/spirv/unified1/spirv.py index f93e7cf..29027e7 100755 --- a/include/spirv/unified1/spirv.py +++ b/include/spirv/unified1/spirv.py @@ -485,7 +485,9 @@ spv = { 'MeshViewIndicesNV' : 5281, 'BaryCoordNV' : 5286, 'BaryCoordNoPerspNV' : 5287, + 'FragSizeEXT' : 5292, 'FragmentSizeNV' : 5292, + 'FragInvocationCountEXT' : 5293, 'InvocationsPerPixelNV' : 5293, 'LaunchIdNV' : 5319, 'LaunchSizeNV' : 5320, @@ -733,6 +735,7 @@ spv = { 'ImageFootprintNV' : 5282, 'FragmentBarycentricNV' : 5284, 'ComputeDerivativeGroupQuadsNV' : 5288, + 'FragmentDensityEXT' : 5291, 'ShadingRateNV' : 5291, 'GroupNonUniformPartitionedNV' : 5297, 'ShaderNonUniformEXT' : 5301, -- cgit v1.2.3