SPIR-V 1.5.1.5.1

9 files changed, 639 insertions, 68 deletions

diff --git a/include/spirv/unified1/spirv.core.grammar.json b/include/spirv/unified1/spirv.core.grammar.json
index 0fb6059..97bf90a 100644
--- a/include/spirv/unified1/spirv.core.grammar.json
+++ b/include/spirv/unified1/spirv.core.grammar.json
@@ -26,7 +26,7 @@
   ],
   "magic_number" : "0x07230203",
   "major_version" : 1,
-  "minor_version" : 4,
+  "minor_version" : 5,
   "revision" : 1,
   "instruction_printing_class" : [
     {
@@ -483,7 +483,7 @@
       ],
       "capabilities" : [
         "Addresses",
-        "PhysicalStorageBufferAddressesEXT"
+        "PhysicalStorageBufferAddresses"
       ]
     },
     {
@@ -735,7 +735,7 @@
         "Addresses",
         "VariablePointers",
         "VariablePointersStorageBuffer",
-        "PhysicalStorageBufferAddressesEXT"
+        "PhysicalStorageBufferAddresses"
       ]
     },
     {
@@ -1269,7 +1269,7 @@
       ],
       "capabilities" : [
         "Addresses",
-        "PhysicalStorageBufferAddressesEXT"
+        "PhysicalStorageBufferAddresses"
       ]
     },
     {
@@ -1305,7 +1305,7 @@
       ],
       "capabilities" : [
         "Addresses",
-        "PhysicalStorageBufferAddressesEXT"
+        "PhysicalStorageBufferAddresses"
       ]
     },
     {
@@ -6524,34 +6524,68 @@
           ]
         },
         {
+          "enumerant" : "MakeTexelAvailable",
+          "value" : "0x0100",
+          "capabilities" : [ "VulkanMemoryModel" ],
+          "parameters" : [
+            { "kind" : "IdScope" }
+          ],
+          "version" : "1.5"
+        },
+        {
           "enumerant" : "MakeTexelAvailableKHR",
           "value" : "0x0100",
-          "capabilities" : [ "VulkanMemoryModelKHR" ],
+          "capabilities" : [ "VulkanMemoryModel" ],
           "parameters" : [
             { "kind" : "IdScope" }
           ],
-          "version" : "None"
+          "extensions" : [ "SPV_KHR_vulkan_memory_model" ],
+          "version" : "1.5"
+        },
+        {
+          "enumerant" : "MakeTexelVisible",
+          "value" : "0x0200",
+          "capabilities" : [ "VulkanMemoryModel" ],
+          "parameters" : [
+            { "kind" : "IdScope" }
+          ],
+          "version" : "1.5"
         },
         {
           "enumerant" : "MakeTexelVisibleKHR",
           "value" : "0x0200",
-          "capabilities" : [ "VulkanMemoryModelKHR" ],
+          "capabilities" : [ "VulkanMemoryModel" ],
           "parameters" : [
             { "kind" : "IdScope" }
           ],
-          "version" : "None"
+          "extensions" : [ "SPV_KHR_vulkan_memory_model" ],
+          "version" : "1.5"
+        },
+        {
+          "enumerant" : "NonPrivateTexel",
+          "value" : "0x0400",
+          "capabilities" : [ "VulkanMemoryModel" ],
+          "version" : "1.5"
         },
         {
           "enumerant" : "NonPrivateTexelKHR",
           "value" : "0x0400",
-          "capabilities" : [ "VulkanMemoryModelKHR" ],
-          "version" : "None"
+          "capabilities" : [ "VulkanMemoryModel" ],
+          "extensions" : [ "SPV_KHR_vulkan_memory_model" ],
+          "version" : "1.5"
+        },
+        {
+          "enumerant" : "VolatileTexel",
+          "value" : "0x0800",
+          "capabilities" : [ "VulkanMemoryModel" ],
+          "version" : "1.5"
         },
         {
           "enumerant" : "VolatileTexelKHR",
           "value" : "0x0800",
-          "capabilities" : [ "VulkanMemoryModelKHR" ],
-          "version" : "None"
+          "capabilities" : [ "VulkanMemoryModel" ],
+          "extensions" : [ "SPV_KHR_vulkan_memory_model" ],
+          "version" : "1.5"
         },
         {
           "enumerant" : "SignExtend",
@@ -6770,28 +6804,50 @@
           "value" : "0x0800"
         },
         {
+          "enumerant" : "OutputMemory",
+          "value" : "0x1000",
+          "capabilities" : [ "VulkanMemoryModel" ],
+          "version" : "1.5"
+        },
+        {
           "enumerant" : "OutputMemoryKHR",
           "value" : "0x1000",
-          "capabilities" : [ "VulkanMemoryModelKHR" ],
-          "version" : "None"
+          "capabilities" : [ "VulkanMemoryModel" ],
+          "extensions" : [ "SPV_KHR_vulkan_memory_model" ],
+          "version" : "1.5"
+        },
+        {
+          "enumerant" : "MakeAvailable",
+          "value" : "0x2000",
+          "capabilities" : [ "VulkanMemoryModel" ],
+          "version" : "1.5"
         },
         {
           "enumerant" : "MakeAvailableKHR",
           "value" : "0x2000",
-          "capabilities" : [ "VulkanMemoryModelKHR" ],
-          "version" : "None"
+          "capabilities" : [ "VulkanMemoryModel" ],
+          "extensions" : [ "SPV_KHR_vulkan_memory_model" ],
+          "version" : "1.5"
+        },
+        {
+          "enumerant" : "MakeVisible",
+          "value" : "0x4000",
+          "capabilities" : [ "VulkanMemoryModel" ],
+          "version" : "1.5"
         },
         {
           "enumerant" : "MakeVisibleKHR",
           "value" : "0x4000",
-          "capabilities" : [ "VulkanMemoryModelKHR" ],
-          "version" : "None"
+          "capabilities" : [ "VulkanMemoryModel" ],
+          "extensions" : [ "SPV_KHR_vulkan_memory_model" ],
+          "version" : "1.5"
         },
         {
           "enumerant" : "Volatile",
           "value" : "0x8000",
-          "capabilities" : [ "VulkanMemoryModelKHR" ],
-          "version" : "None"
+          "capabilities" : [ "VulkanMemoryModel" ],
+          "extensions" : [ "SPV_KHR_vulkan_memory_model" ],
+          "version" : "1.5"
         }
       ]
     },
@@ -6819,13 +6875,32 @@
           "value" : "0x0004"
         },
         {
+          "enumerant" : "MakePointerAvailable",
+          "value" : "0x0008",
+          "parameters" : [
+            { "kind" : "IdScope" }
+          ],
+          "capabilities" : [ "VulkanMemoryModel" ],
+          "version" : "1.5"
+        },
+        {
           "enumerant" : "MakePointerAvailableKHR",
           "value" : "0x0008",
           "parameters" : [
             { "kind" : "IdScope" }
           ],
-          "capabilities" : [ "VulkanMemoryModelKHR" ],
-          "version" : "None"
+          "capabilities" : [ "VulkanMemoryModel" ],
+          "extensions" : [ "SPV_KHR_vulkan_memory_model" ],
+          "version" : "1.5"
+        },
+        {
+          "enumerant" : "MakePointerVisible",
+          "value" : "0x0010",
+          "parameters" : [
+            { "kind" : "IdScope" }
+          ],
+          "capabilities" : [ "VulkanMemoryModel" ],
+          "version" : "1.5"
         },
         {
           "enumerant" : "MakePointerVisibleKHR",
@@ -6833,14 +6908,22 @@
           "parameters" : [
             { "kind" : "IdScope" }
           ],
-          "capabilities" : [ "VulkanMemoryModelKHR" ],
-          "version" : "None"
+          "capabilities" : [ "VulkanMemoryModel" ],
+          "extensions" : [ "SPV_KHR_vulkan_memory_model" ],
+          "version" : "1.5"
+        },
+        {
+          "enumerant" : "NonPrivatePointer",
+          "value" : "0x0020",
+          "capabilities" : [ "VulkanMemoryModel" ],
+          "version" : "1.5"
         },
         {
           "enumerant" : "NonPrivatePointerKHR",
           "value" : "0x0020",
-          "capabilities" : [ "VulkanMemoryModelKHR" ],
-          "version" : "None"
+          "capabilities" : [ "VulkanMemoryModel" ],
+          "extensions" : [ "SPV_KHR_vulkan_memory_model" ],
+          "version" : "1.5"
         }
       ]
     },
@@ -6997,11 +7080,18 @@
           "capabilities" : [ "Addresses" ]
         },
         {
+          "enumerant" : "PhysicalStorageBuffer64",
+          "value" : 5348,
+          "extensions" : [ "SPV_EXT_physical_storage_buffer" ],
+          "capabilities" : [ "PhysicalStorageBufferAddresses" ],
+          "version" : "1.5"
+        },
+        {
           "enumerant" : "PhysicalStorageBuffer64EXT",
           "value" : 5348,
           "extensions" : [ "SPV_EXT_physical_storage_buffer" ],
-          "capabilities" : [ "PhysicalStorageBufferAddressesEXT" ],
-          "version" : "None"
+          "capabilities" : [ "PhysicalStorageBufferAddresses" ],
+          "version" : "1.5"
         }
       ]
     },
@@ -7025,10 +7115,17 @@
           "capabilities" : [ "Kernel" ]
         },
         {
+          "enumerant" : "Vulkan",
+          "value" : 3,
+          "capabilities" : [ "VulkanMemoryModel" ],
+          "version" : "1.5"
+        },
+        {
           "enumerant" : "VulkanKHR",
           "value" : 3,
-          "capabilities" : [ "VulkanMemoryModelKHR" ],
-          "version" : "None"
+          "capabilities" : [ "VulkanMemoryModel" ],
+          "extensions" : [ "SPV_KHR_vulkan_memory_model" ],
+          "version" : "1.5"
         }
       ]
     },
@@ -7524,11 +7621,18 @@
           "version" : "None"
         },
         {
+          "enumerant" : "PhysicalStorageBuffer",
+          "value" : 5349,
+          "extensions" : [ "SPV_EXT_physical_storage_buffer" ],
+          "capabilities" : [ "PhysicalStorageBufferAddresses" ],
+          "version" : "1.5"
+        },
+        {
           "enumerant" : "PhysicalStorageBufferEXT",
           "value" : 5349,
           "extensions" : [ "SPV_EXT_physical_storage_buffer" ],
-          "capabilities" : [ "PhysicalStorageBufferAddressesEXT" ],
-          "version" : "None"
+          "capabilities" : [ "PhysicalStorageBufferAddresses" ],
+          "version" : "1.5"
         }
       ]
     },
@@ -8509,24 +8613,45 @@
           "version" : "None"
         },
         {
+          "enumerant" : "NonUniform",
+          "value" : 5300,
+          "capabilities" : [ "ShaderNonUniform" ],
+          "version" : "1.5"
+        },
+        {
           "enumerant" : "NonUniformEXT",
           "value" : 5300,
-          "capabilities" : [ "ShaderNonUniformEXT" ],
-          "version" : "None"
+          "capabilities" : [ "ShaderNonUniform" ],
+          "extensions" : [ "SPV_EXT_descriptor_indexing" ],
+          "version" : "1.5"
+        },
+        {
+          "enumerant" : "RestrictPointer",
+          "value" : 5355,
+          "capabilities" : [ "PhysicalStorageBufferAddresses" ],
+          "extensions" : [ "SPV_EXT_physical_storage_buffer" ],
+          "version" : "1.5"
         },
         {
           "enumerant" : "RestrictPointerEXT",
           "value" : 5355,
-          "capabilities" : [ "PhysicalStorageBufferAddressesEXT" ],
+          "capabilities" : [ "PhysicalStorageBufferAddresses" ],
           "extensions" : [ "SPV_EXT_physical_storage_buffer" ],
-          "version" : "None"
+          "version" : "1.5"
+        },
+        {
+          "enumerant" : "AliasedPointer",
+          "value" : 5356,
+          "capabilities" : [ "PhysicalStorageBufferAddresses" ],
+          "extensions" : [ "SPV_EXT_physical_storage_buffer" ],
+          "version" : "1.5"
         },
         {
           "enumerant" : "AliasedPointerEXT",
           "value" : 5356,
-          "capabilities" : [ "PhysicalStorageBufferAddressesEXT" ],
+          "capabilities" : [ "PhysicalStorageBufferAddresses" ],
           "extensions" : [ "SPV_EXT_physical_storage_buffer" ],
-          "version" : "None"
+          "version" : "1.5"
         },
         {
           "enumerant" : "CounterBuffer",
@@ -8620,12 +8745,12 @@
         {
           "enumerant" : "Layer",
           "value" : 9,
-          "capabilities" : [ "Geometry" ]
+          "capabilities" : [ "Geometry", "ShaderLayer", "ShaderViewportIndexLayerEXT" ]
         },
         {
           "enumerant" : "ViewportIndex",
           "value" : 10,
-          "capabilities" : [ "MultiViewport" ]
+          "capabilities" : [ "MultiViewport", "ShaderViewportIndex", "ShaderViewportIndexLayerEXT" ]
         },
         {
           "enumerant" : "TessLevelOuter",
@@ -9218,10 +9343,16 @@
           "value" : 4
         },
         {
+          "enumerant" : "QueueFamily",
+          "value" : 5,
+          "capabilities" : [ "VulkanMemoryModel" ],
+          "version" : "1.5"
+        },
+        {
           "enumerant" : "QueueFamilyKHR",
           "value" : 5,
-          "capabilities" : [ "VulkanMemoryModelKHR" ],
-          "version" : "None"
+          "capabilities" : [ "VulkanMemoryModel" ],
+          "version" : "1.5"
         }
       ]
     },
@@ -9633,6 +9764,16 @@
           "version" : "1.3"
         },
         {
+          "enumerant" : "ShaderLayer",
+          "value" : 69,
+          "version" : "1.5"
+        },
+        {
+          "enumerant" : "ShaderViewportIndex",
+          "value" : 70,
+          "version" : "1.5"
+        },
+        {
           "enumerant" : "SubgroupBallotKHR",
           "value" : 4423,
           "extensions" : [ "SPV_KHR_shader_ballot" ],
@@ -9738,20 +9879,20 @@
           "enumerant" : "StorageBuffer8BitAccess",
           "value" : 4448,
           "extensions" : [ "SPV_KHR_8bit_storage" ],
-          "version" : "None"
+          "version" : "1.5"
         },
         {
           "enumerant" : "UniformAndStorageBuffer8BitAccess",
           "value" : 4449,
           "capabilities" : [ "StorageBuffer8BitAccess" ],
           "extensions" : [ "SPV_KHR_8bit_storage" ],
-          "version" : "None"
+          "version" : "1.5"
         },
         {
           "enumerant" : "StoragePushConstant8",
           "value" : 4450,
           "extensions" : [ "SPV_KHR_8bit_storage" ],
-          "version" : "None"
+          "version" : "1.5"
         },
         {
           "enumerant" : "DenormPreserve",
@@ -9927,88 +10068,160 @@
           "version" : "None"
         },
         {
+          "enumerant" : "ShaderNonUniform",
+          "value" : 5301,
+          "capabilities" : [ "Shader" ],
+          "version" : "1.5"
+        },
+        {
           "enumerant" : "ShaderNonUniformEXT",
           "value" : 5301,
           "capabilities" : [ "Shader" ],
           "extensions" : [ "SPV_EXT_descriptor_indexing" ],
-          "version" : "None"
+          "version" : "1.5"
+        },
+        {
+          "enumerant" : "RuntimeDescriptorArray",
+          "value" : 5302,
+          "capabilities" : [ "Shader" ],
+          "version" : "1.5"
         },
         {
           "enumerant" : "RuntimeDescriptorArrayEXT",
           "value" : 5302,
           "capabilities" : [ "Shader" ],
           "extensions" : [ "SPV_EXT_descriptor_indexing" ],
-          "version" : "None"
+          "version" : "1.5"
+        },
+        {
+          "enumerant" : "InputAttachmentArrayDynamicIndexing",
+          "value" : 5303,
+          "capabilities" : [ "InputAttachment" ],
+          "version" : "1.5"
         },
         {
           "enumerant" : "InputAttachmentArrayDynamicIndexingEXT",
           "value" : 5303,
           "capabilities" : [ "InputAttachment" ],
           "extensions" : [ "SPV_EXT_descriptor_indexing" ],
-          "version" : "None"
+          "version" : "1.5"
+        },
+        {
+          "enumerant" : "UniformTexelBufferArrayDynamicIndexing",
+          "value" : 5304,
+          "capabilities" : [ "SampledBuffer" ],
+          "version" : "1.5"
         },
         {
           "enumerant" : "UniformTexelBufferArrayDynamicIndexingEXT",
           "value" : 5304,
           "capabilities" : [ "SampledBuffer" ],
           "extensions" : [ "SPV_EXT_descriptor_indexing" ],
-          "version" : "None"
+          "version" : "1.5"
+        },
+        {
+          "enumerant" : "StorageTexelBufferArrayDynamicIndexing",
+          "value" : 5305,
+          "capabilities" : [ "ImageBuffer" ],
+          "version" : "1.5"
         },
         {
           "enumerant" : "StorageTexelBufferArrayDynamicIndexingEXT",
           "value" : 5305,
           "capabilities" : [ "ImageBuffer" ],
           "extensions" : [ "SPV_EXT_descriptor_indexing" ],
-          "version" : "None"
+          "version" : "1.5"
+        },
+        {
+          "enumerant" : "UniformBufferArrayNonUniformIndexing",
+          "value" : 5306,
+          "capabilities" : [ "ShaderNonUniform" ],
+          "version" : "1.5"
         },
         {
           "enumerant" : "UniformBufferArrayNonUniformIndexingEXT",
           "value" : 5306,
-          "capabilities" : [ "ShaderNonUniformEXT" ],
+          "capabilities" : [ "ShaderNonUniform" ],
           "extensions" : [ "SPV_EXT_descriptor_indexing" ],
-          "version" : "None"
+          "version" : "1.5"
+        },
+        {
+          "enumerant" : "SampledImageArrayNonUniformIndexing",
+          "value" : 5307,
+          "capabilities" : [ "ShaderNonUniform" ],
+          "version" : "1.5"
         },
         {
           "enumerant" : "SampledImageArrayNonUniformIndexingEXT",
           "value" : 5307,
-          "capabilities" : [ "ShaderNonUniformEXT" ],
+          "capabilities" : [ "ShaderNonUniform" ],
           "extensions" : [ "SPV_EXT_descriptor_indexing" ],
-          "version" : "None"
+          "version" : "1.5"
+        },
+        {
+          "enumerant" : "StorageBufferArrayNonUniformIndexing",
+          "value" : 5308,
+          "capabilities" : [ "ShaderNonUniform" ],
+          "version" : "1.5"
         },
         {
           "enumerant" : "StorageBufferArrayNonUniformIndexingEXT",
           "value" : 5308,
-          "capabilities" : [ "ShaderNonUniformEXT" ],
+          "capabilities" : [ "ShaderNonUniform" ],
           "extensions" : [ "SPV_EXT_descriptor_indexing" ],
-          "version" : "None"
+          "version" : "1.5"
+        },
+        {
+          "enumerant" : "StorageImageArrayNonUniformIndexing",
+          "value" : 5309,
+          "capabilities" : [ "ShaderNonUniform" ],
+          "version" : "1.5"
         },
         {
           "enumerant" : "StorageImageArrayNonUniformIndexingEXT",
           "value" : 5309,
-          "capabilities" : [ "ShaderNonUniformEXT" ],
+          "capabilities" : [ "ShaderNonUniform" ],
           "extensions" : [ "SPV_EXT_descriptor_indexing" ],
-          "version" : "None"
+          "version" : "1.5"
+        },
+        {
+          "enumerant" : "InputAttachmentArrayNonUniformIndexing",
+          "value" : 5310,
+          "capabilities" : [ "InputAttachment", "ShaderNonUniform" ],
+          "version" : "1.5"
         },
         {
           "enumerant" : "InputAttachmentArrayNonUniformIndexingEXT",
           "value" : 5310,
-          "capabilities" : [ "InputAttachment", "ShaderNonUniformEXT" ],
+          "capabilities" : [ "InputAttachment", "ShaderNonUniform" ],
           "extensions" : [ "SPV_EXT_descriptor_indexing" ],
-          "version" : "None"
+          "version" : "1.5"
+        },
+        {
+          "enumerant" : "UniformTexelBufferArrayNonUniformIndexing",
+          "value" : 5311,
+          "capabilities" : [ "SampledBuffer", "ShaderNonUniform" ],
+          "version" : "1.5"
         },
         {
           "enumerant" : "UniformTexelBufferArrayNonUniformIndexingEXT",
           "value" : 5311,
-          "capabilities" : [ "SampledBuffer", "ShaderNonUniformEXT" ],
+          "capabilities" : [ "SampledBuffer", "ShaderNonUniform" ],
           "extensions" : [ "SPV_EXT_descriptor_indexing" ],
-          "version" : "None"
+          "version" : "1.5"
+        },
+        {
+          "enumerant" : "StorageTexelBufferArrayNonUniformIndexing",
+          "value" : 5312,
+          "capabilities" : [ "ImageBuffer", "ShaderNonUniform" ],
+          "version" : "1.5"
         },
         {
           "enumerant" : "StorageTexelBufferArrayNonUniformIndexingEXT",
           "value" : 5312,
-          "capabilities" : [ "ImageBuffer", "ShaderNonUniformEXT" ],
+          "capabilities" : [ "ImageBuffer", "ShaderNonUniform" ],
           "extensions" : [ "SPV_EXT_descriptor_indexing" ],
-          "version" : "None"
+          "version" : "1.5"
         },
         {
           "enumerant" : "RayTracingNV",
@@ -10018,23 +10231,39 @@
           "version" : "None"
         },
         {
+          "enumerant" : "VulkanMemoryModel",
+          "value" : 5345,
+          "version" : "1.5"
+        },
+        {
           "enumerant" : "VulkanMemoryModelKHR",
           "value" : 5345,
           "extensions" : [ "SPV_KHR_vulkan_memory_model" ],
-          "version" : "None"
+          "version" : "1.5"
+        },
+        {
+          "enumerant" : "VulkanMemoryModelDeviceScope",
+          "value" : 5346,
+          "version" : "1.5"
         },
         {
           "enumerant" : "VulkanMemoryModelDeviceScopeKHR",
           "value" : 5346,
           "extensions" : [ "SPV_KHR_vulkan_memory_model" ],
-          "version" : "None"
+          "version" : "1.5"
+        },
+        {
+          "enumerant" : "PhysicalStorageBufferAddresses",
+          "value" : 5347,
+          "capabilities" : [ "Shader" ],
+          "version" : "1.5"
         },
         {
           "enumerant" : "PhysicalStorageBufferAddressesEXT",
           "value" : 5347,
           "capabilities" : [ "Shader" ],
           "extensions" : [ "SPV_EXT_physical_storage_buffer" ],
-          "version" : "None"
+          "version" : "1.5"
         },
         {
           "enumerant" : "ComputeDerivativeGroupLinearNV",
diff --git a/include/spirv/unified1/spirv.cs b/include/spirv/unified1/spirv.cs
index 8c71219..3760951 100644
--- a/include/spirv/unified1/spirv.cs
+++ b/include/spirv/unified1/spirv.cs
@@ -87,6 +87,7 @@ namespace Spv
             Logical = 0,
             Physical32 = 1,
             Physical64 = 2,
+            PhysicalStorageBuffer64 = 5348,
             PhysicalStorageBuffer64EXT = 5348,
         }
 
@@ -95,6 +96,7 @@ namespace Spv
             Simple = 0,
             GLSL450 = 1,
             OpenCL = 2,
+            Vulkan = 3,
             VulkanKHR = 3,
         }
 
@@ -179,6 +181,7 @@ namespace Spv
             HitAttributeNV = 5339,
             IncomingRayPayloadNV = 5342,
             ShaderRecordBufferNV = 5343,
+            PhysicalStorageBuffer = 5349,
             PhysicalStorageBufferEXT = 5349,
         }
 
@@ -307,9 +310,13 @@ namespace Spv
             ConstOffsets = 5,
             Sample = 6,
             MinLod = 7,
+            MakeTexelAvailable = 8,
             MakeTexelAvailableKHR = 8,
+            MakeTexelVisible = 9,
             MakeTexelVisibleKHR = 9,
+            NonPrivateTexel = 10,
             NonPrivateTexelKHR = 10,
+            VolatileTexel = 11,
             VolatileTexelKHR = 11,
             SignExtend = 12,
             ZeroExtend = 13,
@@ -326,9 +333,13 @@ namespace Spv
             ConstOffsets = 0x00000020,
             Sample = 0x00000040,
             MinLod = 0x00000080,
+            MakeTexelAvailable = 0x00000100,
             MakeTexelAvailableKHR = 0x00000100,
+            MakeTexelVisible = 0x00000200,
             MakeTexelVisibleKHR = 0x00000200,
+            NonPrivateTexel = 0x00000400,
             NonPrivateTexelKHR = 0x00000400,
+            VolatileTexel = 0x00000800,
             VolatileTexelKHR = 0x00000800,
             SignExtend = 0x00001000,
             ZeroExtend = 0x00002000,
@@ -446,8 +457,11 @@ namespace Spv
             PerViewNV = 5272,
             PerTaskNV = 5273,
             PerVertexNV = 5285,
+            NonUniform = 5300,
             NonUniformEXT = 5300,
+            RestrictPointer = 5355,
             RestrictPointerEXT = 5355,
+            AliasedPointer = 5356,
             AliasedPointerEXT = 5356,
             CounterBuffer = 5634,
             HlslCounterBufferGOOGLE = 5634,
@@ -631,8 +645,11 @@ namespace Spv
             CrossWorkgroupMemory = 9,
             AtomicCounterMemory = 10,
             ImageMemory = 11,
+            OutputMemory = 12,
             OutputMemoryKHR = 12,
+            MakeAvailable = 13,
             MakeAvailableKHR = 13,
+            MakeVisible = 14,
             MakeVisibleKHR = 14,
             Volatile = 15,
         }
@@ -650,8 +667,11 @@ namespace Spv
             CrossWorkgroupMemory = 0x00000200,
             AtomicCounterMemory = 0x00000400,
             ImageMemory = 0x00000800,
+            OutputMemory = 0x00001000,
             OutputMemoryKHR = 0x00001000,
+            MakeAvailable = 0x00002000,
             MakeAvailableKHR = 0x00002000,
+            MakeVisible = 0x00004000,
             MakeVisibleKHR = 0x00004000,
             Volatile = 0x00008000,
         }
@@ -661,8 +681,11 @@ namespace Spv
             Volatile = 0,
             Aligned = 1,
             Nontemporal = 2,
+            MakePointerAvailable = 3,
             MakePointerAvailableKHR = 3,
+            MakePointerVisible = 4,
             MakePointerVisibleKHR = 4,
+            NonPrivatePointer = 5,
             NonPrivatePointerKHR = 5,
         }
 
@@ -672,8 +695,11 @@ namespace Spv
             Volatile = 0x00000001,
             Aligned = 0x00000002,
             Nontemporal = 0x00000004,
+            MakePointerAvailable = 0x00000008,
             MakePointerAvailableKHR = 0x00000008,
+            MakePointerVisible = 0x00000010,
             MakePointerVisibleKHR = 0x00000010,
+            NonPrivatePointer = 0x00000020,
             NonPrivatePointerKHR = 0x00000020,
         }
 
@@ -684,6 +710,7 @@ namespace Spv
             Workgroup = 2,
             Subgroup = 3,
             Invocation = 4,
+            QueueFamily = 5,
             QueueFamilyKHR = 5,
         }
 
@@ -785,6 +812,8 @@ namespace Spv
             GroupNonUniformShuffleRelative = 66,
             GroupNonUniformClustered = 67,
             GroupNonUniformQuad = 68,
+            ShaderLayer = 69,
+            ShaderViewportIndex = 70,
             SubgroupBallotKHR = 4423,
             DrawParameters = 4427,
             SubgroupVoteKHR = 4431,
@@ -829,21 +858,36 @@ namespace Spv
             FragmentDensityEXT = 5291,
             ShadingRateNV = 5291,
             GroupNonUniformPartitionedNV = 5297,
+            ShaderNonUniform = 5301,
             ShaderNonUniformEXT = 5301,
+            RuntimeDescriptorArray = 5302,
             RuntimeDescriptorArrayEXT = 5302,
+            InputAttachmentArrayDynamicIndexing = 5303,
             InputAttachmentArrayDynamicIndexingEXT = 5303,
+            UniformTexelBufferArrayDynamicIndexing = 5304,
             UniformTexelBufferArrayDynamicIndexingEXT = 5304,
+            StorageTexelBufferArrayDynamicIndexing = 5305,
             StorageTexelBufferArrayDynamicIndexingEXT = 5305,
+            UniformBufferArrayNonUniformIndexing = 5306,
             UniformBufferArrayNonUniformIndexingEXT = 5306,
+            SampledImageArrayNonUniformIndexing = 5307,
             SampledImageArrayNonUniformIndexingEXT = 5307,
+            StorageBufferArrayNonUniformIndexing = 5308,
             StorageBufferArrayNonUniformIndexingEXT = 5308,
+            StorageImageArrayNonUniformIndexing = 5309,
             StorageImageArrayNonUniformIndexingEXT = 5309,
+            InputAttachmentArrayNonUniformIndexing = 5310,
             InputAttachmentArrayNonUniformIndexingEXT = 5310,
+            UniformTexelBufferArrayNonUniformIndexing = 5311,
             UniformTexelBufferArrayNonUniformIndexingEXT = 5311,
+            StorageTexelBufferArrayNonUniformIndexing = 5312,
             StorageTexelBufferArrayNonUniformIndexingEXT = 5312,
             RayTracingNV = 5340,
+            VulkanMemoryModel = 5345,
             VulkanMemoryModelKHR = 5345,
+            VulkanMemoryModelDeviceScope = 5346,
             VulkanMemoryModelDeviceScopeKHR = 5346,
+            PhysicalStorageBufferAddresses = 5347,
             PhysicalStorageBufferAddressesEXT = 5347,
             ComputeDerivativeGroupLinearNV = 5350,
             CooperativeMatrixNV = 5357,
diff --git a/include/spirv/unified1/spirv.h b/include/spirv/unified1/spirv.h
index e848e46..f93fde9 100644
--- a/include/spirv/unified1/spirv.h
+++ b/include/spirv/unified1/spirv.h
@@ -95,6 +95,7 @@ typedef enum SpvAddressingModel_ {
     SpvAddressingModelLogical = 0,
     SpvAddressingModelPhysical32 = 1,
     SpvAddressingModelPhysical64 = 2,
+    SpvAddressingModelPhysicalStorageBuffer64 = 5348,
     SpvAddressingModelPhysicalStorageBuffer64EXT = 5348,
     SpvAddressingModelMax = 0x7fffffff,
 } SpvAddressingModel;
@@ -103,6 +104,7 @@ typedef enum SpvMemoryModel_ {
     SpvMemoryModelSimple = 0,
     SpvMemoryModelGLSL450 = 1,
     SpvMemoryModelOpenCL = 2,
+    SpvMemoryModelVulkan = 3,
     SpvMemoryModelVulkanKHR = 3,
     SpvMemoryModelMax = 0x7fffffff,
 } SpvMemoryModel;
@@ -187,6 +189,7 @@ typedef enum SpvStorageClass_ {
     SpvStorageClassHitAttributeNV = 5339,
     SpvStorageClassIncomingRayPayloadNV = 5342,
     SpvStorageClassShaderRecordBufferNV = 5343,
+    SpvStorageClassPhysicalStorageBuffer = 5349,
     SpvStorageClassPhysicalStorageBufferEXT = 5349,
     SpvStorageClassMax = 0x7fffffff,
 } SpvStorageClass;
@@ -315,9 +318,13 @@ typedef enum SpvImageOperandsShift_ {
     SpvImageOperandsConstOffsetsShift = 5,
     SpvImageOperandsSampleShift = 6,
     SpvImageOperandsMinLodShift = 7,
+    SpvImageOperandsMakeTexelAvailableShift = 8,
     SpvImageOperandsMakeTexelAvailableKHRShift = 8,
+    SpvImageOperandsMakeTexelVisibleShift = 9,
     SpvImageOperandsMakeTexelVisibleKHRShift = 9,
+    SpvImageOperandsNonPrivateTexelShift = 10,
     SpvImageOperandsNonPrivateTexelKHRShift = 10,
+    SpvImageOperandsVolatileTexelShift = 11,
     SpvImageOperandsVolatileTexelKHRShift = 11,
     SpvImageOperandsSignExtendShift = 12,
     SpvImageOperandsZeroExtendShift = 13,
@@ -334,9 +341,13 @@ typedef enum SpvImageOperandsMask_ {
     SpvImageOperandsConstOffsetsMask = 0x00000020,
     SpvImageOperandsSampleMask = 0x00000040,
     SpvImageOperandsMinLodMask = 0x00000080,
+    SpvImageOperandsMakeTexelAvailableMask = 0x00000100,
     SpvImageOperandsMakeTexelAvailableKHRMask = 0x00000100,
+    SpvImageOperandsMakeTexelVisibleMask = 0x00000200,
     SpvImageOperandsMakeTexelVisibleKHRMask = 0x00000200,
+    SpvImageOperandsNonPrivateTexelMask = 0x00000400,
     SpvImageOperandsNonPrivateTexelKHRMask = 0x00000400,
+    SpvImageOperandsVolatileTexelMask = 0x00000800,
     SpvImageOperandsVolatileTexelKHRMask = 0x00000800,
     SpvImageOperandsSignExtendMask = 0x00001000,
     SpvImageOperandsZeroExtendMask = 0x00002000,
@@ -452,8 +463,11 @@ typedef enum SpvDecoration_ {
     SpvDecorationPerViewNV = 5272,
     SpvDecorationPerTaskNV = 5273,
     SpvDecorationPerVertexNV = 5285,
+    SpvDecorationNonUniform = 5300,
     SpvDecorationNonUniformEXT = 5300,
+    SpvDecorationRestrictPointer = 5355,
     SpvDecorationRestrictPointerEXT = 5355,
+    SpvDecorationAliasedPointer = 5356,
     SpvDecorationAliasedPointerEXT = 5356,
     SpvDecorationCounterBuffer = 5634,
     SpvDecorationHlslCounterBufferGOOGLE = 5634,
@@ -634,8 +648,11 @@ typedef enum SpvMemorySemanticsShift_ {
     SpvMemorySemanticsCrossWorkgroupMemoryShift = 9,
     SpvMemorySemanticsAtomicCounterMemoryShift = 10,
     SpvMemorySemanticsImageMemoryShift = 11,
+    SpvMemorySemanticsOutputMemoryShift = 12,
     SpvMemorySemanticsOutputMemoryKHRShift = 12,
+    SpvMemorySemanticsMakeAvailableShift = 13,
     SpvMemorySemanticsMakeAvailableKHRShift = 13,
+    SpvMemorySemanticsMakeVisibleShift = 14,
     SpvMemorySemanticsMakeVisibleKHRShift = 14,
     SpvMemorySemanticsVolatileShift = 15,
     SpvMemorySemanticsMax = 0x7fffffff,
@@ -653,8 +670,11 @@ typedef enum SpvMemorySemanticsMask_ {
     SpvMemorySemanticsCrossWorkgroupMemoryMask = 0x00000200,
     SpvMemorySemanticsAtomicCounterMemoryMask = 0x00000400,
     SpvMemorySemanticsImageMemoryMask = 0x00000800,
+    SpvMemorySemanticsOutputMemoryMask = 0x00001000,
     SpvMemorySemanticsOutputMemoryKHRMask = 0x00001000,
+    SpvMemorySemanticsMakeAvailableMask = 0x00002000,
     SpvMemorySemanticsMakeAvailableKHRMask = 0x00002000,
+    SpvMemorySemanticsMakeVisibleMask = 0x00004000,
     SpvMemorySemanticsMakeVisibleKHRMask = 0x00004000,
     SpvMemorySemanticsVolatileMask = 0x00008000,
 } SpvMemorySemanticsMask;
@@ -663,8 +683,11 @@ typedef enum SpvMemoryAccessShift_ {
     SpvMemoryAccessVolatileShift = 0,
     SpvMemoryAccessAlignedShift = 1,
     SpvMemoryAccessNontemporalShift = 2,
+    SpvMemoryAccessMakePointerAvailableShift = 3,
     SpvMemoryAccessMakePointerAvailableKHRShift = 3,
+    SpvMemoryAccessMakePointerVisibleShift = 4,
     SpvMemoryAccessMakePointerVisibleKHRShift = 4,
+    SpvMemoryAccessNonPrivatePointerShift = 5,
     SpvMemoryAccessNonPrivatePointerKHRShift = 5,
     SpvMemoryAccessMax = 0x7fffffff,
 } SpvMemoryAccessShift;
@@ -674,8 +697,11 @@ typedef enum SpvMemoryAccessMask_ {
     SpvMemoryAccessVolatileMask = 0x00000001,
     SpvMemoryAccessAlignedMask = 0x00000002,
     SpvMemoryAccessNontemporalMask = 0x00000004,
+    SpvMemoryAccessMakePointerAvailableMask = 0x00000008,
     SpvMemoryAccessMakePointerAvailableKHRMask = 0x00000008,
+    SpvMemoryAccessMakePointerVisibleMask = 0x00000010,
     SpvMemoryAccessMakePointerVisibleKHRMask = 0x00000010,
+    SpvMemoryAccessNonPrivatePointerMask = 0x00000020,
     SpvMemoryAccessNonPrivatePointerKHRMask = 0x00000020,
 } SpvMemoryAccessMask;
 
@@ -685,6 +711,7 @@ typedef enum SpvScope_ {
     SpvScopeWorkgroup = 2,
     SpvScopeSubgroup = 3,
     SpvScopeInvocation = 4,
+    SpvScopeQueueFamily = 5,
     SpvScopeQueueFamilyKHR = 5,
     SpvScopeMax = 0x7fffffff,
 } SpvScope;
@@ -785,6 +812,8 @@ typedef enum SpvCapability_ {
     SpvCapabilityGroupNonUniformShuffleRelative = 66,
     SpvCapabilityGroupNonUniformClustered = 67,
     SpvCapabilityGroupNonUniformQuad = 68,
+    SpvCapabilityShaderLayer = 69,
+    SpvCapabilityShaderViewportIndex = 70,
     SpvCapabilitySubgroupBallotKHR = 4423,
     SpvCapabilityDrawParameters = 4427,
     SpvCapabilitySubgroupVoteKHR = 4431,
@@ -829,21 +858,36 @@ typedef enum SpvCapability_ {
     SpvCapabilityFragmentDensityEXT = 5291,
     SpvCapabilityShadingRateNV = 5291,
     SpvCapabilityGroupNonUniformPartitionedNV = 5297,
+    SpvCapabilityShaderNonUniform = 5301,
     SpvCapabilityShaderNonUniformEXT = 5301,
+    SpvCapabilityRuntimeDescriptorArray = 5302,
     SpvCapabilityRuntimeDescriptorArrayEXT = 5302,
+    SpvCapabilityInputAttachmentArrayDynamicIndexing = 5303,
     SpvCapabilityInputAttachmentArrayDynamicIndexingEXT = 5303,
+    SpvCapabilityUniformTexelBufferArrayDynamicIndexing = 5304,
     SpvCapabilityUniformTexelBufferArrayDynamicIndexingEXT = 5304,
+    SpvCapabilityStorageTexelBufferArrayDynamicIndexing = 5305,
     SpvCapabilityStorageTexelBufferArrayDynamicIndexingEXT = 5305,
+    SpvCapabilityUniformBufferArrayNonUniformIndexing = 5306,
     SpvCapabilityUniformBufferArrayNonUniformIndexingEXT = 5306,
+    SpvCapabilitySampledImageArrayNonUniformIndexing = 5307,
     SpvCapabilitySampledImageArrayNonUniformIndexingEXT = 5307,
+    SpvCapabilityStorageBufferArrayNonUniformIndexing = 5308,
     SpvCapabilityStorageBufferArrayNonUniformIndexingEXT = 5308,
+    SpvCapabilityStorageImageArrayNonUniformIndexing = 5309,
     SpvCapabilityStorageImageArrayNonUniformIndexingEXT = 5309,
+    SpvCapabilityInputAttachmentArrayNonUniformIndexing = 5310,
     SpvCapabilityInputAttachmentArrayNonUniformIndexingEXT = 5310,
+    SpvCapabilityUniformTexelBufferArrayNonUniformIndexing = 5311,
     SpvCapabilityUniformTexelBufferArrayNonUniformIndexingEXT = 5311,
+    SpvCapabilityStorageTexelBufferArrayNonUniformIndexing = 5312,
     SpvCapabilityStorageTexelBufferArrayNonUniformIndexingEXT = 5312,
     SpvCapabilityRayTracingNV = 5340,
+    SpvCapabilityVulkanMemoryModel = 5345,
     SpvCapabilityVulkanMemoryModelKHR = 5345,
+    SpvCapabilityVulkanMemoryModelDeviceScope = 5346,
     SpvCapabilityVulkanMemoryModelDeviceScopeKHR = 5346,
+    SpvCapabilityPhysicalStorageBufferAddresses = 5347,
     SpvCapabilityPhysicalStorageBufferAddressesEXT = 5347,
     SpvCapabilityComputeDerivativeGroupLinearNV = 5350,
     SpvCapabilityCooperativeMatrixNV = 5357,
diff --git a/include/spirv/unified1/spirv.hpp b/include/spirv/unified1/spirv.hpp
index 59fdece..1e96f7b 100644
--- a/include/spirv/unified1/spirv.hpp
+++ b/include/spirv/unified1/spirv.hpp
@@ -91,6 +91,7 @@ enum AddressingModel {
     AddressingModelLogical = 0,
     AddressingModelPhysical32 = 1,
     AddressingModelPhysical64 = 2,
+    AddressingModelPhysicalStorageBuffer64 = 5348,
     AddressingModelPhysicalStorageBuffer64EXT = 5348,
     AddressingModelMax = 0x7fffffff,
 };
@@ -99,6 +100,7 @@ enum MemoryModel {
     MemoryModelSimple = 0,
     MemoryModelGLSL450 = 1,
     MemoryModelOpenCL = 2,
+    MemoryModelVulkan = 3,
     MemoryModelVulkanKHR = 3,
     MemoryModelMax = 0x7fffffff,
 };
@@ -183,6 +185,7 @@ enum StorageClass {
     StorageClassHitAttributeNV = 5339,
     StorageClassIncomingRayPayloadNV = 5342,
     StorageClassShaderRecordBufferNV = 5343,
+    StorageClassPhysicalStorageBuffer = 5349,
     StorageClassPhysicalStorageBufferEXT = 5349,
     StorageClassMax = 0x7fffffff,
 };
@@ -311,9 +314,13 @@ enum ImageOperandsShift {
     ImageOperandsConstOffsetsShift = 5,
     ImageOperandsSampleShift = 6,
     ImageOperandsMinLodShift = 7,
+    ImageOperandsMakeTexelAvailableShift = 8,
     ImageOperandsMakeTexelAvailableKHRShift = 8,
+    ImageOperandsMakeTexelVisibleShift = 9,
     ImageOperandsMakeTexelVisibleKHRShift = 9,
+    ImageOperandsNonPrivateTexelShift = 10,
     ImageOperandsNonPrivateTexelKHRShift = 10,
+    ImageOperandsVolatileTexelShift = 11,
     ImageOperandsVolatileTexelKHRShift = 11,
     ImageOperandsSignExtendShift = 12,
     ImageOperandsZeroExtendShift = 13,
@@ -330,9 +337,13 @@ enum ImageOperandsMask {
     ImageOperandsConstOffsetsMask = 0x00000020,
     ImageOperandsSampleMask = 0x00000040,
     ImageOperandsMinLodMask = 0x00000080,
+    ImageOperandsMakeTexelAvailableMask = 0x00000100,
     ImageOperandsMakeTexelAvailableKHRMask = 0x00000100,
+    ImageOperandsMakeTexelVisibleMask = 0x00000200,
     ImageOperandsMakeTexelVisibleKHRMask = 0x00000200,
+    ImageOperandsNonPrivateTexelMask = 0x00000400,
     ImageOperandsNonPrivateTexelKHRMask = 0x00000400,
+    ImageOperandsVolatileTexelMask = 0x00000800,
     ImageOperandsVolatileTexelKHRMask = 0x00000800,
     ImageOperandsSignExtendMask = 0x00001000,
     ImageOperandsZeroExtendMask = 0x00002000,
@@ -448,8 +459,11 @@ enum Decoration {
     DecorationPerViewNV = 5272,
     DecorationPerTaskNV = 5273,
     DecorationPerVertexNV = 5285,
+    DecorationNonUniform = 5300,
     DecorationNonUniformEXT = 5300,
+    DecorationRestrictPointer = 5355,
     DecorationRestrictPointerEXT = 5355,
+    DecorationAliasedPointer = 5356,
     DecorationAliasedPointerEXT = 5356,
     DecorationCounterBuffer = 5634,
     DecorationHlslCounterBufferGOOGLE = 5634,
@@ -630,8 +644,11 @@ enum MemorySemanticsShift {
     MemorySemanticsCrossWorkgroupMemoryShift = 9,
     MemorySemanticsAtomicCounterMemoryShift = 10,
     MemorySemanticsImageMemoryShift = 11,
+    MemorySemanticsOutputMemoryShift = 12,
     MemorySemanticsOutputMemoryKHRShift = 12,
+    MemorySemanticsMakeAvailableShift = 13,
     MemorySemanticsMakeAvailableKHRShift = 13,
+    MemorySemanticsMakeVisibleShift = 14,
     MemorySemanticsMakeVisibleKHRShift = 14,
     MemorySemanticsVolatileShift = 15,
     MemorySemanticsMax = 0x7fffffff,
@@ -649,8 +666,11 @@ enum MemorySemanticsMask {
     MemorySemanticsCrossWorkgroupMemoryMask = 0x00000200,
     MemorySemanticsAtomicCounterMemoryMask = 0x00000400,
     MemorySemanticsImageMemoryMask = 0x00000800,
+    MemorySemanticsOutputMemoryMask = 0x00001000,
     MemorySemanticsOutputMemoryKHRMask = 0x00001000,
+    MemorySemanticsMakeAvailableMask = 0x00002000,
     MemorySemanticsMakeAvailableKHRMask = 0x00002000,
+    MemorySemanticsMakeVisibleMask = 0x00004000,
     MemorySemanticsMakeVisibleKHRMask = 0x00004000,
     MemorySemanticsVolatileMask = 0x00008000,
 };
@@ -659,8 +679,11 @@ enum MemoryAccessShift {
     MemoryAccessVolatileShift = 0,
     MemoryAccessAlignedShift = 1,
     MemoryAccessNontemporalShift = 2,
+    MemoryAccessMakePointerAvailableShift = 3,
     MemoryAccessMakePointerAvailableKHRShift = 3,
+    MemoryAccessMakePointerVisibleShift = 4,
     MemoryAccessMakePointerVisibleKHRShift = 4,
+    MemoryAccessNonPrivatePointerShift = 5,
     MemoryAccessNonPrivatePointerKHRShift = 5,
     MemoryAccessMax = 0x7fffffff,
 };
@@ -670,8 +693,11 @@ enum MemoryAccessMask {
     MemoryAccessVolatileMask = 0x00000001,
     MemoryAccessAlignedMask = 0x00000002,
     MemoryAccessNontemporalMask = 0x00000004,
+    MemoryAccessMakePointerAvailableMask = 0x00000008,
     MemoryAccessMakePointerAvailableKHRMask = 0x00000008,
+    MemoryAccessMakePointerVisibleMask = 0x00000010,
     MemoryAccessMakePointerVisibleKHRMask = 0x00000010,
+    MemoryAccessNonPrivatePointerMask = 0x00000020,
     MemoryAccessNonPrivatePointerKHRMask = 0x00000020,
 };
 
@@ -681,6 +707,7 @@ enum Scope {
     ScopeWorkgroup = 2,
     ScopeSubgroup = 3,
     ScopeInvocation = 4,
+    ScopeQueueFamily = 5,
     ScopeQueueFamilyKHR = 5,
     ScopeMax = 0x7fffffff,
 };
@@ -781,6 +808,8 @@ enum Capability {
     CapabilityGroupNonUniformShuffleRelative = 66,
     CapabilityGroupNonUniformClustered = 67,
     CapabilityGroupNonUniformQuad = 68,
+    CapabilityShaderLayer = 69,
+    CapabilityShaderViewportIndex = 70,
     CapabilitySubgroupBallotKHR = 4423,
     CapabilityDrawParameters = 4427,
     CapabilitySubgroupVoteKHR = 4431,
@@ -825,21 +854,36 @@ enum Capability {
     CapabilityFragmentDensityEXT = 5291,
     CapabilityShadingRateNV = 5291,
     CapabilityGroupNonUniformPartitionedNV = 5297,
+    CapabilityShaderNonUniform = 5301,
     CapabilityShaderNonUniformEXT = 5301,
+    CapabilityRuntimeDescriptorArray = 5302,
     CapabilityRuntimeDescriptorArrayEXT = 5302,
+    CapabilityInputAttachmentArrayDynamicIndexing = 5303,
     CapabilityInputAttachmentArrayDynamicIndexingEXT = 5303,
+    CapabilityUniformTexelBufferArrayDynamicIndexing = 5304,
     CapabilityUniformTexelBufferArrayDynamicIndexingEXT = 5304,
+    CapabilityStorageTexelBufferArrayDynamicIndexing = 5305,
     CapabilityStorageTexelBufferArrayDynamicIndexingEXT = 5305,
+    CapabilityUniformBufferArrayNonUniformIndexing = 5306,
     CapabilityUniformBufferArrayNonUniformIndexingEXT = 5306,
+    CapabilitySampledImageArrayNonUniformIndexing = 5307,
     CapabilitySampledImageArrayNonUniformIndexingEXT = 5307,
+    CapabilityStorageBufferArrayNonUniformIndexing = 5308,
     CapabilityStorageBufferArrayNonUniformIndexingEXT = 5308,
+    CapabilityStorageImageArrayNonUniformIndexing = 5309,
     CapabilityStorageImageArrayNonUniformIndexingEXT = 5309,
+    CapabilityInputAttachmentArrayNonUniformIndexing = 5310,
     CapabilityInputAttachmentArrayNonUniformIndexingEXT = 5310,
+    CapabilityUniformTexelBufferArrayNonUniformIndexing = 5311,
     CapabilityUniformTexelBufferArrayNonUniformIndexingEXT = 5311,
+    CapabilityStorageTexelBufferArrayNonUniformIndexing = 5312,
     CapabilityStorageTexelBufferArrayNonUniformIndexingEXT = 5312,
     CapabilityRayTracingNV = 5340,
+    CapabilityVulkanMemoryModel = 5345,
     CapabilityVulkanMemoryModelKHR = 5345,
+    CapabilityVulkanMemoryModelDeviceScope = 5346,
     CapabilityVulkanMemoryModelDeviceScopeKHR = 5346,
+    CapabilityPhysicalStorageBufferAddresses = 5347,
     CapabilityPhysicalStorageBufferAddressesEXT = 5347,
     CapabilityComputeDerivativeGroupLinearNV = 5350,
     CapabilityCooperativeMatrixNV = 5357,
diff --git a/include/spirv/unified1/spirv.hpp11 b/include/spirv/unified1/spirv.hpp11
index 0faa67b..a51ce6c 100644
--- a/include/spirv/unified1/spirv.hpp11
+++ b/include/spirv/unified1/spirv.hpp11
@@ -91,6 +91,7 @@ enum class AddressingModel : unsigned {
     Logical = 0,
     Physical32 = 1,
     Physical64 = 2,
+    PhysicalStorageBuffer64 = 5348,
     PhysicalStorageBuffer64EXT = 5348,
     Max = 0x7fffffff,
 };
@@ -99,6 +100,7 @@ enum class MemoryModel : unsigned {
     Simple = 0,
     GLSL450 = 1,
     OpenCL = 2,
+    Vulkan = 3,
     VulkanKHR = 3,
     Max = 0x7fffffff,
 };
@@ -183,6 +185,7 @@ enum class StorageClass : unsigned {
     HitAttributeNV = 5339,
     IncomingRayPayloadNV = 5342,
     ShaderRecordBufferNV = 5343,
+    PhysicalStorageBuffer = 5349,
     PhysicalStorageBufferEXT = 5349,
     Max = 0x7fffffff,
 };
@@ -311,9 +314,13 @@ enum class ImageOperandsShift : unsigned {
     ConstOffsets = 5,
     Sample = 6,
     MinLod = 7,
+    MakeTexelAvailable = 8,
     MakeTexelAvailableKHR = 8,
+    MakeTexelVisible = 9,
     MakeTexelVisibleKHR = 9,
+    NonPrivateTexel = 10,
     NonPrivateTexelKHR = 10,
+    VolatileTexel = 11,
     VolatileTexelKHR = 11,
     SignExtend = 12,
     ZeroExtend = 13,
@@ -330,9 +337,13 @@ enum class ImageOperandsMask : unsigned {
     ConstOffsets = 0x00000020,
     Sample = 0x00000040,
     MinLod = 0x00000080,
+    MakeTexelAvailable = 0x00000100,
     MakeTexelAvailableKHR = 0x00000100,
+    MakeTexelVisible = 0x00000200,
     MakeTexelVisibleKHR = 0x00000200,
+    NonPrivateTexel = 0x00000400,
     NonPrivateTexelKHR = 0x00000400,
+    VolatileTexel = 0x00000800,
     VolatileTexelKHR = 0x00000800,
     SignExtend = 0x00001000,
     ZeroExtend = 0x00002000,
@@ -448,8 +459,11 @@ enum class Decoration : unsigned {
     PerViewNV = 5272,
     PerTaskNV = 5273,
     PerVertexNV = 5285,
+    NonUniform = 5300,
     NonUniformEXT = 5300,
+    RestrictPointer = 5355,
     RestrictPointerEXT = 5355,
+    AliasedPointer = 5356,
     AliasedPointerEXT = 5356,
     CounterBuffer = 5634,
     HlslCounterBufferGOOGLE = 5634,
@@ -630,8 +644,11 @@ enum class MemorySemanticsShift : unsigned {
     CrossWorkgroupMemory = 9,
     AtomicCounterMemory = 10,
     ImageMemory = 11,
+    OutputMemory = 12,
     OutputMemoryKHR = 12,
+    MakeAvailable = 13,
     MakeAvailableKHR = 13,
+    MakeVisible = 14,
     MakeVisibleKHR = 14,
     Volatile = 15,
     Max = 0x7fffffff,
@@ -649,8 +666,11 @@ enum class MemorySemanticsMask : unsigned {
     CrossWorkgroupMemory = 0x00000200,
     AtomicCounterMemory = 0x00000400,
     ImageMemory = 0x00000800,
+    OutputMemory = 0x00001000,
     OutputMemoryKHR = 0x00001000,
+    MakeAvailable = 0x00002000,
     MakeAvailableKHR = 0x00002000,
+    MakeVisible = 0x00004000,
     MakeVisibleKHR = 0x00004000,
     Volatile = 0x00008000,
 };
@@ -659,8 +679,11 @@ enum class MemoryAccessShift : unsigned {
     Volatile = 0,
     Aligned = 1,
     Nontemporal = 2,
+    MakePointerAvailable = 3,
     MakePointerAvailableKHR = 3,
+    MakePointerVisible = 4,
     MakePointerVisibleKHR = 4,
+    NonPrivatePointer = 5,
     NonPrivatePointerKHR = 5,
     Max = 0x7fffffff,
 };
@@ -670,8 +693,11 @@ enum class MemoryAccessMask : unsigned {
     Volatile = 0x00000001,
     Aligned = 0x00000002,
     Nontemporal = 0x00000004,
+    MakePointerAvailable = 0x00000008,
     MakePointerAvailableKHR = 0x00000008,
+    MakePointerVisible = 0x00000010,
     MakePointerVisibleKHR = 0x00000010,
+    NonPrivatePointer = 0x00000020,
     NonPrivatePointerKHR = 0x00000020,
 };
 
@@ -681,6 +707,7 @@ enum class Scope : unsigned {
     Workgroup = 2,
     Subgroup = 3,
     Invocation = 4,
+    QueueFamily = 5,
     QueueFamilyKHR = 5,
     Max = 0x7fffffff,
 };
@@ -781,6 +808,8 @@ enum class Capability : unsigned {
     GroupNonUniformShuffleRelative = 66,
     GroupNonUniformClustered = 67,
     GroupNonUniformQuad = 68,
+    ShaderLayer = 69,
+    ShaderViewportIndex = 70,
     SubgroupBallotKHR = 4423,
     DrawParameters = 4427,
     SubgroupVoteKHR = 4431,
@@ -825,21 +854,36 @@ enum class Capability : unsigned {
     FragmentDensityEXT = 5291,
     ShadingRateNV = 5291,
     GroupNonUniformPartitionedNV = 5297,
+    ShaderNonUniform = 5301,
     ShaderNonUniformEXT = 5301,
+    RuntimeDescriptorArray = 5302,
     RuntimeDescriptorArrayEXT = 5302,
+    InputAttachmentArrayDynamicIndexing = 5303,
     InputAttachmentArrayDynamicIndexingEXT = 5303,
+    UniformTexelBufferArrayDynamicIndexing = 5304,
     UniformTexelBufferArrayDynamicIndexingEXT = 5304,
+    StorageTexelBufferArrayDynamicIndexing = 5305,
     StorageTexelBufferArrayDynamicIndexingEXT = 5305,
+    UniformBufferArrayNonUniformIndexing = 5306,
     UniformBufferArrayNonUniformIndexingEXT = 5306,
+    SampledImageArrayNonUniformIndexing = 5307,
     SampledImageArrayNonUniformIndexingEXT = 5307,
+    StorageBufferArrayNonUniformIndexing = 5308,
     StorageBufferArrayNonUniformIndexingEXT = 5308,
+    StorageImageArrayNonUniformIndexing = 5309,
     StorageImageArrayNonUniformIndexingEXT = 5309,
+    InputAttachmentArrayNonUniformIndexing = 5310,
     InputAttachmentArrayNonUniformIndexingEXT = 5310,
+    UniformTexelBufferArrayNonUniformIndexing = 5311,
     UniformTexelBufferArrayNonUniformIndexingEXT = 5311,
+    StorageTexelBufferArrayNonUniformIndexing = 5312,
     StorageTexelBufferArrayNonUniformIndexingEXT = 5312,
     RayTracingNV = 5340,
+    VulkanMemoryModel = 5345,
     VulkanMemoryModelKHR = 5345,
+    VulkanMemoryModelDeviceScope = 5346,
     VulkanMemoryModelDeviceScopeKHR = 5346,
+    PhysicalStorageBufferAddresses = 5347,
     PhysicalStorageBufferAddressesEXT = 5347,
     ComputeDerivativeGroupLinearNV = 5350,
     CooperativeMatrixNV = 5357,
diff --git a/include/spirv/unified1/spirv.json b/include/spirv/unified1/spirv.json
index 425f396..5a48338 100644
--- a/include/spirv/unified1/spirv.json
+++ b/include/spirv/unified1/spirv.json
@@ -104,6 +104,7 @@
                     "Logical": 0,
                     "Physical32": 1,
                     "Physical64": 2,
+                    "PhysicalStorageBuffer64": 5348,
                     "PhysicalStorageBuffer64EXT": 5348
                 }
             },
@@ -115,6 +116,7 @@
                     "Simple": 0,
                     "GLSL450": 1,
                     "OpenCL": 2,
+                    "Vulkan": 3,
                     "VulkanKHR": 3
                 }
             },
@@ -205,6 +207,7 @@
                     "HitAttributeNV": 5339,
                     "IncomingRayPayloadNV": 5342,
                     "ShaderRecordBufferNV": 5343,
+                    "PhysicalStorageBuffer": 5349,
                     "PhysicalStorageBufferEXT": 5349
                 }
             },
@@ -354,9 +357,13 @@
                     "ConstOffsets": 5,
                     "Sample": 6,
                     "MinLod": 7,
+                    "MakeTexelAvailable": 8,
                     "MakeTexelAvailableKHR": 8,
+                    "MakeTexelVisible": 9,
                     "MakeTexelVisibleKHR": 9,
+                    "NonPrivateTexel": 10,
                     "NonPrivateTexelKHR": 10,
+                    "VolatileTexel": 11,
                     "VolatileTexelKHR": 11,
                     "SignExtend": 12,
                     "ZeroExtend": 13
@@ -482,8 +489,11 @@
                     "PerViewNV": 5272,
                     "PerTaskNV": 5273,
                     "PerVertexNV": 5285,
+                    "NonUniform": 5300,
                     "NonUniformEXT": 5300,
+                    "RestrictPointer": 5355,
                     "RestrictPointerEXT": 5355,
+                    "AliasedPointer": 5356,
                     "AliasedPointerEXT": 5356,
                     "CounterBuffer": 5634,
                     "HlslCounterBufferGOOGLE": 5634,
@@ -652,8 +662,11 @@
                     "CrossWorkgroupMemory": 9,
                     "AtomicCounterMemory": 10,
                     "ImageMemory": 11,
+                    "OutputMemory": 12,
                     "OutputMemoryKHR": 12,
+                    "MakeAvailable": 13,
                     "MakeAvailableKHR": 13,
+                    "MakeVisible": 14,
                     "MakeVisibleKHR": 14,
                     "Volatile": 15
                 }
@@ -666,8 +679,11 @@
                     "Volatile": 0,
                     "Aligned": 1,
                     "Nontemporal": 2,
+                    "MakePointerAvailable": 3,
                     "MakePointerAvailableKHR": 3,
+                    "MakePointerVisible": 4,
                     "MakePointerVisibleKHR": 4,
+                    "NonPrivatePointer": 5,
                     "NonPrivatePointerKHR": 5
                 }
             },
@@ -681,6 +697,7 @@
                     "Workgroup": 2,
                     "Subgroup": 3,
                     "Invocation": 4,
+                    "QueueFamily": 5,
                     "QueueFamilyKHR": 5
                 }
             },
@@ -788,6 +805,8 @@
                     "GroupNonUniformShuffleRelative": 66,
                     "GroupNonUniformClustered": 67,
                     "GroupNonUniformQuad": 68,
+                    "ShaderLayer": 69,
+                    "ShaderViewportIndex": 70,
                     "SubgroupBallotKHR": 4423,
                     "DrawParameters": 4427,
                     "SubgroupVoteKHR": 4431,
@@ -832,21 +851,36 @@
                     "FragmentDensityEXT": 5291,
                     "ShadingRateNV": 5291,
                     "GroupNonUniformPartitionedNV": 5297,
+                    "ShaderNonUniform": 5301,
                     "ShaderNonUniformEXT": 5301,
+                    "RuntimeDescriptorArray": 5302,
                     "RuntimeDescriptorArrayEXT": 5302,
+                    "InputAttachmentArrayDynamicIndexing": 5303,
                     "InputAttachmentArrayDynamicIndexingEXT": 5303,
+                    "UniformTexelBufferArrayDynamicIndexing": 5304,
                     "UniformTexelBufferArrayDynamicIndexingEXT": 5304,
+                    "StorageTexelBufferArrayDynamicIndexing": 5305,
                     "StorageTexelBufferArrayDynamicIndexingEXT": 5305,
+                    "UniformBufferArrayNonUniformIndexing": 5306,
                     "UniformBufferArrayNonUniformIndexingEXT": 5306,
+                    "SampledImageArrayNonUniformIndexing": 5307,
                     "SampledImageArrayNonUniformIndexingEXT": 5307,
+                    "StorageBufferArrayNonUniformIndexing": 5308,
                     "StorageBufferArrayNonUniformIndexingEXT": 5308,
+                    "StorageImageArrayNonUniformIndexing": 5309,
                     "StorageImageArrayNonUniformIndexingEXT": 5309,
+                    "InputAttachmentArrayNonUniformIndexing": 5310,
                     "InputAttachmentArrayNonUniformIndexingEXT": 5310,
+                    "UniformTexelBufferArrayNonUniformIndexing": 5311,
                     "UniformTexelBufferArrayNonUniformIndexingEXT": 5311,
+                    "StorageTexelBufferArrayNonUniformIndexing": 5312,
                     "StorageTexelBufferArrayNonUniformIndexingEXT": 5312,
                     "RayTracingNV": 5340,
+                    "VulkanMemoryModel": 5345,
                     "VulkanMemoryModelKHR": 5345,
+                    "VulkanMemoryModelDeviceScope": 5346,
                     "VulkanMemoryModelDeviceScopeKHR": 5346,
+                    "PhysicalStorageBufferAddresses": 5347,
                     "PhysicalStorageBufferAddressesEXT": 5347,
                     "ComputeDerivativeGroupLinearNV": 5350,
                     "CooperativeMatrixNV": 5357,
diff --git a/include/spirv/unified1/spirv.lua b/include/spirv/unified1/spirv.lua
index 7b474fe..d05a779 100644
--- a/include/spirv/unified1/spirv.lua
+++ b/include/spirv/unified1/spirv.lua
@@ -80,6 +80,7 @@ spv = {
         Logical = 0,
         Physical32 = 1,
         Physical64 = 2,
+        PhysicalStorageBuffer64 = 5348,
         PhysicalStorageBuffer64EXT = 5348,
     },
 
@@ -87,6 +88,7 @@ spv = {
         Simple = 0,
         GLSL450 = 1,
         OpenCL = 2,
+        Vulkan = 3,
         VulkanKHR = 3,
     },
 
@@ -169,6 +171,7 @@ spv = {
         HitAttributeNV = 5339,
         IncomingRayPayloadNV = 5342,
         ShaderRecordBufferNV = 5343,
+        PhysicalStorageBuffer = 5349,
         PhysicalStorageBufferEXT = 5349,
     },
 
@@ -290,9 +293,13 @@ spv = {
         ConstOffsets = 5,
         Sample = 6,
         MinLod = 7,
+        MakeTexelAvailable = 8,
         MakeTexelAvailableKHR = 8,
+        MakeTexelVisible = 9,
         MakeTexelVisibleKHR = 9,
+        NonPrivateTexel = 10,
         NonPrivateTexelKHR = 10,
+        VolatileTexel = 11,
         VolatileTexelKHR = 11,
         SignExtend = 12,
         ZeroExtend = 13,
@@ -308,9 +315,13 @@ spv = {
         ConstOffsets = 0x00000020,
         Sample = 0x00000040,
         MinLod = 0x00000080,
+        MakeTexelAvailable = 0x00000100,
         MakeTexelAvailableKHR = 0x00000100,
+        MakeTexelVisible = 0x00000200,
         MakeTexelVisibleKHR = 0x00000200,
+        NonPrivateTexel = 0x00000400,
         NonPrivateTexelKHR = 0x00000400,
+        VolatileTexel = 0x00000800,
         VolatileTexelKHR = 0x00000800,
         SignExtend = 0x00001000,
         ZeroExtend = 0x00002000,
@@ -421,8 +432,11 @@ spv = {
         PerViewNV = 5272,
         PerTaskNV = 5273,
         PerVertexNV = 5285,
+        NonUniform = 5300,
         NonUniformEXT = 5300,
+        RestrictPointer = 5355,
         RestrictPointerEXT = 5355,
+        AliasedPointer = 5356,
         AliasedPointerEXT = 5356,
         CounterBuffer = 5634,
         HlslCounterBufferGOOGLE = 5634,
@@ -598,8 +612,11 @@ spv = {
         CrossWorkgroupMemory = 9,
         AtomicCounterMemory = 10,
         ImageMemory = 11,
+        OutputMemory = 12,
         OutputMemoryKHR = 12,
+        MakeAvailable = 13,
         MakeAvailableKHR = 13,
+        MakeVisible = 14,
         MakeVisibleKHR = 14,
         Volatile = 15,
     },
@@ -616,8 +633,11 @@ spv = {
         CrossWorkgroupMemory = 0x00000200,
         AtomicCounterMemory = 0x00000400,
         ImageMemory = 0x00000800,
+        OutputMemory = 0x00001000,
         OutputMemoryKHR = 0x00001000,
+        MakeAvailable = 0x00002000,
         MakeAvailableKHR = 0x00002000,
+        MakeVisible = 0x00004000,
         MakeVisibleKHR = 0x00004000,
         Volatile = 0x00008000,
     },
@@ -626,8 +646,11 @@ spv = {
         Volatile = 0,
         Aligned = 1,
         Nontemporal = 2,
+        MakePointerAvailable = 3,
         MakePointerAvailableKHR = 3,
+        MakePointerVisible = 4,
         MakePointerVisibleKHR = 4,
+        NonPrivatePointer = 5,
         NonPrivatePointerKHR = 5,
     },
 
@@ -636,8 +659,11 @@ spv = {
         Volatile = 0x00000001,
         Aligned = 0x00000002,
         Nontemporal = 0x00000004,
+        MakePointerAvailable = 0x00000008,
         MakePointerAvailableKHR = 0x00000008,
+        MakePointerVisible = 0x00000010,
         MakePointerVisibleKHR = 0x00000010,
+        NonPrivatePointer = 0x00000020,
         NonPrivatePointerKHR = 0x00000020,
     },
 
@@ -647,6 +673,7 @@ spv = {
         Workgroup = 2,
         Subgroup = 3,
         Invocation = 4,
+        QueueFamily = 5,
         QueueFamilyKHR = 5,
     },
 
@@ -743,6 +770,8 @@ spv = {
         GroupNonUniformShuffleRelative = 66,
         GroupNonUniformClustered = 67,
         GroupNonUniformQuad = 68,
+        ShaderLayer = 69,
+        ShaderViewportIndex = 70,
         SubgroupBallotKHR = 4423,
         DrawParameters = 4427,
         SubgroupVoteKHR = 4431,
@@ -787,21 +816,36 @@ spv = {
         FragmentDensityEXT = 5291,
         ShadingRateNV = 5291,
         GroupNonUniformPartitionedNV = 5297,
+        ShaderNonUniform = 5301,
         ShaderNonUniformEXT = 5301,
+        RuntimeDescriptorArray = 5302,
         RuntimeDescriptorArrayEXT = 5302,
+        InputAttachmentArrayDynamicIndexing = 5303,
         InputAttachmentArrayDynamicIndexingEXT = 5303,
+        UniformTexelBufferArrayDynamicIndexing = 5304,
         UniformTexelBufferArrayDynamicIndexingEXT = 5304,
+        StorageTexelBufferArrayDynamicIndexing = 5305,
         StorageTexelBufferArrayDynamicIndexingEXT = 5305,
+        UniformBufferArrayNonUniformIndexing = 5306,
         UniformBufferArrayNonUniformIndexingEXT = 5306,
+        SampledImageArrayNonUniformIndexing = 5307,
         SampledImageArrayNonUniformIndexingEXT = 5307,
+        StorageBufferArrayNonUniformIndexing = 5308,
         StorageBufferArrayNonUniformIndexingEXT = 5308,
+        StorageImageArrayNonUniformIndexing = 5309,
         StorageImageArrayNonUniformIndexingEXT = 5309,
+        InputAttachmentArrayNonUniformIndexing = 5310,
         InputAttachmentArrayNonUniformIndexingEXT = 5310,
+        UniformTexelBufferArrayNonUniformIndexing = 5311,
         UniformTexelBufferArrayNonUniformIndexingEXT = 5311,
+        StorageTexelBufferArrayNonUniformIndexing = 5312,
         StorageTexelBufferArrayNonUniformIndexingEXT = 5312,
         RayTracingNV = 5340,
+        VulkanMemoryModel = 5345,
         VulkanMemoryModelKHR = 5345,
+        VulkanMemoryModelDeviceScope = 5346,
         VulkanMemoryModelDeviceScopeKHR = 5346,
+        PhysicalStorageBufferAddresses = 5347,
         PhysicalStorageBufferAddressesEXT = 5347,
         ComputeDerivativeGroupLinearNV = 5350,
         CooperativeMatrixNV = 5357,
diff --git a/include/spirv/unified1/spirv.py b/include/spirv/unified1/spirv.py
index 6e2867b..e669fdf 100644
--- a/include/spirv/unified1/spirv.py
+++ b/include/spirv/unified1/spirv.py
@@ -80,6 +80,7 @@ spv = {
         'Logical' : 0,
         'Physical32' : 1,
         'Physical64' : 2,
+        'PhysicalStorageBuffer64' : 5348,
         'PhysicalStorageBuffer64EXT' : 5348,
     },
 
@@ -87,6 +88,7 @@ spv = {
         'Simple' : 0,
         'GLSL450' : 1,
         'OpenCL' : 2,
+        'Vulkan' : 3,
         'VulkanKHR' : 3,
     },
 
@@ -169,6 +171,7 @@ spv = {
         'HitAttributeNV' : 5339,
         'IncomingRayPayloadNV' : 5342,
         'ShaderRecordBufferNV' : 5343,
+        'PhysicalStorageBuffer' : 5349,
         'PhysicalStorageBufferEXT' : 5349,
     },
 
@@ -290,9 +293,13 @@ spv = {
         'ConstOffsets' : 5,
         'Sample' : 6,
         'MinLod' : 7,
+        'MakeTexelAvailable' : 8,
         'MakeTexelAvailableKHR' : 8,
+        'MakeTexelVisible' : 9,
         'MakeTexelVisibleKHR' : 9,
+        'NonPrivateTexel' : 10,
         'NonPrivateTexelKHR' : 10,
+        'VolatileTexel' : 11,
         'VolatileTexelKHR' : 11,
         'SignExtend' : 12,
         'ZeroExtend' : 13,
@@ -308,9 +315,13 @@ spv = {
         'ConstOffsets' : 0x00000020,
         'Sample' : 0x00000040,
         'MinLod' : 0x00000080,
+        'MakeTexelAvailable' : 0x00000100,
         'MakeTexelAvailableKHR' : 0x00000100,
+        'MakeTexelVisible' : 0x00000200,
         'MakeTexelVisibleKHR' : 0x00000200,
+        'NonPrivateTexel' : 0x00000400,
         'NonPrivateTexelKHR' : 0x00000400,
+        'VolatileTexel' : 0x00000800,
         'VolatileTexelKHR' : 0x00000800,
         'SignExtend' : 0x00001000,
         'ZeroExtend' : 0x00002000,
@@ -421,8 +432,11 @@ spv = {
         'PerViewNV' : 5272,
         'PerTaskNV' : 5273,
         'PerVertexNV' : 5285,
+        'NonUniform' : 5300,
         'NonUniformEXT' : 5300,
+        'RestrictPointer' : 5355,
         'RestrictPointerEXT' : 5355,
+        'AliasedPointer' : 5356,
         'AliasedPointerEXT' : 5356,
         'CounterBuffer' : 5634,
         'HlslCounterBufferGOOGLE' : 5634,
@@ -598,8 +612,11 @@ spv = {
         'CrossWorkgroupMemory' : 9,
         'AtomicCounterMemory' : 10,
         'ImageMemory' : 11,
+        'OutputMemory' : 12,
         'OutputMemoryKHR' : 12,
+        'MakeAvailable' : 13,
         'MakeAvailableKHR' : 13,
+        'MakeVisible' : 14,
         'MakeVisibleKHR' : 14,
         'Volatile' : 15,
     },
@@ -616,8 +633,11 @@ spv = {
         'CrossWorkgroupMemory' : 0x00000200,
         'AtomicCounterMemory' : 0x00000400,
         'ImageMemory' : 0x00000800,
+        'OutputMemory' : 0x00001000,
         'OutputMemoryKHR' : 0x00001000,
+        'MakeAvailable' : 0x00002000,
         'MakeAvailableKHR' : 0x00002000,
+        'MakeVisible' : 0x00004000,
         'MakeVisibleKHR' : 0x00004000,
         'Volatile' : 0x00008000,
     },
@@ -626,8 +646,11 @@ spv = {
         'Volatile' : 0,
         'Aligned' : 1,
         'Nontemporal' : 2,
+        'MakePointerAvailable' : 3,
         'MakePointerAvailableKHR' : 3,
+        'MakePointerVisible' : 4,
         'MakePointerVisibleKHR' : 4,
+        'NonPrivatePointer' : 5,
         'NonPrivatePointerKHR' : 5,
     },
 
@@ -636,8 +659,11 @@ spv = {
         'Volatile' : 0x00000001,
         'Aligned' : 0x00000002,
         'Nontemporal' : 0x00000004,
+        'MakePointerAvailable' : 0x00000008,
         'MakePointerAvailableKHR' : 0x00000008,
+        'MakePointerVisible' : 0x00000010,
         'MakePointerVisibleKHR' : 0x00000010,
+        'NonPrivatePointer' : 0x00000020,
         'NonPrivatePointerKHR' : 0x00000020,
     },
 
@@ -647,6 +673,7 @@ spv = {
         'Workgroup' : 2,
         'Subgroup' : 3,
         'Invocation' : 4,
+        'QueueFamily' : 5,
         'QueueFamilyKHR' : 5,
     },
 
@@ -743,6 +770,8 @@ spv = {
         'GroupNonUniformShuffleRelative' : 66,
         'GroupNonUniformClustered' : 67,
         'GroupNonUniformQuad' : 68,
+        'ShaderLayer' : 69,
+        'ShaderViewportIndex' : 70,
         'SubgroupBallotKHR' : 4423,
         'DrawParameters' : 4427,
         'SubgroupVoteKHR' : 4431,
@@ -787,21 +816,36 @@ spv = {
         'FragmentDensityEXT' : 5291,
         'ShadingRateNV' : 5291,
         'GroupNonUniformPartitionedNV' : 5297,
+        'ShaderNonUniform' : 5301,
         'ShaderNonUniformEXT' : 5301,
+        'RuntimeDescriptorArray' : 5302,
         'RuntimeDescriptorArrayEXT' : 5302,
+        'InputAttachmentArrayDynamicIndexing' : 5303,
         'InputAttachmentArrayDynamicIndexingEXT' : 5303,
+        'UniformTexelBufferArrayDynamicIndexing' : 5304,
         'UniformTexelBufferArrayDynamicIndexingEXT' : 5304,
+        'StorageTexelBufferArrayDynamicIndexing' : 5305,
         'StorageTexelBufferArrayDynamicIndexingEXT' : 5305,
+        'UniformBufferArrayNonUniformIndexing' : 5306,
         'UniformBufferArrayNonUniformIndexingEXT' : 5306,
+        'SampledImageArrayNonUniformIndexing' : 5307,
         'SampledImageArrayNonUniformIndexingEXT' : 5307,
+        'StorageBufferArrayNonUniformIndexing' : 5308,
         'StorageBufferArrayNonUniformIndexingEXT' : 5308,
+        'StorageImageArrayNonUniformIndexing' : 5309,
         'StorageImageArrayNonUniformIndexingEXT' : 5309,
+        'InputAttachmentArrayNonUniformIndexing' : 5310,
         'InputAttachmentArrayNonUniformIndexingEXT' : 5310,
+        'UniformTexelBufferArrayNonUniformIndexing' : 5311,
         'UniformTexelBufferArrayNonUniformIndexingEXT' : 5311,
+        'StorageTexelBufferArrayNonUniformIndexing' : 5312,
         'StorageTexelBufferArrayNonUniformIndexingEXT' : 5312,
         'RayTracingNV' : 5340,
+        'VulkanMemoryModel' : 5345,
         'VulkanMemoryModelKHR' : 5345,
+        'VulkanMemoryModelDeviceScope' : 5346,
         'VulkanMemoryModelDeviceScopeKHR' : 5346,
+        'PhysicalStorageBufferAddresses' : 5347,
         'PhysicalStorageBufferAddressesEXT' : 5347,
         'ComputeDerivativeGroupLinearNV' : 5350,
         'CooperativeMatrixNV' : 5357,
diff --git a/include/spirv/unified1/spv.d b/include/spirv/unified1/spv.d
index 138b5f0..145c8b3 100644
--- a/include/spirv/unified1/spv.d
+++ b/include/spirv/unified1/spv.d
@@ -90,6 +90,7 @@ enum AddressingModel : uint
     Logical = 0,
     Physical32 = 1,
     Physical64 = 2,
+    PhysicalStorageBuffer64 = 5348,
     PhysicalStorageBuffer64EXT = 5348,
 }
 
@@ -98,6 +99,7 @@ enum MemoryModel : uint
     Simple = 0,
     GLSL450 = 1,
     OpenCL = 2,
+    Vulkan = 3,
     VulkanKHR = 3,
 }
 
@@ -182,6 +184,7 @@ enum StorageClass : uint
     HitAttributeNV = 5339,
     IncomingRayPayloadNV = 5342,
     ShaderRecordBufferNV = 5343,
+    PhysicalStorageBuffer = 5349,
     PhysicalStorageBufferEXT = 5349,
 }
 
@@ -310,9 +313,13 @@ enum ImageOperandsShift : uint
     ConstOffsets = 5,
     Sample = 6,
     MinLod = 7,
+    MakeTexelAvailable = 8,
     MakeTexelAvailableKHR = 8,
+    MakeTexelVisible = 9,
     MakeTexelVisibleKHR = 9,
+    NonPrivateTexel = 10,
     NonPrivateTexelKHR = 10,
+    VolatileTexel = 11,
     VolatileTexelKHR = 11,
     SignExtend = 12,
     ZeroExtend = 13,
@@ -329,9 +336,13 @@ enum ImageOperandsMask : uint
     ConstOffsets = 0x00000020,
     Sample = 0x00000040,
     MinLod = 0x00000080,
+    MakeTexelAvailable = 0x00000100,
     MakeTexelAvailableKHR = 0x00000100,
+    MakeTexelVisible = 0x00000200,
     MakeTexelVisibleKHR = 0x00000200,
+    NonPrivateTexel = 0x00000400,
     NonPrivateTexelKHR = 0x00000400,
+    VolatileTexel = 0x00000800,
     VolatileTexelKHR = 0x00000800,
     SignExtend = 0x00001000,
     ZeroExtend = 0x00002000,
@@ -449,8 +460,11 @@ enum Decoration : uint
     PerViewNV = 5272,
     PerTaskNV = 5273,
     PerVertexNV = 5285,
+    NonUniform = 5300,
     NonUniformEXT = 5300,
+    RestrictPointer = 5355,
     RestrictPointerEXT = 5355,
+    AliasedPointer = 5356,
     AliasedPointerEXT = 5356,
     CounterBuffer = 5634,
     HlslCounterBufferGOOGLE = 5634,
@@ -634,8 +648,11 @@ enum MemorySemanticsShift : uint
     CrossWorkgroupMemory = 9,
     AtomicCounterMemory = 10,
     ImageMemory = 11,
+    OutputMemory = 12,
     OutputMemoryKHR = 12,
+    MakeAvailable = 13,
     MakeAvailableKHR = 13,
+    MakeVisible = 14,
     MakeVisibleKHR = 14,
     Volatile = 15,
 }
@@ -653,8 +670,11 @@ enum MemorySemanticsMask : uint
     CrossWorkgroupMemory = 0x00000200,
     AtomicCounterMemory = 0x00000400,
     ImageMemory = 0x00000800,
+    OutputMemory = 0x00001000,
     OutputMemoryKHR = 0x00001000,
+    MakeAvailable = 0x00002000,
     MakeAvailableKHR = 0x00002000,
+    MakeVisible = 0x00004000,
     MakeVisibleKHR = 0x00004000,
     Volatile = 0x00008000,
 }
@@ -664,8 +684,11 @@ enum MemoryAccessShift : uint
     Volatile = 0,
     Aligned = 1,
     Nontemporal = 2,
+    MakePointerAvailable = 3,
     MakePointerAvailableKHR = 3,
+    MakePointerVisible = 4,
     MakePointerVisibleKHR = 4,
+    NonPrivatePointer = 5,
     NonPrivatePointerKHR = 5,
 }
 
@@ -675,8 +698,11 @@ enum MemoryAccessMask : uint
     Volatile = 0x00000001,
     Aligned = 0x00000002,
     Nontemporal = 0x00000004,
+    MakePointerAvailable = 0x00000008,
     MakePointerAvailableKHR = 0x00000008,
+    MakePointerVisible = 0x00000010,
     MakePointerVisibleKHR = 0x00000010,
+    NonPrivatePointer = 0x00000020,
     NonPrivatePointerKHR = 0x00000020,
 }
 
@@ -687,6 +713,7 @@ enum Scope : uint
     Workgroup = 2,
     Subgroup = 3,
     Invocation = 4,
+    QueueFamily = 5,
     QueueFamilyKHR = 5,
 }
 
@@ -788,6 +815,8 @@ enum Capability : uint
     GroupNonUniformShuffleRelative = 66,
     GroupNonUniformClustered = 67,
     GroupNonUniformQuad = 68,
+    ShaderLayer = 69,
+    ShaderViewportIndex = 70,
     SubgroupBallotKHR = 4423,
     DrawParameters = 4427,
     SubgroupVoteKHR = 4431,
@@ -832,21 +861,36 @@ enum Capability : uint
     FragmentDensityEXT = 5291,
     ShadingRateNV = 5291,
     GroupNonUniformPartitionedNV = 5297,
+    ShaderNonUniform = 5301,
     ShaderNonUniformEXT = 5301,
+    RuntimeDescriptorArray = 5302,
     RuntimeDescriptorArrayEXT = 5302,
+    InputAttachmentArrayDynamicIndexing = 5303,
     InputAttachmentArrayDynamicIndexingEXT = 5303,
+    UniformTexelBufferArrayDynamicIndexing = 5304,
     UniformTexelBufferArrayDynamicIndexingEXT = 5304,
+    StorageTexelBufferArrayDynamicIndexing = 5305,
     StorageTexelBufferArrayDynamicIndexingEXT = 5305,
+    UniformBufferArrayNonUniformIndexing = 5306,
     UniformBufferArrayNonUniformIndexingEXT = 5306,
+    SampledImageArrayNonUniformIndexing = 5307,
     SampledImageArrayNonUniformIndexingEXT = 5307,
+    StorageBufferArrayNonUniformIndexing = 5308,
     StorageBufferArrayNonUniformIndexingEXT = 5308,
+    StorageImageArrayNonUniformIndexing = 5309,
     StorageImageArrayNonUniformIndexingEXT = 5309,
+    InputAttachmentArrayNonUniformIndexing = 5310,
     InputAttachmentArrayNonUniformIndexingEXT = 5310,
+    UniformTexelBufferArrayNonUniformIndexing = 5311,
     UniformTexelBufferArrayNonUniformIndexingEXT = 5311,
+    StorageTexelBufferArrayNonUniformIndexing = 5312,
     StorageTexelBufferArrayNonUniformIndexingEXT = 5312,
     RayTracingNV = 5340,
+    VulkanMemoryModel = 5345,
     VulkanMemoryModelKHR = 5345,
+    VulkanMemoryModelDeviceScope = 5346,
     VulkanMemoryModelDeviceScopeKHR = 5346,
+    PhysicalStorageBufferAddresses = 5347,
     PhysicalStorageBufferAddressesEXT = 5347,
     ComputeDerivativeGroupLinearNV = 5350,
     CooperativeMatrixNV = 5357,