mesa: Upgrade 23.1.8 -> 23.2.1
v2 adds some references related to the llvm-17 issue
Quoted 244 lines · Markus Volk
- update 0001-gallium-Fix-build-with-llvm-17.patch
- remove as added upstream:
0001-intel-Allow-using-intel_clc-from-the-system.patch
- intel clc build is currently broken with llvm 17, but that issue is also
present
with mesa 23.1.8<https://gitlab.freedesktop.org/mesa/mesa/-/issues/9701>
<https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24879>
<https://github.com/KhronosGroup/SPIRV-LLVM-Translator/issues/2153>Signed-off-by Markus Volk <[email protected] <mailto:[email protected]>>--- .../0001-gallium-Fix-build-with-llvm-17.patch | 19 ++-- ...llow-using-intel_clc-from-the-system.patch | 99 ------------------- .../{mesa-gl_23.1.8.bb => mesa-gl_23.2.1.bb} | 0 meta/recipes-graphics/mesa/mesa.inc | 5 +- .../mesa/{mesa_23.1.8.bb => mesa_23.2.1.bb} | 0 5 files changed, 12 insertions(+), 111 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/files/0001-intel-Allow-using-intel_clc-from-the-system.patch rename meta/recipes-graphics/mesa/{mesa-gl_23.1.8.bb => mesa-gl_23.2.1.bb} (100%) rename meta/recipes-graphics/mesa/{mesa_23.1.8.bb => mesa_23.2.1.bb}(100%)
meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch +0
-1---
a/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch
+++b/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patchmeta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch +0
-1@@ -1,4 +1,4 @@ -From c8e9776abc3dfd3f2411797a90a03e7fa16263ef Mon Sep 17 00:00:002001
+From6d07f6aa7f92f40d78a2db645f16f0f3e7d3c2e8Mon Sep 17 00:00:00 2001
From: Khem Raj <[email protected] <mailto:[email protected]>>
Date: Fri, 23 Jun 2023 01:20:38 -0700
Subject: [PATCH] gallium: Fix build with llvm 17meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch +0
-0@@ -9,16 +9,19 @@ so add conditions to exclude them for llvm >= 17 Upstream-Status: Submitted[<https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23827>]Signed-off-by Khem Raj <[email protected]<mailto:[email protected]>>
meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch +4
-2+ --- - src/gallium/auxiliary/gallivm/lp_bld_init.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) + src/gallium/auxiliary/gallivm/lp_bld_init.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) +diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c
b/src/gallium/auxiliary/gallivm/lp_bld_init.cmeta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch +5
-6+index cd2108f..b1a4d03 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_init.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c -@@ -42,8 +42,10 @@ - - #include <llvm/Config/llvm-config.h> - #include <llvm-c/Analysis.h> +@@ -46,15 +46,19 @@ + #if GALLIVM_USE_NEW_PASS == 1 + #include <llvm-c/Transforms/PassBuilder.h> + #elif GALLIVM_HAVE_CORO == 1 +#if LLVM_VERSION_MAJOR < 17 #include <llvm-c/Transforms/Scalar.h> -#if LLVM_VERSION_MAJOR >= 7@@ -26,8 +29,6 @@ Signed-off-by: Khem Raj <[email protected]> +#if LLVM_VERSION_MAJOR >= 7 && LLVM_VERSION_MAJOR < 17 #include <llvm-c/Transforms/Utils.h> #endif - #include <llvm-c/BitWriter.h> -@@ -53,8 +55,10 @@ #if LLVM_VERSION_MAJOR <= 8 && (DETECT_ARCH_AARCH64 || DETECT_ARCH_ARM || DETECT_ARCH_S390 || DETECT_ARCH_MIPS64) #include <llvm-c/Transforms/IPO.h>#endifmeta/recipes-graphics/mesa/files/0001-intel-Allow-using-intel_clc-from-the-system.patch deleted +0
-1---
a/meta/recipes-graphics/mesa/files/0001-intel-Allow-using-intel_clc-from-the-system.patch+++/dev/nullmeta/recipes-graphics/mesa/files/0001-intel-Allow-using-intel_clc-from-the-system.patch deleted +0
-1@@ -1,99 +0,0 @@ -From ac503f5d7bf36f021c576029a64ac1a3199f6b5a Mon Sep 17 00:00:002001
meta/recipes-graphics/mesa/files/0001-intel-Allow-using-intel_clc-from-the-system.patch deleted +0
-5-From: Matt Turner <[email protected] <mailto:[email protected]>> -Date: Thu, 31 Aug 2023 13:16:29 -0400 -Subject: [PATCH] intel: Allow using intel_clc from the system - -With -Dintel-clc=system, the build system will search for an
intel_clcmeta/recipes-graphics/mesa/files/0001-intel-Allow-using-intel_clc-from-the-system.patch deleted +0
-4-binary and use it instead of building `intel_clc` itself. - -This allows Intel Vulkan ray tracing support to be built when cross -compiling without terrible hacks (that would otherwise be necessarydue
-tointel_clc's dependence on SPIRV-LLVM-Translator, libclc, clang, andmeta/recipes-graphics/mesa/files/0001-intel-Allow-using-intel_clc-from-the-system.patch deleted +0
-3-LLVM). - -Part-of:<<https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24983>>
meta/recipes-graphics/mesa/files/0001-intel-Allow-using-intel_clc-from-the-system.patch deleted +0
-2- -Upstream-Status: Backport[<https://gitlab.freedesktop.org/mesa/mesa/-/commit/28c1053c07c177854520f6283fa665f17618adb5>]
meta/recipes-graphics/mesa/files/0001-intel-Allow-using-intel_clc-from-the-system.patch deleted +0
-24- ---- - meson.build | 6 +++--- - meson_options.txt | 5 ++++- - src/intel/compiler/meson.build | 6 +++++- - src/intel/vulkan/grl/meson.build | 2 +- - 4 files changed, 13 insertions(+), 6 deletions(-) - -diff --git a/meson.build b/meson.build -index 16e86ec..00a6953 100644 ---- a/meson.build -+++ b/meson.build -@@ -259,12 +259,12 @@ endif - - with_microsoft_clc = get_option('microsoft-clc').enabled() - if ['x86_64'].contains(host_machine.cpu_family()) -- with_intel_clc = get_option('intel-clc').enabled() -- with_intel_vk_rt = with_intel_vk and with_intel_clc -+ with_intel_clc = get_option('intel-clc') == 'enabled' - else - with_intel_clc = false -- with_intel_vk_rt = false - endif -+with_intel_vk_rt = with_intel_vk and get_option('intel-clc') !='disabled'
-+
-with_clc=with_microsoft_clcorwith_intel_clc
-with_libclc=with_clc
-with_spirv_to_dxil=get_option('spirv-to-dxil')meta/recipes-graphics/mesa/files/0001-intel-Allow-using-intel_clc-from-the-system.patch deleted +0
-16-diff --git a/meson_options.txt b/meson_options.txt -index 379aea3..9800531 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -607,9 +607,12 @@ option( - - option( - 'intel-clc', -- type : 'feature', -+ type : 'combo', - deprecated: {'true': 'enabled', 'false': 'disabled'}, - value : 'disabled', -+ choices : [ -+ 'enabled', 'disabled', 'system', -+ ], - description : 'Build the intel-clc compiler (enables Vulkan Intel' +
meta/recipes-graphics/mesa/files/0001-intel-Allow-using-intel_clc-from-the-system.patch deleted +0
-3- 'Ray Tracing on supported hardware).' - ) -diff --git a/src/intel/compiler/meson.buildb/src/intel/compiler/meson.build
meta/recipes-graphics/mesa/files/0001-intel-Allow-using-intel_clc-from-the-system.patch deleted +0
-17-index 9a03d37..774e955 100644 ---- a/src/intel/compiler/meson.build -+++ b/src/intel/compiler/meson.build -@@ -168,7 +168,10 @@ libintel_compiler = static_library( - ) - - # For now this tool is only going to be used by Anv --if with_intel_clc -+if get_option('intel-clc') == 'system' -+ prog_intel_clc = find_program('intel_clc', native : true) -+ dep_prog_intel_clc = [] -+elif with_intel_clc - prog_intel_clc = executable( - 'intel_clc', - ['intel_clc.c'], -@@ -181,6 +184,7 @@ if with_intel_clc - dependencies : [idep_nir, idep_clc, idep_mesautil,
idep_intel_dev],meta/recipes-graphics/mesa/files/0001-intel-Allow-using-intel_clc-from-the-system.patch deleted +0
-7- native : true, - ) -+ dep_prog_intel_clc = [prog_intel_clc] - endif - - if with_tests -diff --git a/src/intel/vulkan/grl/meson.buildb/src/intel/vulkan/grl/meson.build
meta/recipes-graphics/mesa/files/0001-intel-Allow-using-intel_clc-from-the-system.patch deleted +0
-12-index c0056b3..02a72f5 100644 ---- a/src/intel/vulkan/grl/meson.build -+++ b/src/intel/vulkan/grl/meson.build -@@ -143,7 +143,7 @@ foreach t : [['125', 'gfx125', 'dg2']] - # if fixed there - ], - env: ['MESA_SHADER_CACHE_DISABLE=true'], -- depends : [prog_intel_clc] -+ depends : dep_prog_intel_clc - ) - endforeach -meta/recipes-graphics/mesa/mesa-gl_23.2.1.bb renamed from meta/recipes-graphics/mesa/mesa-gl_23.1.8.bb +0
-0meta/recipes-graphics/mesa/mesa.inc +1
-3@@ -18,11 +18,10 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0001-meson.build-check-for-all-linux-host_os-combinations.patch <file://0001-meson.build-check-for-all-linux-host_os-combinations.patch/> \ file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch <file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch/> \ file://0001-gallium-Fix-build-with-llvm-17.patch <file://0001-gallium-fix-build-with-llvm-17.patch/> \ - file://0001-intel-Allow-using-intel_clc-from-the-system.patch <file://0001-intel-allow-using-intel_clc-from-the-system.patch/> \ file://0001-meson-Disable-cmake-dependency-detector-for-llvm.patch <file://0001-meson-disable-cmake-dependency-detector-for-llvm.patch/> \ - " +" -SRC_URI[sha256sum] ="
45434ff91a709844130a3174d9c0ef39c6b50725b2bb0c13e736f36134db14ad" +SRC_URI[sha256sum] = "64de0616fc2d801f929ab1ac2a4f16b3e2783c4309a724c8a259b20df8bbc1cc"
UPSTREAM_CHECK_GITTAGREGEX= "mesa-(?P<pver>\d+(\.\d+)+)"meta/recipes-graphics/mesa/mesa_23.2.1.bb renamed from meta/recipes-graphics/mesa/mesa_23.1.8.bb +0
-1--2.42.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#188514): <https://lists.openembedded.org/g/openembedded-core/message/188514>
Mute This Topic: <https://lists.openembedded.org/mt/101696345/3618223>
Group Owner: [email protected] <mailto:[email protected]>
Unsubscribe: <https://lists.openembedded.org/g/openembedded-core/unsub> [[email protected] <mailto:[email protected]>]
-=-=-=-=-=-=-=-=-=-=-=-