From 02ab51a61eed8fed5940cf88df71f536ce14f0e2 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 6 Feb 2024 09:47:10 +0100 Subject: [PATCH] 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") Signed-off-by: Romain Naour Reviewed-by: Antoine Coutant Part-of: --- src/glx/glxext.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/glx/glxext.c b/src/glx/glxext.c index 162e4ab8952..8770863eb7c 100644 --- a/src/glx/glxext.c +++ b/src/glx/glxext.c @@ -919,9 +919,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)