forked from brl/citadel
Bruce Leidl
4831a46764
Recipes updated: adwaita-icon-theme 43 --> 46.0 cairomm 1.12.0 --> 1.18 gdm 42.0 --> 45.0 glibmm 2.62.0 --> 2.78.0 gjs 1.77.90 --> 1.80.0 gnome-backgrounds 45.0 --> 46.0 gnome-bluetooth 42.4 --> 46.0 gnome-control-center 45.0 --> 46.0 gnome-disk-utility 42.0 --> 46.0 gnome-session 42.0 --> 46.0 gnome-settings-daemon 45.0 --> 46.0 gnome-shell 45.0 --> 46.0 gnome-system-monitor 42.0 --> 46.0 gsettings-desktop-schemas 45.0 --> 46.0 gtk4 4.12.1 --> 4.14.1 gvfs 1.50.2 --> 1.54.0 libadwaita 1.4.0 --> 1.5.0 libgtop 2.40.0 --> 2.41.3 libgweather4 4.2.0 --> 4.4.2 libwacom 0.26 --> 2.8.0 mutter 45.0 --> 46.0 pangomm 2.46.2 --> 2.50.1 New recipes added: pipewire 1.0.4 wireplumber 0.5.0 doxygen 1.9.3 gcr 4.2.0 rtkit 0.13 libopus 1.5.1 libjxl 0.10.2 wayland gtkmm4 4.14.0
43 lines
1.5 KiB
Diff
43 lines
1.5 KiB
Diff
From 62495ebb977866c52d5bed8499a547c49f0d9bc1 Mon Sep 17 00:00:00 2001
|
|
From: Romain Naour <romain.naour@smile.fr>
|
|
Date: Tue, 6 Feb 2024 09:47:10 +0100
|
|
Subject: [PATCH 2/2] glxext: don't try zink if not enabled in mesa
|
|
|
|
Commit 7d9ea77b459 ("glx: add automatic zink fallback loading between hw and sw drivers")
|
|
added an automatic zink fallback even when the zink gallium is not
|
|
enabled at build time.
|
|
|
|
It leads to unexpected error log while loading drisw driver and
|
|
zink is not installed on the rootfs:
|
|
|
|
MESA-LOADER: failed to open zink: /usr/lib/dri/zink_dri.so
|
|
|
|
Fixes: 7d9ea77b459 ("glx: add automatic zink fallback loading between hw and sw drivers")
|
|
|
|
Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27478]
|
|
Signed-off-by: Romain Naour <romain.naour@smile.fr>
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
---
|
|
src/glx/glxext.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/src/glx/glxext.c b/src/glx/glxext.c
|
|
index 05c825a..7a06aa9 100644
|
|
--- a/src/glx/glxext.c
|
|
+++ b/src/glx/glxext.c
|
|
@@ -908,9 +908,11 @@ __glXInitialize(Display * dpy)
|
|
#endif /* HAVE_DRI3 */
|
|
if (!debug_get_bool_option("LIBGL_DRI2_DISABLE", false))
|
|
dpyPriv->dri2Display = dri2CreateDisplay(dpy);
|
|
+#if defined(HAVE_ZINK)
|
|
if (!dpyPriv->dri3Display && !dpyPriv->dri2Display)
|
|
try_zink = !debug_get_bool_option("LIBGL_KOPPER_DISABLE", false) &&
|
|
!getenv("GALLIUM_DRIVER");
|
|
+#endif /* HAVE_ZINK */
|
|
}
|
|
#endif /* GLX_USE_DRM */
|
|
if (glx_direct)
|
|
--
|
|
2.44.0
|
|
|