diff options
Diffstat (limited to 'meta/recipes-graphics/mesa/files/0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch')
-rw-r--r-- | meta/recipes-graphics/mesa/files/0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/meta/recipes-graphics/mesa/files/0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch b/meta/recipes-graphics/mesa/files/0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch new file mode 100644 index 0000000000..036a0b4945 --- /dev/null +++ b/meta/recipes-graphics/mesa/files/0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | From 62495ebb977866c52d5bed8499a547c49f0d9bc1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Romain Naour <romain.naour@smile.fr> | ||
3 | Date: Tue, 6 Feb 2024 09:47:10 +0100 | ||
4 | Subject: [PATCH 2/2] glxext: don't try zink if not enabled in mesa | ||
5 | |||
6 | Commit 7d9ea77b459 ("glx: add automatic zink fallback loading between hw and sw drivers") | ||
7 | added an automatic zink fallback even when the zink gallium is not | ||
8 | enabled at build time. | ||
9 | |||
10 | It leads to unexpected error log while loading drisw driver and | ||
11 | zink is not installed on the rootfs: | ||
12 | |||
13 | MESA-LOADER: failed to open zink: /usr/lib/dri/zink_dri.so | ||
14 | |||
15 | Fixes: 7d9ea77b459 ("glx: add automatic zink fallback loading between hw and sw drivers") | ||
16 | |||
17 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27478] | ||
18 | Signed-off-by: Romain Naour <romain.naour@smile.fr> | ||
19 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
20 | --- | ||
21 | src/glx/glxext.c | 2 ++ | ||
22 | 1 file changed, 2 insertions(+) | ||
23 | |||
24 | diff --git a/src/glx/glxext.c b/src/glx/glxext.c | ||
25 | index 05c825a..7a06aa9 100644 | ||
26 | --- a/src/glx/glxext.c | ||
27 | +++ b/src/glx/glxext.c | ||
28 | @@ -908,9 +908,11 @@ __glXInitialize(Display * dpy) | ||
29 | #endif /* HAVE_DRI3 */ | ||
30 | if (!debug_get_bool_option("LIBGL_DRI2_DISABLE", false)) | ||
31 | dpyPriv->dri2Display = dri2CreateDisplay(dpy); | ||
32 | +#if defined(HAVE_ZINK) | ||
33 | if (!dpyPriv->dri3Display && !dpyPriv->dri2Display) | ||
34 | try_zink = !debug_get_bool_option("LIBGL_KOPPER_DISABLE", false) && | ||
35 | !getenv("GALLIUM_DRIVER"); | ||
36 | +#endif /* HAVE_ZINK */ | ||
37 | } | ||
38 | #endif /* GLX_USE_DRM */ | ||
39 | if (glx_direct) | ||
40 | -- | ||
41 | 2.44.0 | ||
42 | |||