egl/wayland: simplify dri2_initialize_wayland()

eglInitialize() already handles the "retry using the software path"
logic, there's no need to repeat it here.

Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6353>
This commit is contained in:
Eric Engestrom 2020-08-17 20:32:12 +02:00 committed by Marge Bot
parent f7e0cdcf1a
commit bd385c424b

View file

@ -2098,16 +2098,10 @@ dri2_initialize_wayland_swrast(_EGLDisplay *disp)
EGLBoolean
dri2_initialize_wayland(_EGLDisplay *disp)
{
EGLBoolean initialized = EGL_FALSE;
if (!disp->Options.ForceSoftware)
initialized = dri2_initialize_wayland_drm(disp);
if (!initialized)
initialized = dri2_initialize_wayland_swrast(disp);
return initialized;
if (disp->Options.ForceSoftware)
return dri2_initialize_wayland_swrast(disp);
else
return dri2_initialize_wayland_drm(disp);
}
void