From ca4c803ebe05727b085e6ce9bf6516a561127a26be4149bd902ea39d34d310f1 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 8 Oct 2024 16:12:46 +0000 Subject: [PATCH] [info=edf237a7fca487d1ee6effb1fd4f23d68bbdb989a94270a1875f6d2acd3fcd1d] OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/spirv-headers?expand=0&rev=104 --- 0001-Add-SPV_EXT_optnone-449.patch | 333 ++++++++++++++++++ ...eserve-SPIR-V-enums-for-MediaTek-451.patch | 48 +++ _scmsync.obsinfo | 4 +- build.specials.obscpio | 2 +- spirv-headers.changes | 3 + spirv-headers.spec | 2 + 6 files changed, 389 insertions(+), 3 deletions(-) create mode 100644 0001-Add-SPV_EXT_optnone-449.patch create mode 100644 0002-Reserve-SPIR-V-enums-for-MediaTek-451.patch diff --git a/0001-Add-SPV_EXT_optnone-449.patch b/0001-Add-SPV_EXT_optnone-449.patch new file mode 100644 index 0000000..7fd45e1 --- /dev/null +++ b/0001-Add-SPV_EXT_optnone-449.patch @@ -0,0 +1,333 @@ +From 0413bc33faa7d85d8619c119661c09774bb47654 Mon Sep 17 00:00:00 2001 +From: Dmitry Sidorov +Date: Wed, 25 Sep 2024 18:01:03 +0200 +Subject: [PATCH 1/2] Add SPV_EXT_optnone (#449) + +* Rename SPV_INTEL_optnone to SPV_EXT_optnone + +Signed-off-by: Sidorov, Dmitry + +* keep intel names as well + +Signed-off-by: Sidorov, Dmitry + +--------- + +Signed-off-by: Sidorov, Dmitry +--- + include/spirv/unified1/spirv.bf | 3 +++ + include/spirv/unified1/spirv.core.grammar.json | 12 ++++++++++++ + include/spirv/unified1/spirv.cs | 3 +++ + include/spirv/unified1/spirv.h | 5 ++++- + include/spirv/unified1/spirv.hpp | 5 ++++- + include/spirv/unified1/spirv.hpp11 | 5 ++++- + include/spirv/unified1/spirv.json | 2 ++ + include/spirv/unified1/spirv.lua | 3 +++ + include/spirv/unified1/spirv.py | 3 +++ + include/spirv/unified1/spv.d | 3 +++ + 10 files changed, 41 insertions(+), 3 deletions(-) + +diff --git a/include/spirv/unified1/spirv.bf b/include/spirv/unified1/spirv.bf +index 453a3a2..fc66285 100644 +--- a/include/spirv/unified1/spirv.bf ++++ b/include/spirv/unified1/spirv.bf +@@ -871,6 +871,7 @@ namespace Spv + DontInline = 1, + Pure = 2, + Const = 3, ++ OptNoneEXT = 16, + OptNoneINTEL = 16, + Max = 0x7fffffff, + } +@@ -882,6 +883,7 @@ namespace Spv + DontInline = 0x00000002, + Pure = 0x00000004, + Const = 0x00000008, ++ OptNoneEXT = 0x00010000, + OptNoneINTEL = 0x00010000, + } + +@@ -1256,6 +1258,7 @@ namespace Spv + AtomicFloat32AddEXT = 6033, + AtomicFloat64AddEXT = 6034, + LongCompositesINTEL = 6089, ++ OptNoneEXT = 6094, + OptNoneINTEL = 6094, + AtomicFloat16AddEXT = 6095, + DebugInfoModuleINTEL = 6114, +diff --git a/include/spirv/unified1/spirv.core.grammar.json b/include/spirv/unified1/spirv.core.grammar.json +index d562964..25bb306 100644 +--- a/include/spirv/unified1/spirv.core.grammar.json ++++ b/include/spirv/unified1/spirv.core.grammar.json +@@ -10517,6 +10517,12 @@ + "value" : "0x0008", + "version" : "1.0" + }, ++ { ++ "enumerant" : "OptNoneEXT", ++ "value" : "0x10000", ++ "capabilities" : [ "OptNoneEXT" ], ++ "version" : "None" ++ }, + { + "enumerant" : "OptNoneINTEL", + "value" : "0x10000", +@@ -16711,6 +16717,12 @@ + "extensions" : [ "SPV_INTEL_long_composites" ], + "version" : "None" + }, ++ { ++ "enumerant" : "OptNoneEXT", ++ "value" : 6094, ++ "extensions" : [ "SPV_EXT_optnone" ], ++ "version" : "None" ++ }, + { + "enumerant" : "OptNoneINTEL", + "value" : 6094, +diff --git a/include/spirv/unified1/spirv.cs b/include/spirv/unified1/spirv.cs +index dfdbac6..b06bab7 100644 +--- a/include/spirv/unified1/spirv.cs ++++ b/include/spirv/unified1/spirv.cs +@@ -870,6 +870,7 @@ namespace Spv + DontInline = 1, + Pure = 2, + Const = 3, ++ OptNoneEXT = 16, + OptNoneINTEL = 16, + Max = 0x7fffffff, + } +@@ -881,6 +882,7 @@ namespace Spv + DontInline = 0x00000002, + Pure = 0x00000004, + Const = 0x00000008, ++ OptNoneEXT = 0x00010000, + OptNoneINTEL = 0x00010000, + } + +@@ -1255,6 +1257,7 @@ namespace Spv + AtomicFloat32AddEXT = 6033, + AtomicFloat64AddEXT = 6034, + LongCompositesINTEL = 6089, ++ OptNoneEXT = 6094, + OptNoneINTEL = 6094, + AtomicFloat16AddEXT = 6095, + DebugInfoModuleINTEL = 6114, +diff --git a/include/spirv/unified1/spirv.h b/include/spirv/unified1/spirv.h +index 92096ec..00f5ab3 100644 +--- a/include/spirv/unified1/spirv.h ++++ b/include/spirv/unified1/spirv.h +@@ -852,6 +852,7 @@ typedef enum SpvFunctionControlShift_ { + SpvFunctionControlDontInlineShift = 1, + SpvFunctionControlPureShift = 2, + SpvFunctionControlConstShift = 3, ++ SpvFunctionControlOptNoneEXTShift = 16, + SpvFunctionControlOptNoneINTELShift = 16, + SpvFunctionControlMax = 0x7fffffff, + } SpvFunctionControlShift; +@@ -862,6 +863,7 @@ typedef enum SpvFunctionControlMask_ { + SpvFunctionControlDontInlineMask = 0x00000002, + SpvFunctionControlPureMask = 0x00000004, + SpvFunctionControlConstMask = 0x00000008, ++ SpvFunctionControlOptNoneEXTMask = 0x00010000, + SpvFunctionControlOptNoneINTELMask = 0x00010000, + } SpvFunctionControlMask; + +@@ -1226,6 +1228,7 @@ typedef enum SpvCapability_ { + SpvCapabilityAtomicFloat32AddEXT = 6033, + SpvCapabilityAtomicFloat64AddEXT = 6034, + SpvCapabilityLongCompositesINTEL = 6089, ++ SpvCapabilityOptNoneEXT = 6094, + SpvCapabilityOptNoneINTEL = 6094, + SpvCapabilityAtomicFloat16AddEXT = 6095, + SpvCapabilityDebugInfoModuleINTEL = 6114, +@@ -3823,7 +3826,7 @@ inline const char* SpvCapabilityToString(SpvCapability value) { + case SpvCapabilityAtomicFloat32AddEXT: return "AtomicFloat32AddEXT"; + case SpvCapabilityAtomicFloat64AddEXT: return "AtomicFloat64AddEXT"; + case SpvCapabilityLongCompositesINTEL: return "LongCompositesINTEL"; +- case SpvCapabilityOptNoneINTEL: return "OptNoneINTEL"; ++ case SpvCapabilityOptNoneEXT: return "OptNoneEXT"; + case SpvCapabilityAtomicFloat16AddEXT: return "AtomicFloat16AddEXT"; + case SpvCapabilityDebugInfoModuleINTEL: return "DebugInfoModuleINTEL"; + case SpvCapabilityBFloat16ConversionINTEL: return "BFloat16ConversionINTEL"; +diff --git a/include/spirv/unified1/spirv.hpp b/include/spirv/unified1/spirv.hpp +index 1065013..4a8b09a 100644 +--- a/include/spirv/unified1/spirv.hpp ++++ b/include/spirv/unified1/spirv.hpp +@@ -848,6 +848,7 @@ enum FunctionControlShift { + FunctionControlDontInlineShift = 1, + FunctionControlPureShift = 2, + FunctionControlConstShift = 3, ++ FunctionControlOptNoneEXTShift = 16, + FunctionControlOptNoneINTELShift = 16, + FunctionControlMax = 0x7fffffff, + }; +@@ -858,6 +859,7 @@ enum FunctionControlMask { + FunctionControlDontInlineMask = 0x00000002, + FunctionControlPureMask = 0x00000004, + FunctionControlConstMask = 0x00000008, ++ FunctionControlOptNoneEXTMask = 0x00010000, + FunctionControlOptNoneINTELMask = 0x00010000, + }; + +@@ -1222,6 +1224,7 @@ enum Capability { + CapabilityAtomicFloat32AddEXT = 6033, + CapabilityAtomicFloat64AddEXT = 6034, + CapabilityLongCompositesINTEL = 6089, ++ CapabilityOptNoneEXT = 6094, + CapabilityOptNoneINTEL = 6094, + CapabilityAtomicFloat16AddEXT = 6095, + CapabilityDebugInfoModuleINTEL = 6114, +@@ -3819,7 +3822,7 @@ inline const char* CapabilityToString(Capability value) { + case CapabilityAtomicFloat32AddEXT: return "AtomicFloat32AddEXT"; + case CapabilityAtomicFloat64AddEXT: return "AtomicFloat64AddEXT"; + case CapabilityLongCompositesINTEL: return "LongCompositesINTEL"; +- case CapabilityOptNoneINTEL: return "OptNoneINTEL"; ++ case CapabilityOptNoneEXT: return "OptNoneEXT"; + case CapabilityAtomicFloat16AddEXT: return "AtomicFloat16AddEXT"; + case CapabilityDebugInfoModuleINTEL: return "DebugInfoModuleINTEL"; + case CapabilityBFloat16ConversionINTEL: return "BFloat16ConversionINTEL"; +diff --git a/include/spirv/unified1/spirv.hpp11 b/include/spirv/unified1/spirv.hpp11 +index 22e45f5..c0b82e9 100644 +--- a/include/spirv/unified1/spirv.hpp11 ++++ b/include/spirv/unified1/spirv.hpp11 +@@ -848,6 +848,7 @@ enum class FunctionControlShift : unsigned { + DontInline = 1, + Pure = 2, + Const = 3, ++ OptNoneEXT = 16, + OptNoneINTEL = 16, + Max = 0x7fffffff, + }; +@@ -858,6 +859,7 @@ enum class FunctionControlMask : unsigned { + DontInline = 0x00000002, + Pure = 0x00000004, + Const = 0x00000008, ++ OptNoneEXT = 0x00010000, + OptNoneINTEL = 0x00010000, + }; + +@@ -1222,6 +1224,7 @@ enum class Capability : unsigned { + AtomicFloat32AddEXT = 6033, + AtomicFloat64AddEXT = 6034, + LongCompositesINTEL = 6089, ++ OptNoneEXT = 6094, + OptNoneINTEL = 6094, + AtomicFloat16AddEXT = 6095, + DebugInfoModuleINTEL = 6114, +@@ -3819,7 +3822,7 @@ inline const char* CapabilityToString(Capability value) { + case CapabilityAtomicFloat32AddEXT: return "AtomicFloat32AddEXT"; + case CapabilityAtomicFloat64AddEXT: return "AtomicFloat64AddEXT"; + case CapabilityLongCompositesINTEL: return "LongCompositesINTEL"; +- case CapabilityOptNoneINTEL: return "OptNoneINTEL"; ++ case CapabilityOptNoneEXT: return "OptNoneEXT"; + case CapabilityAtomicFloat16AddEXT: return "AtomicFloat16AddEXT"; + case CapabilityDebugInfoModuleINTEL: return "DebugInfoModuleINTEL"; + case CapabilityBFloat16ConversionINTEL: return "BFloat16ConversionINTEL"; +diff --git a/include/spirv/unified1/spirv.json b/include/spirv/unified1/spirv.json +index 161deff..50b7a92 100644 +--- a/include/spirv/unified1/spirv.json ++++ b/include/spirv/unified1/spirv.json +@@ -854,6 +854,7 @@ + "DontInline": 1, + "Pure": 2, + "Const": 3, ++ "OptNoneEXT": 16, + "OptNoneINTEL": 16 + } + }, +@@ -1199,6 +1200,7 @@ + "AtomicFloat32AddEXT": 6033, + "AtomicFloat64AddEXT": 6034, + "LongCompositesINTEL": 6089, ++ "OptNoneEXT": 6094, + "OptNoneINTEL": 6094, + "AtomicFloat16AddEXT": 6095, + "DebugInfoModuleINTEL": 6114, +diff --git a/include/spirv/unified1/spirv.lua b/include/spirv/unified1/spirv.lua +index 28c5e40..745ce60 100644 +--- a/include/spirv/unified1/spirv.lua ++++ b/include/spirv/unified1/spirv.lua +@@ -839,6 +839,7 @@ spv = { + DontInline = 1, + Pure = 2, + Const = 3, ++ OptNoneEXT = 16, + OptNoneINTEL = 16, + Max = 0x7fffffff, + }, +@@ -849,6 +850,7 @@ spv = { + DontInline = 0x00000002, + Pure = 0x00000004, + Const = 0x00000008, ++ OptNoneEXT = 0x00010000, + OptNoneINTEL = 0x00010000, + }, + +@@ -1213,6 +1215,7 @@ spv = { + AtomicFloat32AddEXT = 6033, + AtomicFloat64AddEXT = 6034, + LongCompositesINTEL = 6089, ++ OptNoneEXT = 6094, + OptNoneINTEL = 6094, + AtomicFloat16AddEXT = 6095, + DebugInfoModuleINTEL = 6114, +diff --git a/include/spirv/unified1/spirv.py b/include/spirv/unified1/spirv.py +index bb78fe3..c2c690a 100644 +--- a/include/spirv/unified1/spirv.py ++++ b/include/spirv/unified1/spirv.py +@@ -817,6 +817,7 @@ spv = { + 'DontInline' : 1, + 'Pure' : 2, + 'Const' : 3, ++ 'OptNoneEXT' : 16, + 'OptNoneINTEL' : 16, + }, + +@@ -826,6 +827,7 @@ spv = { + 'DontInline' : 0x00000002, + 'Pure' : 0x00000004, + 'Const' : 0x00000008, ++ 'OptNoneEXT' : 0x00010000, + 'OptNoneINTEL' : 0x00010000, + }, + +@@ -1184,6 +1186,7 @@ spv = { + 'AtomicFloat32AddEXT' : 6033, + 'AtomicFloat64AddEXT' : 6034, + 'LongCompositesINTEL' : 6089, ++ 'OptNoneEXT' : 6094, + 'OptNoneINTEL' : 6094, + 'AtomicFloat16AddEXT' : 6095, + 'DebugInfoModuleINTEL' : 6114, +diff --git a/include/spirv/unified1/spv.d b/include/spirv/unified1/spv.d +index daf2523..ea9216c 100644 +--- a/include/spirv/unified1/spv.d ++++ b/include/spirv/unified1/spv.d +@@ -873,6 +873,7 @@ enum FunctionControlShift : uint + DontInline = 1, + Pure = 2, + Const = 3, ++ OptNoneEXT = 16, + OptNoneINTEL = 16, + Max = 0x7fffffff, + } +@@ -884,6 +885,7 @@ enum FunctionControlMask : uint + DontInline = 0x00000002, + Pure = 0x00000004, + Const = 0x00000008, ++ OptNoneEXT = 0x00010000, + OptNoneINTEL = 0x00010000, + } + +@@ -1258,6 +1260,7 @@ enum Capability : uint + AtomicFloat32AddEXT = 6033, + AtomicFloat64AddEXT = 6034, + LongCompositesINTEL = 6089, ++ OptNoneEXT = 6094, + OptNoneINTEL = 6094, + AtomicFloat16AddEXT = 6095, + DebugInfoModuleINTEL = 6114, +-- +2.46.1 + diff --git a/0002-Reserve-SPIR-V-enums-for-MediaTek-451.patch b/0002-Reserve-SPIR-V-enums-for-MediaTek-451.patch new file mode 100644 index 0000000..bdadf49 --- /dev/null +++ b/0002-Reserve-SPIR-V-enums-for-MediaTek-451.patch @@ -0,0 +1,48 @@ +From ec59c77a3bb5c747a369931ef101ac7c14823f2f Mon Sep 17 00:00:00 2001 +From: "Samuel (Sheng-Wen) Huang" <38491862+samuelhsw@users.noreply.github.com> +Date: Wed, 25 Sep 2024 09:03:12 -0700 +Subject: [PATCH 2/2] Reserve SPIR-V enums for MediaTek (#451) + +--- + include/spirv/spir-v.xml | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/include/spirv/spir-v.xml b/include/spirv/spir-v.xml +index 43dba9e..ad437d1 100644 +--- a/include/spirv/spir-v.xml ++++ b/include/spirv/spir-v.xml +@@ -152,13 +152,14 @@ + + + ++ + + +- ++ + + + +@@ -185,13 +186,14 @@ + + + ++ + + +- ++ + + + +-- +2.46.1 + diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index 18e8601..e43d35d 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1728403671 -commit: 051f32471a8d08d908e16e6929ef5fe58d026cc2eb3856b6490bf3944f4feec3 +mtime: 1728403956 +commit: edf237a7fca487d1ee6effb1fd4f23d68bbdb989a94270a1875f6d2acd3fcd1d url: https://src.opensuse.org/jengelh/spirv-headers revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio index 031c842..156a948 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b7351d35fb6e84f961b07a8dafe92e1c9a935ecc36f50623034e7848f552a0e7 +oid sha256:0b5b7bc56fd4d86793b2b61cee5031edd5feee8a5a80a746ee27ff1b53be6b1e size 256 diff --git a/spirv-headers.changes b/spirv-headers.changes index 75327a5..f1145d0 100644 --- a/spirv-headers.changes +++ b/spirv-headers.changes @@ -9,6 +9,9 @@ Tue Oct 8 16:04:45 UTC 2024 - Jan Engelhardt SPV_INTEL_subgroup_buffer_prefetch * Add Capability and Execution mode SPV_KHR_compute_shader_derivatives +- Add 0001-Add-SPV_EXT_optnone-449.patch, + 0002-Reserve-SPIR-V-enums-for-MediaTek-451.patch + for spirv-tools ------------------------------------------------------------------- Tue Jul 23 04:50:50 UTC 2024 - Jan Engelhardt diff --git a/spirv-headers.spec b/spirv-headers.spec index b86fe18..69c11d6 100644 --- a/spirv-headers.spec +++ b/spirv-headers.spec @@ -32,6 +32,8 @@ License: MIT Group: Development/Libraries/C and C++ URL: https://github.com/KhronosGroup/SPIRV-Headers Source: https://github.com/KhronosGroup/SPIRV-Headers/archive/vulkan-sdk-%innerver.tar.gz +Patch1: 0001-Add-SPV_EXT_optnone-449.patch +Patch2: 0002-Reserve-SPIR-V-enums-for-MediaTek-451.patch BuildArch: noarch BuildRequires: cmake >= 2.8 BuildRequires: fdupes