From c3f51526ac483c68d5d6fd164aab0527670f670b Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Mon, 2 Oct 2017 11:34:52 +0100 Subject: [PATCH] egl/wayland: simplify LIBGL_ALWAYS_SOFTWARE logic MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Engestrom Reviewed-by: Nicolai Hähnle Reviewed-by: Emil Velikov --- 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 ae3347756bc..011dddfabf4 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; -- 2.30.2