From: Eric Engestrom <eric.engestrom@imgtec.com>
Date: Mon, 2 Oct 2017 10:34:52 +0000 (+0100)
Subject: egl/wayland: simplify LIBGL_ALWAYS_SOFTWARE logic
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c3f51526ac483c68d5d6fd164aab0527670f670b;p=mesa.git

egl/wayland: simplify LIBGL_ALWAYS_SOFTWARE logic

Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
---

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;