fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-24 10:20:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

egl/dri2: use the right egl platform enum

Browse source 
this is otherwise completely broken and allows loading zink in all cases

Fixes: 0fd066a1d7 ("egl: only check dri3 on X11")

Acked-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27836>
(cherry picked from commit 571effdf08)
This commit is contained in:
Mike Blumenkrantz 2024-02-27 17:03:56 -05:00 • committed by Eric Engestrom
parent a2c0e08b45
commit 85338ceaf2
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -3374,7 +3374,7 @@
"description": "egl/dri2: use the right egl platform enum",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "0fd066a1d7f64011fed63c64a1d3e3757ba5a55b",
"notes": null

5
src/egl/drivers/dri2/egl_dri2.c
View file

@ -1072,8 +1072,9 @@ 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) &&
/* this is enum _egl_platform_type */
(disp->Platform == _EGL_PLATFORM_X11 ||
disp->Platform == _EGL_PLATFORM_XCB) &&
!debug_get_bool_option("LIBGL_KOPPER_DRI2", false))
return EGL_FALSE;