KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

egl/sl: split out swrast probe into separate function 

Make the code a bit easier to read.

As a bonus point this makes it obvious that we forgot to call
_eglAddDevice() for the device - do so.

v2:
 - s/dpy/disp/ (Eric)
 - free(driver_name) on dri2_load_driver_swrast() failure (Eric)

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Mathias Fröhlich <Mathias.Froehlich@web.de> (v1)
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
This commit is contained in:
Emil Velikov 2019-02-19 14:08:06 +00:00 committed by Emil Velikov
parent b43b55d461
commit 893421f315
1 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/egl/drivers/dri2/platform_surfaceless.c
View File

@ -322,25 +322,30 @@ surfaceless_probe_device(_EGLDisplay *disp, bool swrast)
dri2_dpy->loader_extensions = NULL;
}
/* No DRM device, so attempt to fall back to software path w/o DRM. */
if (swrast) {
_eglLog(_EGL_DEBUG, "Falling back to surfaceless swrast without DRM.");
dri2_dpy->fd = -1;
dri2_dpy->driver_name = strdup("swrast");
if (!dri2_dpy->driver_name) {
return false;
}
return false;
}
if (dri2_load_driver_swrast(disp)) {
dri2_dpy->loader_extensions = swrast_loader_extensions;
return true;
}
static bool
surfaceless_probe_device_sw(_EGLDisplay *disp)
{
struct dri2_egl_display *dri2_dpy = disp->DriverData;
dri2_dpy->fd = -1;
disp->Device = _eglAddDevice(dri2_dpy->fd, true);
assert(disp->Device);
dri2_dpy->driver_name = strdup("swrast");
if (!dri2_dpy->driver_name)
return false;
if (!dri2_load_driver_swrast(disp)) {
free(dri2_dpy->driver_name);
dri2_dpy->driver_name = NULL;
return false;
}
return false;
dri2_dpy->loader_extensions = swrast_loader_extensions;
return true;
}
EGLBoolean
@ -364,9 +369,15 @@ dri2_initialize_surfaceless(_EGLDriver *drv, _EGLDisplay *disp)
"No hardware driver found, falling back to software rendering");
}
if (!driver_loaded && !surfaceless_probe_device(disp, true)) {
err = "DRI2: failed to load driver";
goto cleanup;
if (!driver_loaded)
driver_loaded = surfaceless_probe_device(disp, true);
if (!driver_loaded) {
_eglLog(_EGL_DEBUG, "Falling back to surfaceless swrast without DRM.");
if (!surfaceless_probe_device_sw(disp)) {
err = "DRI2: failed to load driver";
goto cleanup;
}
}
if (!dri2_create_screen(disp)) {