From 3c9c4fd8728e28b4bb58cf60fffa61e1da5783097ce74b2edaf4c7db9bbbb89c Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 10 Feb 2021 14:16:55 +0000 Subject: [PATCH 1/6] - Update to 1.5.4.g39 (3fdabd0d) OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/spirv-headers?expand=0&rev=52 --- SPIRV-Headers-1.5.4.g39.tar.xz | 3 +++ SPIRV-Headers-1.5.4.g8.tar.xz | 3 --- _service | 2 +- spirv-headers.changes | 6 ++++++ spirv-headers.spec | 4 ++-- 5 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 SPIRV-Headers-1.5.4.g39.tar.xz delete mode 100644 SPIRV-Headers-1.5.4.g8.tar.xz diff --git a/SPIRV-Headers-1.5.4.g39.tar.xz b/SPIRV-Headers-1.5.4.g39.tar.xz new file mode 100644 index 0000000..0b7b2a5 --- /dev/null +++ b/SPIRV-Headers-1.5.4.g39.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:32d6b35b1ad1f5fe65ce5532cbe36a2aff94a1155f50d2fff0c92c0cab5f7ed2 +size 138564 diff --git a/SPIRV-Headers-1.5.4.g8.tar.xz b/SPIRV-Headers-1.5.4.g8.tar.xz deleted file mode 100644 index 7166fdb..0000000 --- a/SPIRV-Headers-1.5.4.g8.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:628f5d0ee80905b6ea92d1268a1788b8d418ad5bc73b28e94fc5515601ac78c8 -size 134076 diff --git a/_service b/_service index 206335c..0542845 100644 --- a/_service +++ b/_service @@ -2,7 +2,7 @@ git https://github.com/KhronosGroup/SPIRV-Headers - 104ecc356c1bea4476320faca64440cd1df655a3 + 3fdabd0da2932c276b25b9b4a988ba134eba1aa6 1.5.4 1.5.4.g@TAG_OFFSET@ diff --git a/spirv-headers.changes b/spirv-headers.changes index cb55999..08de9b3 100644 --- a/spirv-headers.changes +++ b/spirv-headers.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 10 14:15:26 UTC 2021 - Jan Engelhardt + +- Update to 1.5.4.g39 (3fdabd0d) + * Add SPV_KHR_workgroup_memory_explicit_layout + ------------------------------------------------------------------- Wed Nov 25 17:08:48 UTC 2020 - Jan Engelhardt diff --git a/spirv-headers.spec b/spirv-headers.spec index 77c56bc..2457516 100644 --- a/spirv-headers.spec +++ b/spirv-headers.spec @@ -1,7 +1,7 @@ # # spec file for package spirv-headers # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: spirv-headers -Version: 1.5.4.g8 +Version: 1.5.4.g39 Release: 0 Summary: Machine-readable files from the SPIR-V registry License: MIT From 44ca491bd2b0a426954f2dbf40df6d81b4d7ccccd33083d098515822cdee478f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 10 Feb 2021 14:54:14 +0000 Subject: [PATCH 2/6] - Switch to 1.5.4.g37 (2e335d5f) OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/spirv-headers?expand=0&rev=53 --- SPIRV-Headers-1.5.4.g37.tar.xz | 3 +++ SPIRV-Headers-1.5.4.g39.tar.xz | 3 --- _service | 2 +- spirv-headers.changes | 2 +- spirv-headers.spec | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 SPIRV-Headers-1.5.4.g37.tar.xz delete mode 100644 SPIRV-Headers-1.5.4.g39.tar.xz diff --git a/SPIRV-Headers-1.5.4.g37.tar.xz b/SPIRV-Headers-1.5.4.g37.tar.xz new file mode 100644 index 0000000..eb39390 --- /dev/null +++ b/SPIRV-Headers-1.5.4.g37.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:92bca9ef969a50ea789307cf97f23d7a3435d363941969d5e4ca66674985dfac +size 138512 diff --git a/SPIRV-Headers-1.5.4.g39.tar.xz b/SPIRV-Headers-1.5.4.g39.tar.xz deleted file mode 100644 index 0b7b2a5..0000000 --- a/SPIRV-Headers-1.5.4.g39.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:32d6b35b1ad1f5fe65ce5532cbe36a2aff94a1155f50d2fff0c92c0cab5f7ed2 -size 138564 diff --git a/_service b/_service index 0542845..4089b93 100644 --- a/_service +++ b/_service @@ -2,7 +2,7 @@ git https://github.com/KhronosGroup/SPIRV-Headers - 3fdabd0da2932c276b25b9b4a988ba134eba1aa6 + 2e335d5fbf882756b106e0497d8f109930766461 1.5.4 1.5.4.g@TAG_OFFSET@ diff --git a/spirv-headers.changes b/spirv-headers.changes index 08de9b3..563e720 100644 --- a/spirv-headers.changes +++ b/spirv-headers.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Wed Feb 10 14:15:26 UTC 2021 - Jan Engelhardt -- Update to 1.5.4.g39 (3fdabd0d) +- Update to 1.5.4.g37 (2e335d5f) * Add SPV_KHR_workgroup_memory_explicit_layout ------------------------------------------------------------------- diff --git a/spirv-headers.spec b/spirv-headers.spec index 2457516..651f3d6 100644 --- a/spirv-headers.spec +++ b/spirv-headers.spec @@ -17,7 +17,7 @@ Name: spirv-headers -Version: 1.5.4.g39 +Version: 1.5.4.g37 Release: 0 Summary: Machine-readable files from the SPIR-V registry License: MIT From 41e6e8693614a4237f2496b000489b32217859bb955916f90df2ae90339ca076 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 10 Feb 2021 15:26:27 +0000 Subject: [PATCH 3/6] - Add 0001-Add-SPV_KHR_workgroup_memory_explicit_layout.patch OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/spirv-headers?expand=0&rev=54 --- ...KHR_workgroup_memory_explicit_layout.patch | 164 ++++++++++++++++++ SPIRV-Headers-1.5.4.g37.tar.xz | 3 - SPIRV-Headers-1.5.4.g8.tar.xz | 3 + _service | 2 +- spirv-headers.changes | 5 +- spirv-headers.spec | 2 +- 6 files changed, 171 insertions(+), 8 deletions(-) create mode 100644 0001-Add-SPV_KHR_workgroup_memory_explicit_layout.patch delete mode 100644 SPIRV-Headers-1.5.4.g37.tar.xz create mode 100644 SPIRV-Headers-1.5.4.g8.tar.xz diff --git a/0001-Add-SPV_KHR_workgroup_memory_explicit_layout.patch b/0001-Add-SPV_KHR_workgroup_memory_explicit_layout.patch new file mode 100644 index 0000000..abd1b1e --- /dev/null +++ b/0001-Add-SPV_KHR_workgroup_memory_explicit_layout.patch @@ -0,0 +1,164 @@ +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-1.5.4.g37.tar.xz b/SPIRV-Headers-1.5.4.g37.tar.xz deleted file mode 100644 index eb39390..0000000 --- a/SPIRV-Headers-1.5.4.g37.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:92bca9ef969a50ea789307cf97f23d7a3435d363941969d5e4ca66674985dfac -size 138512 diff --git a/SPIRV-Headers-1.5.4.g8.tar.xz b/SPIRV-Headers-1.5.4.g8.tar.xz new file mode 100644 index 0000000..7166fdb --- /dev/null +++ b/SPIRV-Headers-1.5.4.g8.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:628f5d0ee80905b6ea92d1268a1788b8d418ad5bc73b28e94fc5515601ac78c8 +size 134076 diff --git a/_service b/_service index 4089b93..206335c 100644 --- a/_service +++ b/_service @@ -2,7 +2,7 @@ git https://github.com/KhronosGroup/SPIRV-Headers - 2e335d5fbf882756b106e0497d8f109930766461 + 104ecc356c1bea4476320faca64440cd1df655a3 1.5.4 1.5.4.g@TAG_OFFSET@ diff --git a/spirv-headers.changes b/spirv-headers.changes index 563e720..ec35fb9 100644 --- a/spirv-headers.changes +++ b/spirv-headers.changes @@ -1,8 +1,7 @@ ------------------------------------------------------------------- -Wed Feb 10 14:15:26 UTC 2021 - Jan Engelhardt +Wed Feb 10 15:01:14 UTC 2021 - Jan Engelhardt -- Update to 1.5.4.g37 (2e335d5f) - * Add SPV_KHR_workgroup_memory_explicit_layout +- Add 0001-Add-SPV_KHR_workgroup_memory_explicit_layout.patch ------------------------------------------------------------------- Wed Nov 25 17:08:48 UTC 2020 - Jan Engelhardt diff --git a/spirv-headers.spec b/spirv-headers.spec index 651f3d6..7df681e 100644 --- a/spirv-headers.spec +++ b/spirv-headers.spec @@ -17,7 +17,7 @@ Name: spirv-headers -Version: 1.5.4.g37 +Version: 1.5.4.g8 Release: 0 Summary: Machine-readable files from the SPIR-V registry License: MIT From 1d7d92ba50bc8888266c46d1b08fe03588f0c53a25a70a3117d1657cbf0863f0 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 1 Mar 2021 06:51:56 +0000 Subject: [PATCH 4/6] - Update to 1.5.4.g42 (a3fdfe8146) OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/spirv-headers?expand=0&rev=55 --- SPIRV-Headers-1.5.4.g42.tar.xz | 3 +++ SPIRV-Headers-1.5.4.g8.tar.xz | 3 --- _service | 2 +- spirv-headers.changes | 8 ++++++++ spirv-headers.spec | 2 +- 5 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 SPIRV-Headers-1.5.4.g42.tar.xz delete mode 100644 SPIRV-Headers-1.5.4.g8.tar.xz diff --git a/SPIRV-Headers-1.5.4.g42.tar.xz b/SPIRV-Headers-1.5.4.g42.tar.xz new file mode 100644 index 0000000..7bde335 --- /dev/null +++ b/SPIRV-Headers-1.5.4.g42.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:53d4568869b0f97683ccc6894fd0e10a60e4cb0e960963e00879c70e456e8cad +size 138600 diff --git a/SPIRV-Headers-1.5.4.g8.tar.xz b/SPIRV-Headers-1.5.4.g8.tar.xz deleted file mode 100644 index 7166fdb..0000000 --- a/SPIRV-Headers-1.5.4.g8.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:628f5d0ee80905b6ea92d1268a1788b8d418ad5bc73b28e94fc5515601ac78c8 -size 134076 diff --git a/_service b/_service index 206335c..f69e080 100644 --- a/_service +++ b/_service @@ -2,7 +2,7 @@ git https://github.com/KhronosGroup/SPIRV-Headers - 104ecc356c1bea4476320faca64440cd1df655a3 + a3fdfe81465d57efc97cfd28ac6c8190fb31a6c8 1.5.4 1.5.4.g@TAG_OFFSET@ diff --git a/spirv-headers.changes b/spirv-headers.changes index ec35fb9..8503c35 100644 --- a/spirv-headers.changes +++ b/spirv-headers.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Mar 1 06:46:29 UTC 2021 - Jan Engelhardt + +- Update to 1.5.4.g42 (a3fdfe8146) + * 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 + ------------------------------------------------------------------- Wed Feb 10 15:01:14 UTC 2021 - Jan Engelhardt diff --git a/spirv-headers.spec b/spirv-headers.spec index 7df681e..9d8172d 100644 --- a/spirv-headers.spec +++ b/spirv-headers.spec @@ -17,7 +17,7 @@ Name: spirv-headers -Version: 1.5.4.g8 +Version: 1.5.4.g42 Release: 0 Summary: Machine-readable files from the SPIR-V registry License: MIT From 712261c5eccf6173aae046129b67fdec1424dd457b4614039a49f761d552b3e8 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 5 Mar 2021 09:10:43 +0000 Subject: [PATCH 5/6] OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/spirv-headers?expand=0&rev=56 --- spirv-headers.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/spirv-headers.changes b/spirv-headers.changes index 8503c35..bf8bb77 100644 --- a/spirv-headers.changes +++ b/spirv-headers.changes @@ -5,6 +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 ------------------------------------------------------------------- Wed Feb 10 15:01:14 UTC 2021 - Jan Engelhardt From c85116076b6d147ecd2c6261dec3ecd81d443277d405e451ed78d006e1314c45 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 5 Mar 2021 09:18:59 +0000 Subject: [PATCH 6/6] OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/spirv-headers?expand=0&rev=57 --- ...KHR_workgroup_memory_explicit_layout.patch | 164 ------------------ spirv-headers.changes | 2 +- 2 files changed, 1 insertion(+), 165 deletions(-) delete mode 100644 0001-Add-SPV_KHR_workgroup_memory_explicit_layout.patch 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