Module: Mesa Branch: master Commit: c3f51526ac483c68d5d6fd164aab0527670f670b URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c3f51526ac483c68d5d6fd164aab0527670f670b
Author: Eric Engestrom <[email protected]> Date: Mon Oct 2 11:34:52 2017 +0100 egl/wayland: simplify LIBGL_ALWAYS_SOFTWARE logic Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Nicolai Hähnle <[email protected]> Reviewed-by: Emil Velikov <[email protected]> --- src/egl/drivers/dri2/platform_wayland.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c index ae3347756b..011dddfabf 100644 --- a/src/egl/drivers/dri2/platform_wayland.c +++ b/src/egl/drivers/dri2/platform_wayland.c @@ -1940,17 +1940,13 @@ dri2_initialize_wayland_swrast(_EGLDriver *drv, _EGLDisplay *disp) EGLBoolean dri2_initialize_wayland(_EGLDriver *drv, _EGLDisplay *disp) { - EGLBoolean initialized = EGL_TRUE; + EGLBoolean initialized = EGL_FALSE; - bool hw_accel = !env_var_as_boolean("LIBGL_ALWAYS_SOFTWARE", false); + if (!env_var_as_boolean("LIBGL_ALWAYS_SOFTWARE", false)) + initialized = dri2_initialize_wayland_drm(drv, disp); - if (hw_accel) { - if (!dri2_initialize_wayland_drm(drv, disp)) { - initialized = dri2_initialize_wayland_swrast(drv, disp); - } - } else { + if (!initialized) initialized = dri2_initialize_wayland_swrast(drv, disp); - } return initialized; _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
