fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 05:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

glx: Drop LIBGL_DRI3_DISABLE

Browse source 
We no longer support DIR2 so there's nothing to fall back to if you
disable DRI3.

Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36054>
This commit is contained in:
Faith Ekstrand 2025-07-10 12:08:21 -04:00 • committed by Marge Bot
parent 95f1f334ca
commit 246c588ab2
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/glx/glxext.c
View file

@ -990,7 +990,6 @@ __glXInitialize(Display * dpy)
#if defined(GLX_DIRECT_RENDERING) && (!defined(GLX_USE_APPLEGL) || defined(GLX_USE_APPLE))
Bool glx_direct = !debug_get_bool_option("LIBGL_ALWAYS_INDIRECT", false);
Bool glx_accel = !debug_get_bool_option("LIBGL_ALWAYS_SOFTWARE", false);
Bool dri3 = !debug_get_bool_option("LIBGL_DRI3_DISABLE", false);
Bool kopper = !debug_get_bool_option("LIBGL_KOPPER_DISABLE", false);
if (env && !strcmp(env, "zink"))
@ -1009,20 +1008,15 @@ __glXInitialize(Display * dpy)
** (e.g., those called in AllocAndFetchScreenConfigs).
*/
#if defined(GLX_USE_DRM)
bool dri3_err = false;
if (glx_direct && glx_accel && dri3)
if (glx_direct && glx_accel)
dpyPriv->has_multibuffer = x11_dri3_has_multibuffer(XGetXCBConnection(dpy));
if (glx_direct && glx_accel &&
(!(glx_driver & GLX_DRIVER_ZINK_YES) || !kopper)) {
if (dri3) {
/* dri3 is tried as long as this doesn't error; whether modifiers work is not relevant */
if (!dri3_err) {
glx_driver |= GLX_DRIVER_DRI3;
/* nouveau wants to fallback to zink so if we get a screen enable try_zink */
if (!debug_get_bool_option("LIBGL_KOPPER_DISABLE", false))
glx_driver |= GLX_DRIVER_ZINK_INFER;
}
}
/* dri3 is tried as long as this doesn't error; whether modifiers work is not relevant */
glx_driver |= GLX_DRIVER_DRI3;
/* nouveau wants to fallback to zink so if we get a screen enable try_zink */
if (!debug_get_bool_option("LIBGL_KOPPER_DISABLE", false))
glx_driver |= GLX_DRIVER_ZINK_INFER;
#if defined(HAVE_ZINK)
if (!(glx_driver & GLX_DRIVER_DRI3))
if (kopper && !getenv("GALLIUM_DRIVER"))