diff options
author | John Kessenich <johnkslang@users.noreply.github.com> | 2019-06-02 20:16:27 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-02 20:16:27 -0600 |
commit | 9280c0b4f470f7a0f6f9862764f66103b9644ce2 (patch) | |
tree | 8fb5f0907adcf62edb2eb07dd3edbe88df3199db | |
parent | 903d447d96eb3973bdf95e9d16581b704784a0e3 (diff) | |
parent | 630d06236a37830b6bcdbeffb880af491a3aabac (diff) | |
download | spirv-headers-9280c0b4f470f7a0f6f9862764f66103b9644ce2.tar.gz |
Merge pull request #115 from dgkoch/SPV_NV_sm_shader_builts
Add support for SPV_NV_sm_shader_builtins
-rw-r--r-- | include/spirv/unified1/spirv.core.grammar.json | 31 | ||||
-rw-r--r-- | include/spirv/unified1/spirv.cs | 5 | ||||
-rw-r--r-- | include/spirv/unified1/spirv.h | 5 | ||||
-rw-r--r-- | include/spirv/unified1/spirv.hpp | 5 | ||||
-rw-r--r-- | include/spirv/unified1/spirv.hpp11 | 5 | ||||
-rw-r--r-- | include/spirv/unified1/spirv.json | 7 | ||||
-rw-r--r-- | include/spirv/unified1/spirv.lua | 5 | ||||
-rw-r--r-- | include/spirv/unified1/spirv.py | 5 | ||||
-rw-r--r-- | include/spirv/unified1/spv.d | 5 |
9 files changed, 72 insertions, 1 deletions
diff --git a/include/spirv/unified1/spirv.core.grammar.json b/include/spirv/unified1/spirv.core.grammar.json index aa5e0a5..2fa6ab9 100644 --- a/include/spirv/unified1/spirv.core.grammar.json +++ b/include/spirv/unified1/spirv.core.grammar.json @@ -8383,6 +8383,30 @@ "value" : 5351, "capabilities" : [ "RayTracingNV" ], "extensions" : [ "SPV_NV_ray_tracing" ] + }, + { + "enumerant" : "WarpsPerSMNV", + "value" : 5374, + "capabilities" : [ "ShaderSMBuiltinsNV" ], + "extensions" : [ "SPV_NV_shader_sm_builtins" ] + }, + { + "enumerant" : "SMCountNV", + "value" : 5375, + "capabilities" : [ "ShaderSMBuiltinsNV" ], + "extensions" : [ "SPV_NV_shader_sm_builtins" ] + }, + { + "enumerant" : "WarpIDNV", + "value" : 5376, + "capabilities" : [ "ShaderSMBuiltinsNV" ], + "extensions" : [ "SPV_NV_shader_sm_builtins" ] + }, + { + "enumerant" : "SMIDNV", + "value" : 5377, + "capabilities" : [ "ShaderSMBuiltinsNV" ], + "extensions" : [ "SPV_NV_shader_sm_builtins" ] } ] }, @@ -9282,6 +9306,13 @@ "capabilities" : [ "Shader" ], "extensions" : [ "SPV_NV_cooperative_matrix" ], "version" : "None" + }, + { + "enumerant" : "ShaderSMBuiltinsNV", + "value" : 5373, + "capabilities" : [ "Shader" ], + "extensions" : [ "SPV_NV_shader_sm_builtins" ], + "version" : "None" } ] }, diff --git a/include/spirv/unified1/spirv.cs b/include/spirv/unified1/spirv.cs index 7fea1db..16dd6bf 100644 --- a/include/spirv/unified1/spirv.cs +++ b/include/spirv/unified1/spirv.cs @@ -549,6 +549,10 @@ namespace Spv HitTNV = 5332, HitKindNV = 5333, IncomingRayFlagsNV = 5351, + WarpsPerSMNV = 5374, + SMCountNV = 5375, + WarpIDNV = 5376, + SMIDNV = 5377, } public enum SelectionControlShift @@ -833,6 +837,7 @@ namespace Spv PhysicalStorageBufferAddressesEXT = 5347, ComputeDerivativeGroupLinearNV = 5350, CooperativeMatrixNV = 5357, + ShaderSMBuiltinsNV = 5373, SubgroupShuffleINTEL = 5568, SubgroupBufferBlockIOINTEL = 5569, SubgroupImageBlockIOINTEL = 5570, diff --git a/include/spirv/unified1/spirv.h b/include/spirv/unified1/spirv.h index 51f566e..3ccfd61 100644 --- a/include/spirv/unified1/spirv.h +++ b/include/spirv/unified1/spirv.h @@ -555,6 +555,10 @@ typedef enum SpvBuiltIn_ { SpvBuiltInHitTNV = 5332, SpvBuiltInHitKindNV = 5333, SpvBuiltInIncomingRayFlagsNV = 5351, + SpvBuiltInWarpsPerSMNV = 5374, + SpvBuiltInSMCountNV = 5375, + SpvBuiltInWarpIDNV = 5376, + SpvBuiltInSMIDNV = 5377, SpvBuiltInMax = 0x7fffffff, } SpvBuiltIn; @@ -833,6 +837,7 @@ typedef enum SpvCapability_ { SpvCapabilityPhysicalStorageBufferAddressesEXT = 5347, SpvCapabilityComputeDerivativeGroupLinearNV = 5350, SpvCapabilityCooperativeMatrixNV = 5357, + SpvCapabilityShaderSMBuiltinsNV = 5373, SpvCapabilitySubgroupShuffleINTEL = 5568, SpvCapabilitySubgroupBufferBlockIOINTEL = 5569, SpvCapabilitySubgroupImageBlockIOINTEL = 5570, diff --git a/include/spirv/unified1/spirv.hpp b/include/spirv/unified1/spirv.hpp index 22cbe84..6e9795e 100644 --- a/include/spirv/unified1/spirv.hpp +++ b/include/spirv/unified1/spirv.hpp @@ -551,6 +551,10 @@ enum BuiltIn { BuiltInHitTNV = 5332, BuiltInHitKindNV = 5333, BuiltInIncomingRayFlagsNV = 5351, + BuiltInWarpsPerSMNV = 5374, + BuiltInSMCountNV = 5375, + BuiltInWarpIDNV = 5376, + BuiltInSMIDNV = 5377, BuiltInMax = 0x7fffffff, }; @@ -829,6 +833,7 @@ enum Capability { CapabilityPhysicalStorageBufferAddressesEXT = 5347, CapabilityComputeDerivativeGroupLinearNV = 5350, CapabilityCooperativeMatrixNV = 5357, + CapabilityShaderSMBuiltinsNV = 5373, CapabilitySubgroupShuffleINTEL = 5568, CapabilitySubgroupBufferBlockIOINTEL = 5569, CapabilitySubgroupImageBlockIOINTEL = 5570, diff --git a/include/spirv/unified1/spirv.hpp11 b/include/spirv/unified1/spirv.hpp11 index ee9f106..fd07404 100644 --- a/include/spirv/unified1/spirv.hpp11 +++ b/include/spirv/unified1/spirv.hpp11 @@ -551,6 +551,10 @@ enum class BuiltIn : unsigned { HitTNV = 5332, HitKindNV = 5333, IncomingRayFlagsNV = 5351, + WarpsPerSMNV = 5374, + SMCountNV = 5375, + WarpIDNV = 5376, + SMIDNV = 5377, Max = 0x7fffffff, }; @@ -829,6 +833,7 @@ enum class Capability : unsigned { PhysicalStorageBufferAddressesEXT = 5347, ComputeDerivativeGroupLinearNV = 5350, CooperativeMatrixNV = 5357, + ShaderSMBuiltinsNV = 5373, SubgroupShuffleINTEL = 5568, SubgroupBufferBlockIOINTEL = 5569, SubgroupImageBlockIOINTEL = 5570, diff --git a/include/spirv/unified1/spirv.json b/include/spirv/unified1/spirv.json index 24929c8..c4e1f23 100644 --- a/include/spirv/unified1/spirv.json +++ b/include/spirv/unified1/spirv.json @@ -587,7 +587,11 @@ "WorldToObjectNV": 5331, "HitTNV": 5332, "HitKindNV": 5333, - "IncomingRayFlagsNV": 5351 + "IncomingRayFlagsNV": 5351, + "WarpsPerSMNV": 5374, + "SMCountNV": 5375, + "WarpIDNV": 5376, + "SMIDNV": 5377 } }, { @@ -837,6 +841,7 @@ "PhysicalStorageBufferAddressesEXT": 5347, "ComputeDerivativeGroupLinearNV": 5350, "CooperativeMatrixNV": 5357, + "ShaderSMBuiltinsNV": 5373, "SubgroupShuffleINTEL": 5568, "SubgroupBufferBlockIOINTEL": 5569, "SubgroupImageBlockIOINTEL": 5570, diff --git a/include/spirv/unified1/spirv.lua b/include/spirv/unified1/spirv.lua index 5c134ce..10a448f 100644 --- a/include/spirv/unified1/spirv.lua +++ b/include/spirv/unified1/spirv.lua @@ -523,6 +523,10 @@ spv = { HitTNV = 5332, HitKindNV = 5333, IncomingRayFlagsNV = 5351, + WarpsPerSMNV = 5374, + SMCountNV = 5375, + WarpIDNV = 5376, + SMIDNV = 5377, }, SelectionControlShift = { @@ -791,6 +795,7 @@ spv = { PhysicalStorageBufferAddressesEXT = 5347, ComputeDerivativeGroupLinearNV = 5350, CooperativeMatrixNV = 5357, + ShaderSMBuiltinsNV = 5373, SubgroupShuffleINTEL = 5568, SubgroupBufferBlockIOINTEL = 5569, SubgroupImageBlockIOINTEL = 5570, diff --git a/include/spirv/unified1/spirv.py b/include/spirv/unified1/spirv.py index 314a551..d202a5d 100644 --- a/include/spirv/unified1/spirv.py +++ b/include/spirv/unified1/spirv.py @@ -523,6 +523,10 @@ spv = { 'HitTNV' : 5332, 'HitKindNV' : 5333, 'IncomingRayFlagsNV' : 5351, + 'WarpsPerSMNV' : 5374, + 'SMCountNV' : 5375, + 'WarpIDNV' : 5376, + 'SMIDNV' : 5377, }, 'SelectionControlShift' : { @@ -791,6 +795,7 @@ spv = { 'PhysicalStorageBufferAddressesEXT' : 5347, 'ComputeDerivativeGroupLinearNV' : 5350, 'CooperativeMatrixNV' : 5357, + 'ShaderSMBuiltinsNV' : 5373, 'SubgroupShuffleINTEL' : 5568, 'SubgroupBufferBlockIOINTEL' : 5569, 'SubgroupImageBlockIOINTEL' : 5570, diff --git a/include/spirv/unified1/spv.d b/include/spirv/unified1/spv.d index f76f0c1..8e783ff 100644 --- a/include/spirv/unified1/spv.d +++ b/include/spirv/unified1/spv.d @@ -552,6 +552,10 @@ enum BuiltIn : uint HitTNV = 5332, HitKindNV = 5333, IncomingRayFlagsNV = 5351, + WarpsPerSMNV = 5374, + SMCountNV = 5375, + WarpIDNV = 5376, + SMIDNV = 5377, } enum SelectionControlShift : uint @@ -836,6 +840,7 @@ enum Capability : uint PhysicalStorageBufferAddressesEXT = 5347, ComputeDerivativeGroupLinearNV = 5350, CooperativeMatrixNV = 5357, + ShaderSMBuiltinsNV = 5373, SubgroupShuffleINTEL = 5568, SubgroupBufferBlockIOINTEL = 5569, SubgroupImageBlockIOINTEL = 5570, |