Headers for revision 4 of SPIR-V 1.3, including SPV_KHR_vulkan_memory_model.

7 files changed, 229 insertions, 10 deletions

diff --git a/include/spirv/unified1/spirv.core.grammar.json b/include/spirv/unified1/spirv.core.grammar.json
index cb64142..978353a 100755
--- a/include/spirv/unified1/spirv.core.grammar.json
+++ b/include/spirv/unified1/spirv.core.grammar.json
@@ -4010,6 +4010,32 @@
           "parameters" : [
             { "kind" : "IdRef" }
           ]
+        },
+        {
+          "enumerant" : "MakeTexelAvailableKHR",
+          "value" : "0x0100",
+          "capabilities" : [ "VulkanMemoryModelKHR" ],
+          "parameters" : [
+            { "kind" : "IdScope" }
+          ]
+        },
+        {
+          "enumerant" : "MakeTexelVisibleKHR",
+          "value" : "0x0200",
+          "capabilities" : [ "VulkanMemoryModelKHR" ],
+          "parameters" : [
+            { "kind" : "IdScope" }
+          ]
+        },
+        {
+          "enumerant" : "NonPrivateTexelKHR",
+          "value" : "0x0400",
+          "capabilities" : [ "VulkanMemoryModelKHR" ]
+        },
+        {
+          "enumerant" : "VolatileTexelKHR",
+          "value" : "0x0800",
+          "capabilities" : [ "VulkanMemoryModelKHR" ]
         }
       ]
     },
@@ -4176,6 +4202,21 @@
         {
           "enumerant" : "ImageMemory",
           "value" : "0x0800"
+        },
+        {
+          "enumerant" : "OutputMemoryKHR",
+          "value" : "0x1000",
+          "capabilities" : [ "VulkanMemoryModelKHR" ]
+        },
+        {
+          "enumerant" : "MakeAvailableKHR",
+          "value" : "0x2000",
+          "capabilities" : [ "VulkanMemoryModelKHR" ]
+        },
+        {
+          "enumerant" : "MakeVisibleKHR",
+          "value" : "0x4000",
+          "capabilities" : [ "VulkanMemoryModelKHR" ]
         }
       ]
     },
@@ -4201,6 +4242,27 @@
         {
           "enumerant" : "Nontemporal",
           "value" : "0x0004"
+        },
+        {
+          "enumerant" : "MakePointerAvailableKHR",
+          "value" : "0x0008",
+          "parameters" : [
+            { "kind" : "IdScope" }
+          ],
+          "capabilities" : [ "VulkanMemoryModelKHR" ]
+        },
+        {
+          "enumerant" : "MakePointerVisibleKHR",
+          "value" : "0x0010",
+          "parameters" : [
+            { "kind" : "IdScope" }
+          ],
+          "capabilities" : [ "VulkanMemoryModelKHR" ]
+        },
+        {
+          "enumerant" : "NonPrivatePointerKHR",
+          "value" : "0x0020",
+          "capabilities" : [ "VulkanMemoryModelKHR" ]
         }
       ]
     },
@@ -4328,6 +4390,11 @@
           "enumerant" : "OpenCL",
           "value" : 2,
           "capabilities" : [ "Kernel" ]
+        },
+        {
+          "enumerant" : "VulkanKHR",
+          "value" : 3,
+          "capabilities" : [ "VulkanMemoryModelKHR" ]
         }
       ]
     },
@@ -4659,11 +4726,12 @@
         {
           "enumerant" : "1D",
           "value" : 0,
-          "capabilities" : [ "Sampled1D" ]
+          "capabilities" : [ "Sampled1D", "Image1D" ]
         },
         {
           "enumerant" : "2D",
-          "value" : 1
+          "value" : 1,
+          "capabilities" : [ "Shader", "Kernel", "ImageMSArray" ]
         },
         {
           "enumerant" : "3D",
@@ -4672,17 +4740,17 @@
         {
           "enumerant" : "Cube",
           "value" : 3,
-          "capabilities" : [ "Shader" ]
+          "capabilities" : [ "Shader", "ImageCubeArray" ]
         },
         {
           "enumerant" : "Rect",
           "value" : 4,
-          "capabilities" : [ "SampledRect" ]
+          "capabilities" : [ "SampledRect", "ImageRect" ]
         },
         {
           "enumerant" : "Buffer",
           "value" : 5,
-          "capabilities" : [ "SampledBuffer" ]
+          "capabilities" : [ "SampledBuffer", "ImageBuffer" ]
         },
         {
           "enumerant" : "SubpassData",
@@ -6018,6 +6086,11 @@
         {
           "enumerant" : "Invocation",
           "value" : 4
+        },
+        {
+          "enumerant" : "QueueFamilyKHR",
+          "value" : 5,
+          "capabilities" : [ "VulkanMemoryModelKHR" ]
         }
       ]
     },
@@ -6746,6 +6819,18 @@
           "value" : 5297,
           "extensions" : [ "SPV_NV_shader_subgroup_partitioned" ],
           "version" : "None"
+        },
+        {
+          "enumerant" : "VulkanMemoryModelKHR",
+          "value" : 5345,
+          "extensions" : [ "SPV_KHR_vulkan_memory_model" ],
+          "version" : "None"
+        },
+        {
+          "enumerant" : "VulkanMemoryModelDeviceScopeKHR",
+          "value" : 5346,
+          "extensions" : [ "SPV_KHR_vulkan_memory_model" ],
+          "version" : "None"
         }
       ]
     },
diff --git a/include/spirv/unified1/spirv.h b/include/spirv/unified1/spirv.h
index 4c90c93..314c5f9 100644
--- a/include/spirv/unified1/spirv.h
+++ b/include/spirv/unified1/spirv.h
@@ -91,6 +91,7 @@ typedef enum SpvMemoryModel_ {
     SpvMemoryModelSimple = 0,
     SpvMemoryModelGLSL450 = 1,
     SpvMemoryModelOpenCL = 2,
+    SpvMemoryModelVulkanKHR = 3,
     SpvMemoryModelMax = 0x7fffffff,
 } SpvMemoryModel;
 
@@ -279,6 +280,10 @@ typedef enum SpvImageOperandsShift_ {
     SpvImageOperandsConstOffsetsShift = 5,
     SpvImageOperandsSampleShift = 6,
     SpvImageOperandsMinLodShift = 7,
+    SpvImageOperandsMakeTexelAvailableKHRShift = 8,
+    SpvImageOperandsMakeTexelVisibleKHRShift = 9,
+    SpvImageOperandsNonPrivateTexelKHRShift = 10,
+    SpvImageOperandsVolatileTexelKHRShift = 11,
     SpvImageOperandsMax = 0x7fffffff,
 } SpvImageOperandsShift;
 
@@ -292,6 +297,10 @@ typedef enum SpvImageOperandsMask_ {
     SpvImageOperandsConstOffsetsMask = 0x00000020,
     SpvImageOperandsSampleMask = 0x00000040,
     SpvImageOperandsMinLodMask = 0x00000080,
+    SpvImageOperandsMakeTexelAvailableKHRMask = 0x00000100,
+    SpvImageOperandsMakeTexelVisibleKHRMask = 0x00000200,
+    SpvImageOperandsNonPrivateTexelKHRMask = 0x00000400,
+    SpvImageOperandsVolatileTexelKHRMask = 0x00000800,
 } SpvImageOperandsMask;
 
 typedef enum SpvFPFastMathModeShift_ {
@@ -532,6 +541,9 @@ typedef enum SpvMemorySemanticsShift_ {
     SpvMemorySemanticsCrossWorkgroupMemoryShift = 9,
     SpvMemorySemanticsAtomicCounterMemoryShift = 10,
     SpvMemorySemanticsImageMemoryShift = 11,
+    SpvMemorySemanticsOutputMemoryKHRShift = 12,
+    SpvMemorySemanticsMakeAvailableKHRShift = 13,
+    SpvMemorySemanticsMakeVisibleKHRShift = 14,
     SpvMemorySemanticsMax = 0x7fffffff,
 } SpvMemorySemanticsShift;
 
@@ -547,12 +559,18 @@ typedef enum SpvMemorySemanticsMask_ {
     SpvMemorySemanticsCrossWorkgroupMemoryMask = 0x00000200,
     SpvMemorySemanticsAtomicCounterMemoryMask = 0x00000400,
     SpvMemorySemanticsImageMemoryMask = 0x00000800,
+    SpvMemorySemanticsOutputMemoryKHRMask = 0x00001000,
+    SpvMemorySemanticsMakeAvailableKHRMask = 0x00002000,
+    SpvMemorySemanticsMakeVisibleKHRMask = 0x00004000,
 } SpvMemorySemanticsMask;
 
 typedef enum SpvMemoryAccessShift_ {
     SpvMemoryAccessVolatileShift = 0,
     SpvMemoryAccessAlignedShift = 1,
     SpvMemoryAccessNontemporalShift = 2,
+    SpvMemoryAccessMakePointerAvailableKHRShift = 3,
+    SpvMemoryAccessMakePointerVisibleKHRShift = 4,
+    SpvMemoryAccessNonPrivatePointerKHRShift = 5,
     SpvMemoryAccessMax = 0x7fffffff,
 } SpvMemoryAccessShift;
 
@@ -561,6 +579,9 @@ typedef enum SpvMemoryAccessMask_ {
     SpvMemoryAccessVolatileMask = 0x00000001,
     SpvMemoryAccessAlignedMask = 0x00000002,
     SpvMemoryAccessNontemporalMask = 0x00000004,
+    SpvMemoryAccessMakePointerAvailableKHRMask = 0x00000008,
+    SpvMemoryAccessMakePointerVisibleKHRMask = 0x00000010,
+    SpvMemoryAccessNonPrivatePointerKHRMask = 0x00000020,
 } SpvMemoryAccessMask;
 
 typedef enum SpvScope_ {
@@ -569,6 +590,7 @@ typedef enum SpvScope_ {
     SpvScopeWorkgroup = 2,
     SpvScopeSubgroup = 3,
     SpvScopeInvocation = 4,
+    SpvScopeQueueFamilyKHR = 5,
     SpvScopeMax = 0x7fffffff,
 } SpvScope;
 
@@ -712,6 +734,8 @@ typedef enum SpvCapability_ {
     SpvCapabilityInputAttachmentArrayNonUniformIndexingEXT = 5310,
     SpvCapabilityUniformTexelBufferArrayNonUniformIndexingEXT = 5311,
     SpvCapabilityStorageTexelBufferArrayNonUniformIndexingEXT = 5312,
+    SpvCapabilityVulkanMemoryModelKHR = 5345,
+    SpvCapabilityVulkanMemoryModelDeviceScopeKHR = 5346,
     SpvCapabilitySubgroupShuffleINTEL = 5568,
     SpvCapabilitySubgroupBufferBlockIOINTEL = 5569,
     SpvCapabilitySubgroupImageBlockIOINTEL = 5570,
diff --git a/include/spirv/unified1/spirv.hpp b/include/spirv/unified1/spirv.hpp
index f16c296..8b7977c 100644
--- a/include/spirv/unified1/spirv.hpp
+++ b/include/spirv/unified1/spirv.hpp
@@ -87,6 +87,7 @@ enum MemoryModel {
     MemoryModelSimple = 0,
     MemoryModelGLSL450 = 1,
     MemoryModelOpenCL = 2,
+    MemoryModelVulkanKHR = 3,
     MemoryModelMax = 0x7fffffff,
 };
 
@@ -275,6 +276,10 @@ enum ImageOperandsShift {
     ImageOperandsConstOffsetsShift = 5,
     ImageOperandsSampleShift = 6,
     ImageOperandsMinLodShift = 7,
+    ImageOperandsMakeTexelAvailableKHRShift = 8,
+    ImageOperandsMakeTexelVisibleKHRShift = 9,
+    ImageOperandsNonPrivateTexelKHRShift = 10,
+    ImageOperandsVolatileTexelKHRShift = 11,
     ImageOperandsMax = 0x7fffffff,
 };
 
@@ -288,6 +293,10 @@ enum ImageOperandsMask {
     ImageOperandsConstOffsetsMask = 0x00000020,
     ImageOperandsSampleMask = 0x00000040,
     ImageOperandsMinLodMask = 0x00000080,
+    ImageOperandsMakeTexelAvailableKHRMask = 0x00000100,
+    ImageOperandsMakeTexelVisibleKHRMask = 0x00000200,
+    ImageOperandsNonPrivateTexelKHRMask = 0x00000400,
+    ImageOperandsVolatileTexelKHRMask = 0x00000800,
 };
 
 enum FPFastMathModeShift {
@@ -528,6 +537,9 @@ enum MemorySemanticsShift {
     MemorySemanticsCrossWorkgroupMemoryShift = 9,
     MemorySemanticsAtomicCounterMemoryShift = 10,
     MemorySemanticsImageMemoryShift = 11,
+    MemorySemanticsOutputMemoryKHRShift = 12,
+    MemorySemanticsMakeAvailableKHRShift = 13,
+    MemorySemanticsMakeVisibleKHRShift = 14,
     MemorySemanticsMax = 0x7fffffff,
 };
 
@@ -543,12 +555,18 @@ enum MemorySemanticsMask {
     MemorySemanticsCrossWorkgroupMemoryMask = 0x00000200,
     MemorySemanticsAtomicCounterMemoryMask = 0x00000400,
     MemorySemanticsImageMemoryMask = 0x00000800,
+    MemorySemanticsOutputMemoryKHRMask = 0x00001000,
+    MemorySemanticsMakeAvailableKHRMask = 0x00002000,
+    MemorySemanticsMakeVisibleKHRMask = 0x00004000,
 };
 
 enum MemoryAccessShift {
     MemoryAccessVolatileShift = 0,
     MemoryAccessAlignedShift = 1,
     MemoryAccessNontemporalShift = 2,
+    MemoryAccessMakePointerAvailableKHRShift = 3,
+    MemoryAccessMakePointerVisibleKHRShift = 4,
+    MemoryAccessNonPrivatePointerKHRShift = 5,
     MemoryAccessMax = 0x7fffffff,
 };
 
@@ -557,6 +575,9 @@ enum MemoryAccessMask {
     MemoryAccessVolatileMask = 0x00000001,
     MemoryAccessAlignedMask = 0x00000002,
     MemoryAccessNontemporalMask = 0x00000004,
+    MemoryAccessMakePointerAvailableKHRMask = 0x00000008,
+    MemoryAccessMakePointerVisibleKHRMask = 0x00000010,
+    MemoryAccessNonPrivatePointerKHRMask = 0x00000020,
 };
 
 enum Scope {
@@ -565,6 +586,7 @@ enum Scope {
     ScopeWorkgroup = 2,
     ScopeSubgroup = 3,
     ScopeInvocation = 4,
+    ScopeQueueFamilyKHR = 5,
     ScopeMax = 0x7fffffff,
 };
 
@@ -708,6 +730,8 @@ enum Capability {
     CapabilityInputAttachmentArrayNonUniformIndexingEXT = 5310,
     CapabilityUniformTexelBufferArrayNonUniformIndexingEXT = 5311,
     CapabilityStorageTexelBufferArrayNonUniformIndexingEXT = 5312,
+    CapabilityVulkanMemoryModelKHR = 5345,
+    CapabilityVulkanMemoryModelDeviceScopeKHR = 5346,
     CapabilitySubgroupShuffleINTEL = 5568,
     CapabilitySubgroupBufferBlockIOINTEL = 5569,
     CapabilitySubgroupImageBlockIOINTEL = 5570,
diff --git a/include/spirv/unified1/spirv.hpp11 b/include/spirv/unified1/spirv.hpp11
index 3bd5b8a..16e7a1d 100644
--- a/include/spirv/unified1/spirv.hpp11
+++ b/include/spirv/unified1/spirv.hpp11
@@ -87,6 +87,7 @@ enum class MemoryModel : unsigned {
     Simple = 0,
     GLSL450 = 1,
     OpenCL = 2,
+    VulkanKHR = 3,
     Max = 0x7fffffff,
 };
 
@@ -275,6 +276,10 @@ enum class ImageOperandsShift : unsigned {
     ConstOffsets = 5,
     Sample = 6,
     MinLod = 7,
+    MakeTexelAvailableKHR = 8,
+    MakeTexelVisibleKHR = 9,
+    NonPrivateTexelKHR = 10,
+    VolatileTexelKHR = 11,
     Max = 0x7fffffff,
 };
 
@@ -288,6 +293,10 @@ enum class ImageOperandsMask : unsigned {
     ConstOffsets = 0x00000020,
     Sample = 0x00000040,
     MinLod = 0x00000080,
+    MakeTexelAvailableKHR = 0x00000100,
+    MakeTexelVisibleKHR = 0x00000200,
+    NonPrivateTexelKHR = 0x00000400,
+    VolatileTexelKHR = 0x00000800,
 };
 
 enum class FPFastMathModeShift : unsigned {
@@ -528,6 +537,9 @@ enum class MemorySemanticsShift : unsigned {
     CrossWorkgroupMemory = 9,
     AtomicCounterMemory = 10,
     ImageMemory = 11,
+    OutputMemoryKHR = 12,
+    MakeAvailableKHR = 13,
+    MakeVisibleKHR = 14,
     Max = 0x7fffffff,
 };
 
@@ -543,12 +555,18 @@ enum class MemorySemanticsMask : unsigned {
     CrossWorkgroupMemory = 0x00000200,
     AtomicCounterMemory = 0x00000400,
     ImageMemory = 0x00000800,
+    OutputMemoryKHR = 0x00001000,
+    MakeAvailableKHR = 0x00002000,
+    MakeVisibleKHR = 0x00004000,
 };
 
 enum class MemoryAccessShift : unsigned {
     Volatile = 0,
     Aligned = 1,
     Nontemporal = 2,
+    MakePointerAvailableKHR = 3,
+    MakePointerVisibleKHR = 4,
+    NonPrivatePointerKHR = 5,
     Max = 0x7fffffff,
 };
 
@@ -557,6 +575,9 @@ enum class MemoryAccessMask : unsigned {
     Volatile = 0x00000001,
     Aligned = 0x00000002,
     Nontemporal = 0x00000004,
+    MakePointerAvailableKHR = 0x00000008,
+    MakePointerVisibleKHR = 0x00000010,
+    NonPrivatePointerKHR = 0x00000020,
 };
 
 enum class Scope : unsigned {
@@ -565,6 +586,7 @@ enum class Scope : unsigned {
     Workgroup = 2,
     Subgroup = 3,
     Invocation = 4,
+    QueueFamilyKHR = 5,
     Max = 0x7fffffff,
 };
 
@@ -708,6 +730,8 @@ enum class Capability : unsigned {
     InputAttachmentArrayNonUniformIndexingEXT = 5310,
     UniformTexelBufferArrayNonUniformIndexingEXT = 5311,
     StorageTexelBufferArrayNonUniformIndexingEXT = 5312,
+    VulkanMemoryModelKHR = 5345,
+    VulkanMemoryModelDeviceScopeKHR = 5346,
     SubgroupShuffleINTEL = 5568,
     SubgroupBufferBlockIOINTEL = 5569,
     SubgroupImageBlockIOINTEL = 5570,
diff --git a/include/spirv/unified1/spirv.json b/include/spirv/unified1/spirv.json
index a592dfa..ea1fc6d 100644
--- a/include/spirv/unified1/spirv.json
+++ b/include/spirv/unified1/spirv.json
@@ -102,7 +102,8 @@
                 {
                     "Simple": 0,
                     "GLSL450": 1,
-                    "OpenCL": 2
+                    "OpenCL": 2,
+                    "VulkanKHR": 3
                 }
             },
             {
@@ -317,7 +318,11 @@
                     "Offset": 4,
                     "ConstOffsets": 5,
                     "Sample": 6,
-                    "MinLod": 7
+                    "MinLod": 7,
+                    "MakeTexelAvailableKHR": 8,
+                    "MakeTexelVisibleKHR": 9,
+                    "NonPrivateTexelKHR": 10,
+                    "VolatileTexelKHR": 11
                 }
             },
             {
@@ -560,7 +565,10 @@
                     "WorkgroupMemory": 8,
                     "CrossWorkgroupMemory": 9,
                     "AtomicCounterMemory": 10,
-                    "ImageMemory": 11
+                    "ImageMemory": 11,
+                    "OutputMemoryKHR": 12,
+                    "MakeAvailableKHR": 13,
+                    "MakeVisibleKHR": 14
                 }
             },
             {
@@ -570,7 +578,10 @@
                 {
                     "Volatile": 0,
                     "Aligned": 1,
-                    "Nontemporal": 2
+                    "Nontemporal": 2,
+                    "MakePointerAvailableKHR": 3,
+                    "MakePointerVisibleKHR": 4,
+                    "NonPrivatePointerKHR": 5
                 }
             },
             {
@@ -582,7 +593,8 @@
                     "Device": 1,
                     "Workgroup": 2,
                     "Subgroup": 3,
-                    "Invocation": 4
+                    "Invocation": 4,
+                    "QueueFamilyKHR": 5
                 }
             },
             {
@@ -733,6 +745,8 @@
                     "InputAttachmentArrayNonUniformIndexingEXT": 5310,
                     "UniformTexelBufferArrayNonUniformIndexingEXT": 5311,
                     "StorageTexelBufferArrayNonUniformIndexingEXT": 5312,
+                    "VulkanMemoryModelKHR": 5345,
+                    "VulkanMemoryModelDeviceScopeKHR": 5346,
                     "SubgroupShuffleINTEL": 5568,
                     "SubgroupBufferBlockIOINTEL": 5569,
                     "SubgroupImageBlockIOINTEL": 5570
diff --git a/include/spirv/unified1/spirv.lua b/include/spirv/unified1/spirv.lua
index 43e9ba5..b3292d5 100644
--- a/include/spirv/unified1/spirv.lua
+++ b/include/spirv/unified1/spirv.lua
@@ -75,6 +75,7 @@ spv = {
         Simple = 0,
         GLSL450 = 1,
         OpenCL = 2,
+        VulkanKHR = 3,
     },
 
     ExecutionMode = {
@@ -254,6 +255,10 @@ spv = {
         ConstOffsets = 5,
         Sample = 6,
         MinLod = 7,
+        MakeTexelAvailableKHR = 8,
+        MakeTexelVisibleKHR = 9,
+        NonPrivateTexelKHR = 10,
+        VolatileTexelKHR = 11,
     },
 
     ImageOperandsMask = {
@@ -266,6 +271,10 @@ spv = {
         ConstOffsets = 0x00000020,
         Sample = 0x00000040,
         MinLod = 0x00000080,
+        MakeTexelAvailableKHR = 0x00000100,
+        MakeTexelVisibleKHR = 0x00000200,
+        NonPrivateTexelKHR = 0x00000400,
+        VolatileTexelKHR = 0x00000800,
     },
 
     FPFastMathModeShift = {
@@ -496,6 +505,9 @@ spv = {
         CrossWorkgroupMemory = 9,
         AtomicCounterMemory = 10,
         ImageMemory = 11,
+        OutputMemoryKHR = 12,
+        MakeAvailableKHR = 13,
+        MakeVisibleKHR = 14,
     },
 
     MemorySemanticsMask = {
@@ -510,12 +522,18 @@ spv = {
         CrossWorkgroupMemory = 0x00000200,
         AtomicCounterMemory = 0x00000400,
         ImageMemory = 0x00000800,
+        OutputMemoryKHR = 0x00001000,
+        MakeAvailableKHR = 0x00002000,
+        MakeVisibleKHR = 0x00004000,
     },
 
     MemoryAccessShift = {
         Volatile = 0,
         Aligned = 1,
         Nontemporal = 2,
+        MakePointerAvailableKHR = 3,
+        MakePointerVisibleKHR = 4,
+        NonPrivatePointerKHR = 5,
     },
 
     MemoryAccessMask = {
@@ -523,6 +541,9 @@ spv = {
         Volatile = 0x00000001,
         Aligned = 0x00000002,
         Nontemporal = 0x00000004,
+        MakePointerAvailableKHR = 0x00000008,
+        MakePointerVisibleKHR = 0x00000010,
+        NonPrivatePointerKHR = 0x00000020,
     },
 
     Scope = {
@@ -531,6 +552,7 @@ spv = {
         Workgroup = 2,
         Subgroup = 3,
         Invocation = 4,
+        QueueFamilyKHR = 5,
     },
 
     GroupOperation = {
@@ -670,6 +692,8 @@ spv = {
         InputAttachmentArrayNonUniformIndexingEXT = 5310,
         UniformTexelBufferArrayNonUniformIndexingEXT = 5311,
         StorageTexelBufferArrayNonUniformIndexingEXT = 5312,
+        VulkanMemoryModelKHR = 5345,
+        VulkanMemoryModelDeviceScopeKHR = 5346,
         SubgroupShuffleINTEL = 5568,
         SubgroupBufferBlockIOINTEL = 5569,
         SubgroupImageBlockIOINTEL = 5570,
diff --git a/include/spirv/unified1/spirv.py b/include/spirv/unified1/spirv.py
index cb3775f..2b43905 100755
--- a/include/spirv/unified1/spirv.py
+++ b/include/spirv/unified1/spirv.py
@@ -75,6 +75,7 @@ spv = {
         'Simple' : 0,
         'GLSL450' : 1,
         'OpenCL' : 2,
+        'VulkanKHR' : 3,
     },
 
     'ExecutionMode' : {
@@ -254,6 +255,10 @@ spv = {
         'ConstOffsets' : 5,
         'Sample' : 6,
         'MinLod' : 7,
+        'MakeTexelAvailableKHR' : 8,
+        'MakeTexelVisibleKHR' : 9,
+        'NonPrivateTexelKHR' : 10,
+        'VolatileTexelKHR' : 11,
     },
 
     'ImageOperandsMask' : {
@@ -266,6 +271,10 @@ spv = {
         'ConstOffsets' : 0x00000020,
         'Sample' : 0x00000040,
         'MinLod' : 0x00000080,
+        'MakeTexelAvailableKHR' : 0x00000100,
+        'MakeTexelVisibleKHR' : 0x00000200,
+        'NonPrivateTexelKHR' : 0x00000400,
+        'VolatileTexelKHR' : 0x00000800,
     },
 
     'FPFastMathModeShift' : {
@@ -496,6 +505,9 @@ spv = {
         'CrossWorkgroupMemory' : 9,
         'AtomicCounterMemory' : 10,
         'ImageMemory' : 11,
+        'OutputMemoryKHR' : 12,
+        'MakeAvailableKHR' : 13,
+        'MakeVisibleKHR' : 14,
     },
 
     'MemorySemanticsMask' : {
@@ -510,12 +522,18 @@ spv = {
         'CrossWorkgroupMemory' : 0x00000200,
         'AtomicCounterMemory' : 0x00000400,
         'ImageMemory' : 0x00000800,
+        'OutputMemoryKHR' : 0x00001000,
+        'MakeAvailableKHR' : 0x00002000,
+        'MakeVisibleKHR' : 0x00004000,
     },
 
     'MemoryAccessShift' : {
         'Volatile' : 0,
         'Aligned' : 1,
         'Nontemporal' : 2,
+        'MakePointerAvailableKHR' : 3,
+        'MakePointerVisibleKHR' : 4,
+        'NonPrivatePointerKHR' : 5,
     },
 
     'MemoryAccessMask' : {
@@ -523,6 +541,9 @@ spv = {
         'Volatile' : 0x00000001,
         'Aligned' : 0x00000002,
         'Nontemporal' : 0x00000004,
+        'MakePointerAvailableKHR' : 0x00000008,
+        'MakePointerVisibleKHR' : 0x00000010,
+        'NonPrivatePointerKHR' : 0x00000020,
     },
 
     'Scope' : {
@@ -531,6 +552,7 @@ spv = {
         'Workgroup' : 2,
         'Subgroup' : 3,
         'Invocation' : 4,
+        'QueueFamilyKHR' : 5,
     },
 
     'GroupOperation' : {
@@ -670,6 +692,8 @@ spv = {
         'InputAttachmentArrayNonUniformIndexingEXT' : 5310,
         'UniformTexelBufferArrayNonUniformIndexingEXT' : 5311,
         'StorageTexelBufferArrayNonUniformIndexingEXT' : 5312,
+        'VulkanMemoryModelKHR' : 5345,
+        'VulkanMemoryModelDeviceScopeKHR' : 5346,
         'SubgroupShuffleINTEL' : 5568,
         'SubgroupBufferBlockIOINTEL' : 5569,
         'SubgroupImageBlockIOINTEL' : 5570,