fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-23 03:00:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

egl/x11: consolidate LIBGL_DRI3_DISABLE use on init

Browse source 
Acked-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33891>
This commit is contained in:
Mike Blumenkrantz 2024-08-27 13:33:09 -04:00 • committed by Marge Bot
parent 4e405af61c
commit 0bb1c5e24b
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1992,6 +1992,7 @@ EGLBoolean
dri2_initialize_x11(_EGLDisplay *disp, bool *allow_dri2)
{
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
bool dri3_disable = debug_get_bool_option("LIBGL_DRI3_DISABLE", false);
/*
* Every hardware driver_name is set using strdup. Doing the same in
@ -2009,7 +2010,7 @@ dri2_initialize_x11(_EGLDisplay *disp, bool *allow_dri2)
/* kopper_without_modifiers really means (zink && LIBGL_DRI3_DISABLE=true),
* so this conditional is effectively "is dri3 enabled"
*/
if (!debug_get_bool_option("LIBGL_DRI3_DISABLE", false) &&
if (!dri3_disable &&
(!disp->Options.Zink || !debug_get_bool_option("LIBGL_KOPPER_DRI2", false))) {
bool status = dri3_x11_connect(dri2_dpy, disp->Options.Zink, disp->Options.ForceSoftware);
/* the status here is ignored for zink-with-kopper and swrast,
@ -2023,7 +2024,7 @@ dri2_initialize_x11(_EGLDisplay *disp, bool *allow_dri2)
return dri2_initialize_x11_swrast(disp);
#ifdef HAVE_LIBDRM
if (!debug_get_bool_option("LIBGL_DRI3_DISABLE", false)) {
if (!dri3_disable) {
if (dri2_initialize_x11_dri3(disp))
return EGL_TRUE;
}