mesa: fix opencl-spirv build
v3 fixes an error because of a missing space
Please correct according to <https://docs.yoctoproject.org/contributor-guide/recipe-style-guide.html#patch-upstream-status> :
Upstream-Status: Inappropriate[<https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27783/diffs?commit_id=a976f2c9f0c07f9e06cc9affd9124b45bc60c2bd>] [patch-status]
Quoted 117 lines · Markus Volk
<https://gitlab.freedesktop.org/mesa/mesa/-/commit/815a6647eb1383e9dc704ffcc266d85f3b13338a>
adds a regression and breaks opencl-spirv build.The next step in mesa will probably be to completely remove nir in favour of rusticl.
<https://gitlab.freedesktop.org/mesa/mesa/-/issues/10674>Revert this commit to avoid that the lts version cannot use spirv because rusticl is not yet and opencl-spirv is no longer supported.
Signed-off-by Markus Volk <[email protected] <mailto:[email protected]>>--- ...-meson-do-not-pull-in-clc-for-clover.patch | 56 +++++++++++++++++++ meta/recipes-graphics/mesa/mesa.inc | 1 + 2 files changed, 57 insertions(+) create mode 100644
meta/recipes-graphics/mesa/files/0001-Revert-meson-do-not-pull-in-clc-for-clover.patch(quoted diff) +0
-0
b/meta/recipes-graphics/mesa/files/0001-Revert-meson-do-not-pull-in-clc-for-clover.patch(quoted diff) +1
-0@@ -0,0 +1,56 @@ +From fe4600de549549fbb3033fc1b37904ba6b3fe2af Mon Sep 17 00:00:002001
(quoted diff) +6
-0+From: Markus Volk <[email protected] <mailto:[email protected]>> +Date: Fri, 8 Mar 2024 15:53:11 +0100 +Subject: [PATCH] Revert "meson: do not pull in clc for clover" + +This reverts commit 815a6647eb1383e9dc704ffcc266d85f3b13338a. +Upstream-Status: Inappropriate(quoted diff) +2
-0+ +Once the merge request above was added, it will only be possible toprovide opencl spir-v with gallium-rusticl=true. This is not yet supported in the mesa recipe. +For now reverting this commit allows to still use clover with
opencl-spirv, which would otherwise be broken starting from mesa 24.0.2.(quoted diff) +2
-0+ +After it was merged, this patch needs to be removed and rusticlsupport will be required
(quoted diff) +2
-0+ +Signed-off-by: Markus Volk <[email protected]<mailto:[email protected]>>
+--- + meson.build | 3 ++- + src/compiler/meson.build | 2 +-+ 2 files changed, 3 insertions(+), 2 deletions(-)
(quoted diff) +38
-0+ +diff --git a/meson.build b/meson.build +index 25e92ea5f95..3956e19c08f 100644 +--- a/meson.build ++++ b/meson.build +@@ -818,6 +818,7 @@ if _opencl != 'disabled' + error('The Clover OpenCL state tracker requires rtti') + endif + ++ with_clc = true + with_gallium_opencl = true + with_opencl_icd = _opencl == 'icd' + else +@@ -842,7 +843,7 @@ if with_gallium_rusticl + endif + + dep_clc = null_dep +-if with_gallium_opencl or with_clc ++if with_clc + dep_clc = dependency('libclc') + endif + +diff --git a/src/compiler/meson.build b/src/compiler/meson.build +index 8d73544c6d8..1dae56d1b2b 100644 +--- a/src/compiler/meson.build ++++ b/src/compiler/meson.build +@@ -79,7 +79,7 @@ subdir('nir') + + subdir('spirv') + +-if with_clc ++if with_opencl_spirv + subdir('clc') + endif + if with_gallium +-- +2.44.0 +meta/recipes-graphics/mesa/mesa.inc +0
-0@@ -20,6 +20,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0001-gallium-Fix-build-with-llvm-17.patch <file://0001-gallium-fix-build-with-llvm-17.patch/> \ file://0001-drisw-fix-build-without-dri3.patch <file://0001-drisw-fix-build-without-dri3.patch/> \file://0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch <file://0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch/> \
+
file://0001-Revert-meson-do-not-pull-in-clc-for-clover.patch <file://0001-revert-meson-do-not-pull-in-clc-for-clover.patch/> \
"SRC_URI[sha256sum] =
"94e28a8edad06d8ed2b83eb53f253b9eb5aa62c3080f939702e1b3039b56c9e8" --
2.44.0-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#196862): <https://lists.openembedded.org/g/openembedded-core/message/196862>
Mute This Topic: <https://lists.openembedded.org/mt/104817623/3618223>
Group Owner: [email protected] <mailto:[email protected]>
Unsubscribe: <https://lists.openembedded.org/g/openembedded-core/unsub> [[email protected] <mailto:[email protected]>]
-=-=-=-=-=-=-=-=-=-=-=-