Module: Mesa
Branch: staging/23.3
Commit: 04b3e4a4f221fe726347ab52c57f9bd5f35c9754
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=04b3e4a4f221fe726347ab52c57f9bd5f35c9754
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>
(cherry picked from commit 0fd066a1d7f64011fed63c64a1d3e3757ba5a55b)
---
.pick_status.json | 2 +-
src/egl/drivers/dri2/egl_dri2.c | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/.pick_status.json b/.pick_status.json
index ba9a2edf7b5..33b132d036e 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -84,7 +84,7 @@
"description": "egl: only check dri3 on X11",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"main_sha": null,
"because_sha": "cedb534a1763b6bd3c733d439e5d145ae6f1270e",
"notes": null
diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index 1ad4e9a4273..e0dd739e832 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -1067,6 +1067,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;
