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

glx: Guard usage of infer_zink && !explicit_zink in glxext.c

Browse source 
Fixes: 2569215f43 ("egl/glx: add fallback for zink loading")

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18749>
This commit is contained in:
Yonggang Luo 2022-09-22 17:43:08 +08:00 • committed by Marge Bot
parent ef9e63820c
commit ffab4c8cb7
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/glx/glxext.c
View file

@ -974,6 +974,7 @@ __glXInitialize(Display * dpy)
#endif
if (!AllocAndFetchScreenConfigs(dpy, dpyPriv)) {
#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
Bool fail = true;
/* if zink was inferred, retry without zink */
if (infer_zink && !explicit_zink) {
@ -985,6 +986,10 @@ __glXInitialize(Display * dpy)
free(dpyPriv);
return NULL;
}
#else
free(dpyPriv);
return NULL;
#endif
}
__glX_send_client_info(dpyPriv);