egl/surfaceless: simplify dri2_initialize_surfaceless()

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:31:45 +02:00
committed by Marge Bot
parent 83b5c1abc6
commit f7e0cdcf1a

View File

@@ -326,15 +326,7 @@ dri2_initialize_surfaceless(_EGLDisplay *disp)
dri2_dpy->fd = -1;
disp->DriverData = (void *) dri2_dpy;
if (!disp->Options.ForceSoftware) {
driver_loaded = surfaceless_probe_device(disp, false);
if (!driver_loaded)
_eglLog(_EGL_WARNING,
"No hardware driver found, falling back to software rendering");
}
if (!driver_loaded)
driver_loaded = surfaceless_probe_device(disp, true);
driver_loaded = surfaceless_probe_device(disp, disp->Options.ForceSoftware);
if (!driver_loaded) {
_eglLog(_EGL_DEBUG, "Falling back to surfaceless swrast without DRM.");