diff options
Diffstat (limited to 'meta/recipes-graphics/mesa/files/0001-Revert-meson-do-not-pull-in-clc-for-clover.patch')
-rw-r--r-- | meta/recipes-graphics/mesa/files/0001-Revert-meson-do-not-pull-in-clc-for-clover.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/meta/recipes-graphics/mesa/files/0001-Revert-meson-do-not-pull-in-clc-for-clover.patch b/meta/recipes-graphics/mesa/files/0001-Revert-meson-do-not-pull-in-clc-for-clover.patch new file mode 100644 index 0000000000..1711e22585 --- /dev/null +++ b/meta/recipes-graphics/mesa/files/0001-Revert-meson-do-not-pull-in-clc-for-clover.patch | |||
@@ -0,0 +1,53 @@ | |||
1 | From 051f41beda540f0ae77b341db01a6de83c9e938a Mon Sep 17 00:00:00 2001 | ||
2 | From: Markus Volk <f_l_k@t-online.de> | ||
3 | Date: Fri, 8 Mar 2024 15:53:11 +0100 | ||
4 | Subject: [PATCH] Revert "meson: do not pull in clc for clover" | ||
5 | |||
6 | This reverts commit 815a6647eb1383e9dc704ffcc266d85f3b13338a. | ||
7 | Upstream-Status: Inappropriate [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27783/diffs?commit_id=a976f2c9f0c07f9e06cc9affd9124b45bc60c2bd] | ||
8 | |||
9 | Once the merge request above was added, it will only be possible to provide opencl spir-v with gallium-rusticl=true. This is not yet supported in the mesa recipe. | ||
10 | For now reverting this commit allows to still use clover with opencl-spirv, which would otherwise be broken starting from mesa 24.0.2. | ||
11 | |||
12 | After it was merged, this patch needs to be removed and rusticl support will be required | ||
13 | |||
14 | Signed-off-by: Markus Volk <f_l_k@t-online.de> | ||
15 | --- | ||
16 | meson.build | 3 ++- | ||
17 | src/compiler/meson.build | 2 +- | ||
18 | 2 files changed, 3 insertions(+), 2 deletions(-) | ||
19 | |||
20 | diff --git a/meson.build b/meson.build | ||
21 | index 2db6185..741b5d1 100644 | ||
22 | --- a/meson.build | ||
23 | +++ b/meson.build | ||
24 | @@ -813,6 +813,7 @@ if _opencl != 'disabled' | ||
25 | error('The Clover OpenCL state tracker requires rtti') | ||
26 | endif | ||
27 | |||
28 | + with_clc = true | ||
29 | with_gallium_opencl = true | ||
30 | with_opencl_icd = _opencl == 'icd' | ||
31 | else | ||
32 | @@ -837,7 +838,7 @@ if with_gallium_rusticl | ||
33 | endif | ||
34 | |||
35 | dep_clc = null_dep | ||
36 | -if with_gallium_opencl or with_clc | ||
37 | +if with_clc | ||
38 | dep_clc = dependency('libclc') | ||
39 | endif | ||
40 | |||
41 | diff --git a/src/compiler/meson.build b/src/compiler/meson.build | ||
42 | index 8d73544..1dae56d 100644 | ||
43 | --- a/src/compiler/meson.build | ||
44 | +++ b/src/compiler/meson.build | ||
45 | @@ -79,7 +79,7 @@ subdir('nir') | ||
46 | |||
47 | subdir('spirv') | ||
48 | |||
49 | -if with_clc | ||
50 | +if with_opencl_spirv | ||
51 | subdir('clc') | ||
52 | endif | ||
53 | if with_gallium | ||