[Mesa-dev] [PATCH mesa] egl/wayland: simplify LIBGL_ALWAYS_SOFTWARE logic

[Nicolai Hähnle]

On 02.10.2017 12:35, Eric Engestrom wrote:
> Signed-off-by: Eric Engestrom <eric.engestrom at imgtec.com>

Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>


> ---
>   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 ae3347756bc1a4629b69..011dddfabf422f30cb6c 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;
>   
> 


-- 
Lerne, wie die Welt wirklich ist,
Aber vergiss niemals, wie sie sein sollte.