OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glx: consolidate some LIBGL_KOPPER_DISABLE checks

Browse Source 
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30375>
This commit is contained in:
Mike Blumenkrantz
2024-07-19 10:12:32 -04:00
committed by Marge Bot
parent 725875cdea
commit 8994165e92
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/glx/glxext.c
View File

@@ -881,6 +881,7 @@ __glXInitialize(Display * dpy)
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"))
glx_driver |= GLX_DRIVER_ZINK_YES;
@@ -902,7 +903,7 @@ __glXInitialize(Display * dpy)
if (glx_direct && glx_accel && dri3)
dpyPriv->has_multibuffer = loader_dri3_check_multibuffer(XGetXCBConnection(dpy), &dri3_err);
if (glx_direct && glx_accel &&
(!(glx_driver & GLX_DRIVER_ZINK_YES) || debug_get_bool_option("LIBGL_KOPPER_DISABLE", false))) {
(!(glx_driver & GLX_DRIVER_ZINK_YES) || !kopper)) {
#if defined(HAVE_DRI3)
if (dri3) {
/* dri3 is tried as long as this doesn't error; whether modifiers work is not relevant */
@@ -920,7 +921,7 @@ __glXInitialize(Display * dpy)
#endif
#if defined(HAVE_ZINK)
if (!(glx_driver & (GLX_DRIVER_DRI2 | GLX_DRIVER_DRI3)))
if (!debug_get_bool_option("LIBGL_KOPPER_DISABLE", false) && !getenv("GALLIUM_DRIVER"))
if (kopper && !getenv("GALLIUM_DRIVER"))
glx_driver |= GLX_DRIVER_ZINK_INFER;
#endif /* HAVE_ZINK */
}