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

egl/wayland: bail on zink init in non-sw mode if extension check fails

Browse source 
cc: mesa-stable

Acked-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30479>
This commit is contained in:
Mike Blumenkrantz 2024-08-01 15:24:03 -04:00 • committed by Marge Bot
parent 4e777bb19b
commit d120992e1a
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/egl/drivers/dri2/platform_wayland.c
View file

@ -2949,8 +2949,10 @@ dri2_initialize_wayland_swrast(_EGLDisplay *disp)
dri2_dpy->formats.num_formats))
goto cleanup;
if (disp->Options.Zink)
dri2_initialize_wayland_drm_extensions(dri2_dpy);
if (disp->Options.Zink) {
if (!dri2_initialize_wayland_drm_extensions(dri2_dpy) && !disp->Options.ForceSoftware)
goto cleanup;
}
dri2_dpy->driver_name = strdup(disp->Options.Zink ? "zink" : "swrast");
if (!dri2_load_driver(disp))