Fix KhronosGroup#45, and minor reordering.

- SPV_EXT_shader_stencil_export - SPV_AMD_shader_image_load_store_lod
dgkoch · Sep 1, 2017 · 2bb92e6 · 2bb92e6
1 parent 95579e1
commit 2bb92e6
Show file tree

Hide file tree

Showing 21 changed files with 96 additions and 24 deletions.
diff --git a/include/spirv/1.0/spirv.core.grammar.json b/include/spirv/1.0/spirv.core.grammar.json
@@ -3727,6 +3727,11 @@
           "enumerant" : "PostDepthCoverage",
           "value" : 4446,
           "capabilities" : [ "SampleMaskPostDepthCoverage" ]
+        },
+        {
+          "enumerant" : "StencilRefReplacingEXT",
+          "value" : 5027,
+          "capabilities" : [ "StencilExportEXT" ]
         }
       ]
     },
@@ -5454,9 +5459,10 @@
           "capabilities" : [ "VariablePointersStorageBuffer" ],
           "extensions" : [ "SPV_KHR_variable_pointers" ]
         },
-        {          "enumerant" : "AtomicStorageOps",
-          "value" : 4445,
-          "extensions" : [ "SPV_KHR_shader_atomic_counter_ops" ]
+        {
+            "enumerant": "AtomicStorageOps",
+            "value": 4445,
+            "extensions": [ "SPV_KHR_shader_atomic_counter_ops" ]
         },
         {
           "enumerant" : "SampleMaskPostDepthCoverage",
@@ -5475,6 +5481,12 @@
           "capabilities" : [ "Shader" ],
           "extensions" : [ "SPV_EXT_shader_stencil_export" ]
         },
+        {
+          "enumerant" : "ImageReadWriteLodAMD",
+          "value" : 5015,
+          "capabilities" : [ "Shader" ],
+          "extensions" : [ "SPV_AMD_shader_image_load_store_lod" ]
+        },
         {
           "enumerant" : "SampleMaskOverrideCoverageNV",
           "value" : 5249,
@@ -5488,16 +5500,16 @@
           "extensions" : [ "SPV_NV_geometry_shader_passthrough" ]
         },
         {
-          "enumerant" : "ShaderViewportIndexLayerNV",
+          "enumerant" : "ShaderViewportIndexLayerEXT",
           "value" : 5254,
           "capabilities" : [ "MultiViewport" ],
-          "extensions" : [ "SPV_NV_viewport_array2" ]
+          "extensions" : [ "SPV_EXT_shader_viewport_index_layer" ]
         },
         {
-          "enumerant" : "ShaderViewportIndexLayerEXT",
+          "enumerant" : "ShaderViewportIndexLayerNV",
           "value" : 5254,
           "capabilities" : [ "MultiViewport" ],
-          "extensions" : [ "SPV_EXT_shader_viewport_index_layer" ]
+          "extensions" : [ "SPV_NV_viewport_array2" ]
         },
         {
           "enumerant" : "ShaderViewportMaskNV",

diff --git a/include/spirv/1.0/spirv.h b/include/spirv/1.0/spirv.h
@@ -127,6 +127,7 @@ typedef enum SpvExecutionMode_ {
     SpvExecutionModeVecTypeHint = 30,
     SpvExecutionModeContractionOff = 31,
     SpvExecutionModePostDepthCoverage = 4446,
+    SpvExecutionModeStencilRefReplacingEXT = 5027,
     SpvExecutionModeMax = 0x7fffffff,
 } SpvExecutionMode;
 
@@ -646,6 +647,7 @@ typedef enum SpvCapability_ {
     SpvCapabilitySampleMaskPostDepthCoverage = 4447,
     SpvCapabilityImageGatherBiasLodAMD = 5009,
     SpvCapabilityStencilExportEXT = 5013,
+    SpvCapabilityImageReadWriteLodAMD = 5015,
     SpvCapabilitySampleMaskOverrideCoverageNV = 5249,
     SpvCapabilityGeometryShaderPassthroughNV = 5251,
     SpvCapabilityShaderViewportIndexLayerEXT = 5254,

diff --git a/include/spirv/1.0/spirv.hpp b/include/spirv/1.0/spirv.hpp
@@ -123,6 +123,7 @@ enum ExecutionMode {
     ExecutionModeVecTypeHint = 30,
     ExecutionModeContractionOff = 31,
     ExecutionModePostDepthCoverage = 4446,
+    ExecutionModeStencilRefReplacingEXT = 5027,
     ExecutionModeMax = 0x7fffffff,
 };
 
@@ -642,6 +643,7 @@ enum Capability {
     CapabilitySampleMaskPostDepthCoverage = 4447,
     CapabilityImageGatherBiasLodAMD = 5009,
     CapabilityStencilExportEXT = 5013,
+    CapabilityImageReadWriteLodAMD = 5015,
     CapabilitySampleMaskOverrideCoverageNV = 5249,
     CapabilityGeometryShaderPassthroughNV = 5251,
     CapabilityShaderViewportIndexLayerEXT = 5254,

diff --git a/include/spirv/1.0/spirv.hpp11 b/include/spirv/1.0/spirv.hpp11
@@ -123,6 +123,7 @@ enum class ExecutionMode : unsigned {
     VecTypeHint = 30,
     ContractionOff = 31,
     PostDepthCoverage = 4446,
+    StencilRefReplacingEXT = 5027,
     Max = 0x7fffffff,
 };
 
@@ -642,6 +643,7 @@ enum class Capability : unsigned {
     SampleMaskPostDepthCoverage = 4447,
     ImageGatherBiasLodAMD = 5009,
     StencilExportEXT = 5013,
+    ImageReadWriteLodAMD = 5015,
     SampleMaskOverrideCoverageNV = 5249,
     GeometryShaderPassthroughNV = 5251,
     ShaderViewportIndexLayerEXT = 5254,

diff --git a/include/spirv/1.0/spirv.json b/include/spirv/1.0/spirv.json
@@ -141,7 +141,8 @@
                     "OutputTriangleStrip": 29,
                     "VecTypeHint": 30,
                     "ContractionOff": 31,
-                    "PostDepthCoverage": 4446
+                    "PostDepthCoverage": 4446,
+                    "StencilRefReplacingEXT": 5027
                 }
             },
             {
@@ -669,6 +670,7 @@
                     "SampleMaskPostDepthCoverage": 4447,
                     "ImageGatherBiasLodAMD": 5009,
                     "StencilExportEXT": 5013,
+                    "ImageReadWriteLodAMD": 5015,
                     "SampleMaskOverrideCoverageNV": 5249,
                     "GeometryShaderPassthroughNV": 5251,
                     "ShaderViewportIndexLayerEXT": 5254,

diff --git a/include/spirv/1.0/spirv.lua b/include/spirv/1.0/spirv.lua
@@ -110,6 +110,7 @@ spv = {
         VecTypeHint = 30,
         ContractionOff = 31,
         PostDepthCoverage = 4446,
+        StencilRefReplacingEXT = 5027,
     },
 
     StorageClass = {
@@ -604,6 +605,7 @@ spv = {
         SampleMaskPostDepthCoverage = 4447,
         ImageGatherBiasLodAMD = 5009,
         StencilExportEXT = 5013,
+        ImageReadWriteLodAMD = 5015,
         SampleMaskOverrideCoverageNV = 5249,
         GeometryShaderPassthroughNV = 5251,
         ShaderViewportIndexLayerEXT = 5254,

diff --git a/include/spirv/1.0/spirv.py b/include/spirv/1.0/spirv.py
@@ -110,6 +110,7 @@
         'VecTypeHint' : 30,
         'ContractionOff' : 31,
         'PostDepthCoverage' : 4446,
+        'StencilRefReplacingEXT' : 5027,
     },
 
     'StorageClass' : {
@@ -604,6 +605,7 @@
         'SampleMaskPostDepthCoverage' : 4447,
         'ImageGatherBiasLodAMD' : 5009,
         'StencilExportEXT' : 5013,
+        'ImageReadWriteLodAMD' : 5015,
         'SampleMaskOverrideCoverageNV' : 5249,
         'GeometryShaderPassthroughNV' : 5251,
         'ShaderViewportIndexLayerEXT' : 5254,

diff --git a/include/spirv/1.1/spirv.core.grammar.json b/include/spirv/1.1/spirv.core.grammar.json
@@ -3867,6 +3867,11 @@
           "enumerant" : "PostDepthCoverage",
           "value" : 4446,
           "capabilities" : [ "SampleMaskPostDepthCoverage" ]
+        },
+        {
+          "enumerant" : "StencilRefReplacingEXT",
+          "value" : 5027,
+          "capabilities" : [ "StencilExportEXT" ]
         }
       ]
     },
@@ -5617,9 +5622,10 @@
           "capabilities" : [ "VariablePointersStorageBuffer" ],
           "extensions" : [ "SPV_KHR_variable_pointers" ]
         },
-        {          "enumerant" : "AtomicStorageOps",
-          "value" : 4445,
-          "extensions" : [ "SPV_KHR_shader_atomic_counter_ops" ]
+        {
+            "enumerant": "AtomicStorageOps",
+            "value": 4445,
+            "extensions": [ "SPV_KHR_shader_atomic_counter_ops" ]
         },
         {
           "enumerant" : "SampleMaskPostDepthCoverage",
@@ -5638,6 +5644,12 @@
           "capabilities" : [ "Shader" ],
           "extensions" : [ "SPV_EXT_shader_stencil_export" ]
         },
+        {
+          "enumerant" : "ImageReadWriteLodAMD",
+          "value" : 5015,
+          "capabilities" : [ "Shader" ],
+          "extensions" : [ "SPV_AMD_shader_image_load_store_lod" ]
+        },
         {
           "enumerant" : "SampleMaskOverrideCoverageNV",
           "value" : 5249,
@@ -5651,16 +5663,16 @@
           "extensions" : [ "SPV_NV_geometry_shader_passthrough" ]
         },
         {
-          "enumerant" : "ShaderViewportIndexLayerNV",
+          "enumerant" : "ShaderViewportIndexLayerEXT",
           "value" : 5254,
           "capabilities" : [ "MultiViewport" ],
-          "extensions" : [ "SPV_NV_viewport_array2" ]
+          "extensions" : [ "SPV_EXT_shader_viewport_index_layer" ]
         },
         {
-          "enumerant" : "ShaderViewportIndexLayerEXT",
+          "enumerant" : "ShaderViewportIndexLayerNV",
           "value" : 5254,
           "capabilities" : [ "MultiViewport" ],
-          "extensions" : [ "SPV_EXT_shader_viewport_index_layer" ]
+          "extensions" : [ "SPV_NV_viewport_array2" ]
         },
         {
           "enumerant" : "ShaderViewportMaskNV",

diff --git a/include/spirv/1.1/spirv.h b/include/spirv/1.1/spirv.h
@@ -131,6 +131,7 @@ typedef enum SpvExecutionMode_ {
     SpvExecutionModeSubgroupSize = 35,
     SpvExecutionModeSubgroupsPerWorkgroup = 36,
     SpvExecutionModePostDepthCoverage = 4446,
+    SpvExecutionModeStencilRefReplacingEXT = 5027,
     SpvExecutionModeMax = 0x7fffffff,
 } SpvExecutionMode;
 
@@ -658,6 +659,7 @@ typedef enum SpvCapability_ {
     SpvCapabilitySampleMaskPostDepthCoverage = 4447,
     SpvCapabilityImageGatherBiasLodAMD = 5009,
     SpvCapabilityStencilExportEXT = 5013,
+    SpvCapabilityImageReadWriteLodAMD = 5015,
     SpvCapabilitySampleMaskOverrideCoverageNV = 5249,
     SpvCapabilityGeometryShaderPassthroughNV = 5251,
     SpvCapabilityShaderViewportIndexLayerEXT = 5254,

diff --git a/include/spirv/1.1/spirv.hpp b/include/spirv/1.1/spirv.hpp
@@ -127,6 +127,7 @@ enum ExecutionMode {
     ExecutionModeSubgroupSize = 35,
     ExecutionModeSubgroupsPerWorkgroup = 36,
     ExecutionModePostDepthCoverage = 4446,
+    ExecutionModeStencilRefReplacingEXT = 5027,
     ExecutionModeMax = 0x7fffffff,
 };
 
@@ -654,6 +655,7 @@ enum Capability {
     CapabilitySampleMaskPostDepthCoverage = 4447,
     CapabilityImageGatherBiasLodAMD = 5009,
     CapabilityStencilExportEXT = 5013,
+    CapabilityImageReadWriteLodAMD = 5015,
     CapabilitySampleMaskOverrideCoverageNV = 5249,
     CapabilityGeometryShaderPassthroughNV = 5251,
     CapabilityShaderViewportIndexLayerEXT = 5254,

diff --git a/include/spirv/1.1/spirv.hpp11 b/include/spirv/1.1/spirv.hpp11
@@ -127,6 +127,7 @@ enum class ExecutionMode : unsigned {
     SubgroupSize = 35,
     SubgroupsPerWorkgroup = 36,
     PostDepthCoverage = 4446,
+    StencilRefReplacingEXT = 5027,
     Max = 0x7fffffff,
 };
 
@@ -654,6 +655,7 @@ enum class Capability : unsigned {
     SampleMaskPostDepthCoverage = 4447,
     ImageGatherBiasLodAMD = 5009,
     StencilExportEXT = 5013,
+    ImageReadWriteLodAMD = 5015,
     SampleMaskOverrideCoverageNV = 5249,
     GeometryShaderPassthroughNV = 5251,
     ShaderViewportIndexLayerEXT = 5254,

diff --git a/include/spirv/1.1/spirv.json b/include/spirv/1.1/spirv.json
@@ -145,7 +145,8 @@
                     "Finalizer": 34,
                     "SubgroupSize": 35,
                     "SubgroupsPerWorkgroup": 36,
-                    "PostDepthCoverage": 4446
+                    "PostDepthCoverage": 4446,
+                    "StencilRefReplacingEXT": 5027
                 }
             },
             {
@@ -679,6 +680,7 @@
                     "SampleMaskPostDepthCoverage": 4447,
                     "ImageGatherBiasLodAMD": 5009,
                     "StencilExportEXT": 5013,
+                    "ImageReadWriteLodAMD": 5015,
                     "SampleMaskOverrideCoverageNV": 5249,
                     "GeometryShaderPassthroughNV": 5251,
                     "ShaderViewportIndexLayerEXT": 5254,

diff --git a/include/spirv/1.1/spirv.lua b/include/spirv/1.1/spirv.lua
@@ -114,6 +114,7 @@ spv = {
         SubgroupSize = 35,
         SubgroupsPerWorkgroup = 36,
         PostDepthCoverage = 4446,
+        StencilRefReplacingEXT = 5027,
     },
 
     StorageClass = {
@@ -616,6 +617,7 @@ spv = {
         SampleMaskPostDepthCoverage = 4447,
         ImageGatherBiasLodAMD = 5009,
         StencilExportEXT = 5013,
+        ImageReadWriteLodAMD = 5015,
         SampleMaskOverrideCoverageNV = 5249,
         GeometryShaderPassthroughNV = 5251,
         ShaderViewportIndexLayerEXT = 5254,

diff --git a/include/spirv/1.1/spirv.py b/include/spirv/1.1/spirv.py
@@ -114,6 +114,7 @@
         'SubgroupSize' : 35,
         'SubgroupsPerWorkgroup' : 36,
         'PostDepthCoverage' : 4446,
+        'StencilRefReplacingEXT' : 5027,
     },
 
     'StorageClass' : {
@@ -616,6 +617,7 @@
         'SampleMaskPostDepthCoverage' : 4447,
         'ImageGatherBiasLodAMD' : 5009,
         'StencilExportEXT' : 5013,
+        'ImageReadWriteLodAMD' : 5015,
         'SampleMaskOverrideCoverageNV' : 5249,
         'GeometryShaderPassthroughNV' : 5251,
         'ShaderViewportIndexLayerEXT' : 5254,

diff --git a/include/spirv/1.2/spirv.core.grammar.json b/include/spirv/1.2/spirv.core.grammar.json
@@ -3908,6 +3908,11 @@
           "enumerant" : "PostDepthCoverage",
           "value" : 4446,
           "capabilities" : [ "SampleMaskPostDepthCoverage" ]
+        },
+        {
+          "enumerant" : "StencilRefReplacingEXT",
+          "value" : 5027,
+          "capabilities" : [ "StencilExportEXT" ]
         }
       ]
     },
@@ -5674,9 +5679,10 @@
           "capabilities" : [ "VariablePointersStorageBuffer" ],
           "extensions" : [ "SPV_KHR_variable_pointers" ]
         },
-        {          "enumerant" : "AtomicStorageOps",
-          "value" : 4445,
-          "extensions" : [ "SPV_KHR_shader_atomic_counter_ops" ]
+        {
+            "enumerant": "AtomicStorageOps",
+            "value": 4445,
+            "extensions": [ "SPV_KHR_shader_atomic_counter_ops" ]
         },
         {
           "enumerant" : "SampleMaskPostDepthCoverage",
@@ -5695,6 +5701,12 @@
           "capabilities" : [ "Shader" ],
           "extensions" : [ "SPV_EXT_shader_stencil_export" ]
         },
+        {
+          "enumerant" : "ImageReadWriteLodAMD",
+          "value" : 5015,
+          "capabilities" : [ "Shader" ],
+          "extensions" : [ "SPV_AMD_shader_image_load_store_lod" ]
+        },
         {
           "enumerant" : "SampleMaskOverrideCoverageNV",
           "value" : 5249,
@@ -5708,16 +5720,16 @@
           "extensions" : [ "SPV_NV_geometry_shader_passthrough" ]
         },
         {
-          "enumerant" : "ShaderViewportIndexLayerNV",
+          "enumerant" : "ShaderViewportIndexLayerEXT",
           "value" : 5254,
           "capabilities" : [ "MultiViewport" ],
-          "extensions" : [ "SPV_NV_viewport_array2" ]
+          "extensions" : [ "SPV_EXT_shader_viewport_index_layer" ]
         },
         {
-          "enumerant" : "ShaderViewportIndexLayerEXT",
+          "enumerant" : "ShaderViewportIndexLayerNV",
           "value" : 5254,
           "capabilities" : [ "MultiViewport" ],
-          "extensions" : [ "SPV_EXT_shader_viewport_index_layer" ]
+          "extensions" : [ "SPV_NV_viewport_array2" ]
         },
         {
           "enumerant" : "ShaderViewportMaskNV",

diff --git a/include/spirv/1.2/spirv.h b/include/spirv/1.2/spirv.h
@@ -134,6 +134,7 @@ typedef enum SpvExecutionMode_ {
     SpvExecutionModeLocalSizeId = 38,
     SpvExecutionModeLocalSizeHintId = 39,
     SpvExecutionModePostDepthCoverage = 4446,
+    SpvExecutionModeStencilRefReplacingEXT = 5027,
     SpvExecutionModeMax = 0x7fffffff,
 } SpvExecutionMode;
 
@@ -663,6 +664,7 @@ typedef enum SpvCapability_ {
     SpvCapabilitySampleMaskPostDepthCoverage = 4447,
     SpvCapabilityImageGatherBiasLodAMD = 5009,
     SpvCapabilityStencilExportEXT = 5013,
+    SpvCapabilityImageReadWriteLodAMD = 5015,
     SpvCapabilitySampleMaskOverrideCoverageNV = 5249,
     SpvCapabilityGeometryShaderPassthroughNV = 5251,
     SpvCapabilityShaderViewportIndexLayerEXT = 5254,