diff --git a/0001-Add-SPV_KHR_workgroup_memory_explicit_layout.patch b/0001-Add-SPV_KHR_workgroup_memory_explicit_layout.patch deleted file mode 100644 index abd1b1e..0000000 --- a/0001-Add-SPV_KHR_workgroup_memory_explicit_layout.patch +++ /dev/null @@ -1,164 +0,0 @@ -From 38fe9b08508c876ba830f250a488c51003531e7e Mon Sep 17 00:00:00 2001 -From: Caio Marcelo de Oliveira Filho -Date: Mon, 25 Jan 2021 05:57:46 -0800 -Subject: [PATCH] Add SPV_KHR_workgroup_memory_explicit_layout - ---- - .../spirv/unified1/spirv.core.grammar.json | 21 +++++++++++++++++++ - include/spirv/unified1/spirv.cs | 3 +++ - include/spirv/unified1/spirv.h | 3 +++ - include/spirv/unified1/spirv.hpp | 3 +++ - include/spirv/unified1/spirv.hpp11 | 3 +++ - include/spirv/unified1/spirv.json | 3 +++ - include/spirv/unified1/spirv.lua | 3 +++ - include/spirv/unified1/spirv.py | 3 +++ - include/spirv/unified1/spv.d | 3 +++ - 9 files changed, 45 insertions(+) - -diff --git include/spirv/unified1/spirv.core.grammar.json include/spirv/unified1/spirv.core.grammar.json -index 265c155..514965e 100644 ---- include/spirv/unified1/spirv.core.grammar.json -+++ include/spirv/unified1/spirv.core.grammar.json -@@ -11410,6 +11410,27 @@ - "extensions" : [ "SPV_KHR_shader_draw_parameters" ], - "version" : "1.3" - }, -+ { -+ "enumerant" : "WorkgroupMemoryExplicitLayoutKHR", -+ "value" : 4428, -+ "capabilities" : [ "Shader" ], -+ "extensions" : [ "SPV_KHR_workgroup_memory_explicit_layout" ], -+ "version" : "None" -+ }, -+ { -+ "enumerant" : "WorkgroupMemoryExplicitLayout8BitAccessKHR", -+ "value" : 4429, -+ "capabilities" : [ "WorkgroupMemoryExplicitLayoutKHR" ], -+ "extensions" : [ "SPV_KHR_workgroup_memory_explicit_layout" ], -+ "version" : "None" -+ }, -+ { -+ "enumerant" : "WorkgroupMemoryExplicitLayout16BitAccessKHR", -+ "value" : 4430, -+ "capabilities" : [ "Shader" ], -+ "extensions" : [ "SPV_KHR_workgroup_memory_explicit_layout" ], -+ "version" : "None" -+ }, - { - "enumerant" : "SubgroupVoteKHR", - "value" : 4431, -diff --git include/spirv/unified1/spirv.cs include/spirv/unified1/spirv.cs -index 7c40d14..3a07e52 100644 ---- include/spirv/unified1/spirv.cs -+++ include/spirv/unified1/spirv.cs -@@ -915,6 +915,9 @@ namespace Spv - FragmentShadingRateKHR = 4422, - SubgroupBallotKHR = 4423, - DrawParameters = 4427, -+ WorkgroupMemoryExplicitLayoutKHR = 4428, -+ WorkgroupMemoryExplicitLayout8BitAccessKHR = 4429, -+ WorkgroupMemoryExplicitLayout16BitAccessKHR = 4430, - SubgroupVoteKHR = 4431, - StorageBuffer16BitAccess = 4433, - StorageUniformBufferBlock16 = 4433, -diff --git include/spirv/unified1/spirv.h include/spirv/unified1/spirv.h -index c9f603b..41a650b 100644 ---- include/spirv/unified1/spirv.h -+++ include/spirv/unified1/spirv.h -@@ -915,6 +915,9 @@ typedef enum SpvCapability_ { - SpvCapabilityFragmentShadingRateKHR = 4422, - SpvCapabilitySubgroupBallotKHR = 4423, - SpvCapabilityDrawParameters = 4427, -+ SpvCapabilityWorkgroupMemoryExplicitLayoutKHR = 4428, -+ SpvCapabilityWorkgroupMemoryExplicitLayout8BitAccessKHR = 4429, -+ SpvCapabilityWorkgroupMemoryExplicitLayout16BitAccessKHR = 4430, - SpvCapabilitySubgroupVoteKHR = 4431, - SpvCapabilityStorageBuffer16BitAccess = 4433, - SpvCapabilityStorageUniformBufferBlock16 = 4433, -diff --git include/spirv/unified1/spirv.hpp include/spirv/unified1/spirv.hpp -index ebcef89..af629ef 100644 ---- include/spirv/unified1/spirv.hpp -+++ include/spirv/unified1/spirv.hpp -@@ -911,6 +911,9 @@ enum Capability { - CapabilityFragmentShadingRateKHR = 4422, - CapabilitySubgroupBallotKHR = 4423, - CapabilityDrawParameters = 4427, -+ CapabilityWorkgroupMemoryExplicitLayoutKHR = 4428, -+ CapabilityWorkgroupMemoryExplicitLayout8BitAccessKHR = 4429, -+ CapabilityWorkgroupMemoryExplicitLayout16BitAccessKHR = 4430, - CapabilitySubgroupVoteKHR = 4431, - CapabilityStorageBuffer16BitAccess = 4433, - CapabilityStorageUniformBufferBlock16 = 4433, -diff --git include/spirv/unified1/spirv.hpp11 include/spirv/unified1/spirv.hpp11 -index bdeee38..58f3bf3 100644 ---- include/spirv/unified1/spirv.hpp11 -+++ include/spirv/unified1/spirv.hpp11 -@@ -911,6 +911,9 @@ enum class Capability : unsigned { - FragmentShadingRateKHR = 4422, - SubgroupBallotKHR = 4423, - DrawParameters = 4427, -+ WorkgroupMemoryExplicitLayoutKHR = 4428, -+ WorkgroupMemoryExplicitLayout8BitAccessKHR = 4429, -+ WorkgroupMemoryExplicitLayout16BitAccessKHR = 4430, - SubgroupVoteKHR = 4431, - StorageBuffer16BitAccess = 4433, - StorageUniformBufferBlock16 = 4433, -diff --git include/spirv/unified1/spirv.json include/spirv/unified1/spirv.json -index 4e10b28..d1a56dd 100644 ---- include/spirv/unified1/spirv.json -+++ include/spirv/unified1/spirv.json -@@ -898,6 +898,9 @@ - "FragmentShadingRateKHR": 4422, - "SubgroupBallotKHR": 4423, - "DrawParameters": 4427, -+ "WorkgroupMemoryExplicitLayoutKHR": 4428, -+ "WorkgroupMemoryExplicitLayout8BitAccessKHR": 4429, -+ "WorkgroupMemoryExplicitLayout16BitAccessKHR": 4430, - "SubgroupVoteKHR": 4431, - "StorageBuffer16BitAccess": 4433, - "StorageUniformBufferBlock16": 4433, -diff --git include/spirv/unified1/spirv.lua include/spirv/unified1/spirv.lua -index 8ae3970..3193ff7 100644 ---- include/spirv/unified1/spirv.lua -+++ include/spirv/unified1/spirv.lua -@@ -873,6 +873,9 @@ spv = { - FragmentShadingRateKHR = 4422, - SubgroupBallotKHR = 4423, - DrawParameters = 4427, -+ WorkgroupMemoryExplicitLayoutKHR = 4428, -+ WorkgroupMemoryExplicitLayout8BitAccessKHR = 4429, -+ WorkgroupMemoryExplicitLayout16BitAccessKHR = 4430, - SubgroupVoteKHR = 4431, - StorageBuffer16BitAccess = 4433, - StorageUniformBufferBlock16 = 4433, -diff --git include/spirv/unified1/spirv.py include/spirv/unified1/spirv.py -index 3470d4e..46d7182 100644 ---- include/spirv/unified1/spirv.py -+++ include/spirv/unified1/spirv.py -@@ -873,6 +873,9 @@ spv = { - 'FragmentShadingRateKHR' : 4422, - 'SubgroupBallotKHR' : 4423, - 'DrawParameters' : 4427, -+ 'WorkgroupMemoryExplicitLayoutKHR' : 4428, -+ 'WorkgroupMemoryExplicitLayout8BitAccessKHR' : 4429, -+ 'WorkgroupMemoryExplicitLayout16BitAccessKHR' : 4430, - 'SubgroupVoteKHR' : 4431, - 'StorageBuffer16BitAccess' : 4433, - 'StorageUniformBufferBlock16' : 4433, -diff --git include/spirv/unified1/spv.d include/spirv/unified1/spv.d -index f4023d4..5d09343 100644 ---- include/spirv/unified1/spv.d -+++ include/spirv/unified1/spv.d -@@ -918,6 +918,9 @@ enum Capability : uint - FragmentShadingRateKHR = 4422, - SubgroupBallotKHR = 4423, - DrawParameters = 4427, -+ WorkgroupMemoryExplicitLayoutKHR = 4428, -+ WorkgroupMemoryExplicitLayout8BitAccessKHR = 4429, -+ WorkgroupMemoryExplicitLayout16BitAccessKHR = 4430, - SubgroupVoteKHR = 4431, - StorageBuffer16BitAccess = 4433, - StorageUniformBufferBlock16 = 4433, --- -2.30.0 - diff --git a/spirv-headers.changes b/spirv-headers.changes index bf8bb77..d80a0a1 100644 --- a/spirv-headers.changes +++ b/spirv-headers.changes @@ -5,7 +5,7 @@ Mon Mar 1 06:46:29 UTC 2021 - Jan Engelhardt * Add SPV_KHR_workgroup_memory_explicit_layout * Add None as a possible value for DebugInfoFlags * Add header changes for SPV_EXT_shader_atomic_float_min_max -- Add 0001-Add-SPV_KHR_workgroup_memory_explicit_layout.patch +- Remove 0001-Add-SPV_KHR_workgroup_memory_explicit_layout.patch ------------------------------------------------------------------- Wed Feb 10 15:01:14 UTC 2021 - Jan Engelhardt