From 0af32208194b943aac15be2d98d3e971847134917ab139b3c3651648509df2ac Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 8 Oct 2024 16:08:11 +0000 Subject: [PATCH 1/2] [info=051f32471a8d08d908e16e6929ef5fe58d026cc2eb3856b6490bf3944f4feec3] OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/spirv-headers?expand=0&rev=103 --- .gitattributes | 23 +++ .gitignore | 1 + _scmsync.obsinfo | 4 + build.specials.obscpio | 3 + spirv-headers.changes | 388 ++++++++++++++++++++++++++++++++++++++ spirv-headers.spec | 67 +++++++ vulkan-sdk-1.3.290.tar.gz | 3 + vulkan-sdk-1.3.296.tar.gz | 3 + 8 files changed, 492 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 _scmsync.obsinfo create mode 100644 build.specials.obscpio create mode 100644 spirv-headers.changes create mode 100644 spirv-headers.spec create mode 100644 vulkan-sdk-1.3.290.tar.gz create mode 100644 vulkan-sdk-1.3.296.tar.gz diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo new file mode 100644 index 0000000..18e8601 --- /dev/null +++ b/_scmsync.obsinfo @@ -0,0 +1,4 @@ +mtime: 1728403671 +commit: 051f32471a8d08d908e16e6929ef5fe58d026cc2eb3856b6490bf3944f4feec3 +url: https://src.opensuse.org/jengelh/spirv-headers +revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio new file mode 100644 index 0000000..031c842 --- /dev/null +++ b/build.specials.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b7351d35fb6e84f961b07a8dafe92e1c9a935ecc36f50623034e7848f552a0e7 +size 256 diff --git a/spirv-headers.changes b/spirv-headers.changes new file mode 100644 index 0000000..75327a5 --- /dev/null +++ b/spirv-headers.changes @@ -0,0 +1,388 @@ +------------------------------------------------------------------- +Tue Oct 8 16:04:45 UTC 2024 - Jan Engelhardt + +- Update to release 1.6.4+sdk296 based on Git tag/release + "SDK-1.3.296.0" + * Update headers with SPIR-V version 1.6, revision 4 + * Reserve 4 memory operands bits for Arm + * Add support for SPV_KHR_untyped_pointers and + SPV_INTEL_subgroup_buffer_prefetch + * Add Capability and Execution mode + SPV_KHR_compute_shader_derivatives + +------------------------------------------------------------------- +Tue Jul 23 04:50:50 UTC 2024 - Jan Engelhardt + +- Updateto release SDK-1.3.290.0 + * Add utility functions to strinfigy value enums + * Add SPV_EXT_replicated_composites, + SPV_KHR_relaxed_extended_instruction and + SPV_ARM_cooperative_matrix_layouts + * Add KHR suffix to OpExtInstWithForwardRefsKHR + +------------------------------------------------------------------- +Thu May 16 11:38:08 UTC 2024 - Jan Engelhardt + +- Update to release SDK-1.3.283.0 + * Update bit reservations for loop control and memory operands + +------------------------------------------------------------------- +Fri Apr 12 17:11:55 UTC 2024 - Jan Engelhardt + +- Update to release SDK-1.3.280.0 [This is equal to + 1.3.275.0-19-g8b246ff that openSUSE already has had] +- Delete v275-to-8b246ff.patch (merged) + +------------------------------------------------------------------- +Sun Mar 10 09:30:51 UTC 2024 - Jan Engelhardt + +- Add v275-to-8b246ff.patch +- Update to snapshot vulkan-sdk-1.3.275.0-19-g8b246ff + * Upstream tokens for SPV_INTEL_masked_gather_scatter + * Publish the header for the vulkan-shader-profiler embedded + reflection + * Add SPV_KHR_maximal_reconvergence, SPV_KHR_float_controls2 + * Support SPV_KHR_quad_control (with fixed line endings) + * Add SPV_QCOM_image_processing2, SPV_NV_shader_atomic_fp16_vector, + SPV_NV_raw_access_chains + * Headers support for SPV_INTEL_maximum_registers extension + +------------------------------------------------------------------- +Fri Jan 19 11:33:40 UTC 2024 - Jan Engelhardt + +- Update to release SDK-1.3.275.0 + * ClspvReflection non-sematic: add + NormalizedSamplerMaskPushConstant + * Headers support for new FPGAMemoryAttributesINTEL + * Fix SPV_KHR_workgroup_memory_explicit_layout implicit + declaration + * Change token IDs for global_variable_fpga_decorations and + global_variable_host_access + * Update SPV_INTEL_long_composites tokens + * Add Type-Declaration for extended types + * Headers support for FPGAClusterAttributesV2INTEL + +------------------------------------------------------------------- +Fri Oct 27 04:00:58 UTC 2023 - Jan Engelhardt + +- Update to release SDK-1.3.268.0 + * Add SPV_AMDX_shader_enqueue + * Add SPV_INTEL_cache_controls extension support + * Remove Kernel from ConstantSampler enum values + * Remove additional version "1.0" from SecondaryViewportRelativeNV + * Add headers for SPV_NV_displacement_micromap + * Add LiteralFloat to operand_kinds + +------------------------------------------------------------------- +Tue Aug 22 09:47:59 UTC 2023 - Jan Engelhardt + +- Update to release SDK-1.3.261.0 + * Header files changes to support SPV_INTEL_fp_max_error spec + extension + * Make the generated operators for masks constexpr + * Add definitions for SVP_EXT_image_raw10_raw12, + SPV_KHR_cooperative_matrix + * Remove capabilities on cooperative matrix enums to align with + specification + * Revert "Add support for fp_max_error extension" + +------------------------------------------------------------------- +Tue May 30 21:59:05 UTC 2023 - Jan Engelhardt + +- Update to release SDK-1.3.250.0 + * Add SPV_EXT_shader_tile_image. + * Add back version field for new enumerants and operands, but + set to None. + * SPV_KHR_ray_tracing_position_fetch support. + +------------------------------------------------------------------- +Wed Mar 29 18:40:35 UTC 2023 - Jan Engelhardt + +- Update to release 1.6.1/SDK-1.3.243.0 + * Added SPRIV_INTEL_argument_interfaces, RegisterMapInterfaceINTEL, + SPV_QCOM_image_processing + * Added support for SPV_INTEL_fpga_latency_control extension + * Headers support for SPV_INTEL_bfloat16_conversion + +------------------------------------------------------------------- +Sun Jan 29 13:02:53 UTC 2023 - Jan Engelhardt + +- Update to release 1.6.1/SDK-1.3.239.0 + * Add support for StreamingInterfaceINTEL in headers + * C++ headers: Define & and ~ bitwise operators for mask enums + * Add operator^ + * Make operands to Kernel added in v5 optional + +------------------------------------------------------------------- +Wed Jan 18 22:31:42 UTC 2023 - Jan Engelhardt + +- Update to snapshot 1.6.1+sdk236+git7.d13b522 + * Update ClspvReflection non-semantic instruction set + +------------------------------------------------------------------- +Fri Dec 23 07:59:56 UTC 2022 - Jan Engelhardt + +- Update to release 1.6.1+sdk236 (1d31a10) + * Add SPV_INTEL_fpga_invocation_pipelining_attributes, + SPV_INTEL_fpga_dsp_control, SPV_INTEL_runtime_aligned + * Add headers for SPV_NV_shader_invocation_reorder + +------------------------------------------------------------------- +Mon Oct 24 19:43:45 UTC 2022 - Jan Engelhardt + +- Update to 1.6.1+sdk231 (85a1ed2) + * Implement headers definitions for SPV_EXT_mesh_shader + * Add definitions for SPV_ARM_core_builtins + * Something with VK_EXT_opacity_micromap + * Add support for texel buffers to clspv non-semantic + instruction set + +------------------------------------------------------------------- +Mon Aug 22 23:25:58 UTC 2022 - Jan Engelhardt + +- Update to 1.6.1+sdk224+git2.0bcc624 + * Updated clspv reflection non-semantic instruction set + * Resolved missing update of spirv.bf + +------------------------------------------------------------------- +Wed Jun 15 13:21:30 UTC 2022 - Jan Engelhardt + +- Update to 1.6.1+sdk216 (b2a156e) + * Add a SourceLanguage for SYCL + * Add NamedBarrierCountINTEL execution mode + * Add SPV_KHR_subgroup_rotate, SPV_KHR_ray_cull_mask, + SPV_AMD_shader_early_and_late_fragment_tests + +------------------------------------------------------------------- +Mon Apr 18 23:29:28 UTC 2022 - Jan Engelhardt + +- Update to 1.6.1+sdk211 (4995a2f) + * Implement SPV_KHR_uniform_group_instructions extension + * Update SPIR-V headers for SPV_INTEL_split_barrier + * Implement SPV_INTEL_memory_access_aliasing extension + +------------------------------------------------------------------- +Wed Jan 26 20:47:58 UTC 2022 - Jan Engelhardt + +- Update to snapshot 1.6.g6 (b42ba6d / sdk204) + * Add definitions to implement the SPIR-V 1.6 spec. + * Add ShaderWriter as SPIR-V generation tool. + +------------------------------------------------------------------- +Thu Nov 11 19:38:18 UTC 2021 - Jan Engelhardt + +- Update to snapshot 1.5.5.g9 (814e728b / sdk198) + * Add spirv-headers pkgconfig file + * Implement header definitions for SPV_NV_bindless_texture + * Add SpecConstantSubgroupMaxSize to the clspv reflection + non-semantic instruction set + * Rename ConstFunctionPointerINTEL to + ConstantFunctionPointerINTEL + +------------------------------------------------------------------- +Mon Sep 6 05:11:49 UTC 2021 - Jan Engelhardt + +- Update to snapshot 1.5.4.g108 (449bc986) + * Add VectorComputeINTEL as enabling capability for Private + StorageClass + * Add header changes for SPV_EXT_shader_atomic_float16_add + * Support SPV_KHR_integer_dot_product + * Add support for SPV_KHR_bit_instructions + * Implement SPV_INTEL_optnone extension + * Add support for SPV_NV_ray_tracing_motion_blur + +------------------------------------------------------------------- +Wed May 5 09:34:57 UTC 2021 - Jan Engelhardt + +- Update to snapshot 1.5.4.g57 (dafead1765) + * Support SPV_KHR_expect_assume, SPV_KHR_linkonce_odr + * Add generator ID for MSP shader compiler + +------------------------------------------------------------------- +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 +- Remove 0001-Add-SPV_KHR_workgroup_memory_explicit_layout.patch + +------------------------------------------------------------------- +Wed Feb 10 15:01:14 UTC 2021 - Jan Engelhardt + +- Add 0001-Add-SPV_KHR_workgroup_memory_explicit_layout.patch + +------------------------------------------------------------------- +Wed Nov 25 17:08:48 UTC 2020 - Jan Engelhardt + +- Update to 1.5.4.g8 / 1.5.4.raytracing (104ecc35) + * Added SPV_KHR_fragment_shading_rate + * Add SPV_EXT_shader_image_int64 + * Raytracing and Rayquery updates for final + +------------------------------------------------------------------- +Mon Oct 5 17:57:34 UTC 2020 - Jan Engelhardt + +- Update to 1.5.3.g22 / 1.5.3.reservations1 (3fdabd0d) + * Publish the headers for the clspv embedded reflection + non-semantic extended instruction set. + * Update the registry in spir-v.xml to modernize and split out + opcodes. + +------------------------------------------------------------------- +Wed Aug 12 07:26:50 UTC 2020 - Jan Engelhardt + +- Update to snapshot 1.5.3.g18 (979924c8bc) + * Support for SPV_EXT_shader_atomic_float + +------------------------------------------------------------------- +Fri May 29 17:05:17 UTC 2020 - Jan Engelhardt + +- Update to release 1.5.3 + * Update headers to SPIR-V 1.5 Revision 3 + +------------------------------------------------------------------- +Wed Apr 8 11:17:10 UTC 2020 - Jan Engelhardt + +- Update to snapshot 1.5.1.c+git24 (f8bf11a) + * Add grammars, C header, and header generator for vendor and + KHR extended instruction sets. + * Update headers for SPV_KHR_ray_tracing. + * Added ray flags, primitive culling flags, queries. + * Add shadercalls scope. + +------------------------------------------------------------------- +Sat Oct 26 11:51:56 UTC 2019 - Jan Engelhardt + +- Update to release 1.5.1.corrected + * Add SPV_KHR_physical_storage_buffer. + +------------------------------------------------------------------- +Sat Sep 28 04:32:28 UTC 2019 - Jan Engelhardt + +- Update to release 1.5.1 + * No change from last snapshot, just a version bump. + +------------------------------------------------------------------- +Wed Aug 21 07:26:15 UTC 2019 - Jan Engelhardt + +- Update to new snapshot 1.4.1.g36 + * Add INTEL_shader_integer_functions2, + SPV_EXT_fragment_shader_interlock, + SPV_EXT_demote_to_helper_invocation. + * Add support for SPV_NV_sm_shader_builtins. + * Add Volatile to Memory Semantics, for + SPV_KHR_vulkan_memory_model. + * Add SPV_KHR_shader_clock to spirv-headers. + +------------------------------------------------------------------- +Tue Jun 4 12:12:05 UTC 2019 - Jan Engelhardt + +- Update to new snapshot 1.4.1.g17 + * Add INTEL_shader_integer_functions2 and + SPV_EXT_fragment_shader_interlock. + * Enable Groups capability by the extension SPV_AMD_shader_ballot. + * Add support for SPV_NV_sm_shader_builtins. + +------------------------------------------------------------------- +Sat Mar 16 18:30:41 UTC 2019 - Jan Engelhardt + +- Update to new upstream release 1.3.7 + * Synchronize to revision 7 of the header specification + from Khronos. + +------------------------------------------------------------------- +Mon Jan 7 21:25:39 UTC 2019 - Jan Engelhardt + +- Update to new snapshot 1.3.g60 + * Support for SPV_EXT_physical_storage_buffer + +------------------------------------------------------------------- +Fri Dec 14 23:33:12 UTC 2018 - Jan Engelhardt + +- Update to new snapshot 1.3.g50 + * Reserve tokens for float controls and no integer wrapping + * Add JSON support for SPV_EXT_fragment_invocation_density + +------------------------------------------------------------------- +Sat Nov 10 12:11:07 UTC 2018 - Jan Engelhardt + +- Update to new snapshot 1.3.g44 + * Add enumerants for six Nvidia extensions + * Add support for nv-raytracing + +------------------------------------------------------------------- +Fri Aug 24 19:01:10 UTC 2018 - jengelh@inai.de + +- Update to new snapshot 1.3.g34 + * Add missing extension/capability requirements for some symbols + * Add SPV_NV_shader_subgroup_partitioned to SPIR-V JSON. + * Add missing 'extensions' for OpGroupNonUniformPartitionNV. + * Add tokens for SPV_EXT_descriptor_indexing. + * SPV_GOOGLE_hlsl_functionality1 includes all of + SPV_GOOGLE_decorate_string. + * Clay Shader Compiler + * Add enumerants for SPV_KHR_8bit_storage. + +------------------------------------------------------------------- +Thu Mar 8 00:16:56 UTC 2018 - jengelh@inai.de + +- Update to new snapshot 1.3.g0 + * Allow SubgroupSize and SubgroupLocalInvocationId with SubgroupBallotKHR + * Add headers for the 1.2 unified (1.0, 1.1, and 1.2) specification. + * 464d17b Refresh 1.3 headers from spec repo + +------------------------------------------------------------------- +Wed Feb 7 22:24:49 UTC 2018 - jengelh@inai.de + +- Update to new snapshot 1.2.g22 + * Add headers for the 1.2 unified (1.0, 1.1, and 1.2) + specification. + +------------------------------------------------------------------- +Fri Nov 17 13:26:07 UTC 2017 - jengelh@inai.de + +- Update to new snapshot 1.2.g13 + * Add new Intel token reservations, new tokens for + SPV_AMD_shader_fragment_mask, and new tokens for + SPV_AMD_shader_fragment_mask. + * Update all headers for SPV_EXT_shader_stencil_export. + * Add SPV_EXT_shader_viewport_index_layer. + +------------------------------------------------------------------- +Mon Aug 7 16:34:41 UTC 2017 - jengelh@inai.de + +- Update to new snapshot 1.1.g46 + * Reserve number 16 for the Mesa-IR/SPIR-V Translator. + +------------------------------------------------------------------- +Tue Jul 18 08:53:28 UTC 2017 - jengelh@inai.de + +- Update to new snapshot 1.1.g44 + * reserve SPIR-V enum block for upcoming Intel extension + * Add version 1.2 headers, update 1.1 headers to revision 7, + update 1.0 headers to revision 11. + * Synchronize OpenCL extended instruction set header with spec, + and add missing capability use to the JSON grammar. + * Update JSON grammar files for 16-bit storage. + +------------------------------------------------------------------- +Mon Feb 20 17:28:15 UTC 2017 - jengelh@inai.de + +- Update to new snapshot 1.1.g31 + * New revisions of SPIR-V 1.0 and 1.1, and both extended + instruction sets. + +------------------------------------------------------------------- +Thu Feb 2 10:32:32 UTC 2017 - jengelh@inai.de + +- Update to new snapshot 1.1.g29 + * Add "Shaderc over Glslang" as a front end. + * Update to Rev. 8 of 1.0 and Rev. 4 of 1.1. Includes enums for + SPV_KHR_shader_draw_parameters. + * Add SPV_KHR_shader_ballot enumerants. + +------------------------------------------------------------------- +Sun Jun 12 16:10:27 UTC 2016 - jengelh@inai.de + +- Initial package (version 1.1.g15) for build.opensuse.org diff --git a/spirv-headers.spec b/spirv-headers.spec new file mode 100644 index 0000000..b86fe18 --- /dev/null +++ b/spirv-headers.spec @@ -0,0 +1,67 @@ +# +# spec file for package spirv-headers +# +# Copyright (c) 2024 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +# The git repo is a hodgepodge. +# Most recent tag is 1.5.4, but that is outdated. +# CMakeLists.txt's project() line contains 1.5.5, but this is outdated too. +# The SPIR-V version is 1.6.4 (include/spirv/unified1/spirv.core.grammar.json) +# They add "SDK" tags that reflect the Vulkan version (1.3), +# and the independently increasing toolchain release number (296). + +Name: spirv-headers +Version: 1.6.4+sdk296 +%define innerver 1.3.296 +Release: 0 +Summary: Machine-readable files from the SPIR-V registry +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 +BuildArch: noarch +BuildRequires: cmake >= 2.8 +BuildRequires: fdupes +BuildRequires: gcc-c++ +BuildRequires: pkg-config + +%description +This repository contains machine-readable files from the SPIR-V +registry. This includes: + +* Header files for various languages. +* JSON files describing the grammar for the SPIR-V core instruction + set, and for the GLSL.std.450 extended instruction set. +* The XML registry file. + +%prep +%autosetup -n SPIRV-Headers-vulkan-sdk-%innerver -p1 + +%build +%cmake +%cmake_build + +%install +%cmake_install +%fdupes %buildroot/%_prefix + +%files +%_includedir/spirv/ +%_datadir/cmake/ +%_datadir/pkgconfig/*.pc +%license LICENSE + +%changelog diff --git a/vulkan-sdk-1.3.290.tar.gz b/vulkan-sdk-1.3.290.tar.gz new file mode 100644 index 0000000..641e7e6 --- /dev/null +++ b/vulkan-sdk-1.3.290.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6259184f829f9d8c01a343dd29c56a700cc3da71a17c439384687da98dee2cf4 +size 521623 diff --git a/vulkan-sdk-1.3.296.tar.gz b/vulkan-sdk-1.3.296.tar.gz new file mode 100644 index 0000000..3652ee7 --- /dev/null +++ b/vulkan-sdk-1.3.296.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f03ff6cc6bf4fa88f8e66117557c521f456709a4ee5333f94ac7dc040d276136 +size 523597 From ca4c803ebe05727b085e6ce9bf6516a561127a26be4149bd902ea39d34d310f1 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 8 Oct 2024 16:12:46 +0000 Subject: [PATCH 2/2] [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