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