Mesa (main): egl: only check dri3 on X11

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 0fd066a1d7f64011fed63c64a1d3e3757ba5a55b
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=0fd066a1d7f64011fed63c64a1d3e3757ba5a55b

Author: antonino <antonino.manisca...@collabora.com>
Date:   Mon Jan  8 13:29:41 2024 +0100

egl: only check dri3 on X11

When mesa is built without support for X11 Zink will always refuse to
start unless `LIBGL_KOPPER_DRI2` is set.

Only perform this check on X11 where it is relevant.

Fixes: cedb534a176 ("egl/glx: don't load non-sw zink without dri3 support")
Reviewed-by: Daniel Stone <dani...@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26929>

---

 src/egl/drivers/dri2/egl_dri2.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index 2f4583f1a3a..16f6a096971 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -1072,6 +1072,8 @@ dri2_setup_extensions(_EGLDisplay *disp)
        dri2_dpy->dri3_major_version != -1 &&
        !dri2_dpy->multibuffers_available &&
 #endif
+       (disp->Platform == EGL_PLATFORM_X11_KHR ||
+        disp->Platform == EGL_PLATFORM_XCB_EXT) &&
        !debug_get_bool_option("LIBGL_KOPPER_DRI2", false))
       return EGL_FALSE;