From 08fc74663bea34d61761b02b6194cdef686baefe Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Thu, 8 Dec 2016 00:30:34 +0000 Subject: [PATCH] egl/x11: cleanup init code No functional change, just rewriting it in an easier-to-understand way. Signed-off-by: Eric Engestrom Reviewed-by: Emil Velikov --- src/egl/drivers/dri2/platform_x11.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c index df39ca8f192..db7d3b9ed1d 100644 --- a/src/egl/drivers/dri2/platform_x11.c +++ b/src/egl/drivers/dri2/platform_x11.c @@ -1467,25 +1467,21 @@ dri2_initialize_x11_dri2(_EGLDriver *drv, _EGLDisplay *disp) EGLBoolean dri2_initialize_x11(_EGLDriver *drv, _EGLDisplay *disp) { - EGLBoolean initialized = EGL_TRUE; + EGLBoolean initialized = EGL_FALSE; - int x11_dri2_accel = (getenv("LIBGL_ALWAYS_SOFTWARE") == NULL); + if (!getenv("LIBGL_ALWAYS_SOFTWARE")) { +#ifdef HAVE_DRI3 + if (!getenv("LIBGL_DRI3_DISABLE")) + initialized = dri2_initialize_x11_dri3(drv, disp); +#endif - if (x11_dri2_accel) { -#ifdef HAVE_DRI3 - if (getenv("LIBGL_DRI3_DISABLE") != NULL || - !dri2_initialize_x11_dri3(drv, disp)) { -#endif - if (!dri2_initialize_x11_dri2(drv, disp)) { - initialized = dri2_initialize_x11_swrast(drv, disp); - } -#ifdef HAVE_DRI3 - } -#endif - } else { - initialized = dri2_initialize_x11_swrast(drv, disp); + if (!initialized) + initialized = dri2_initialize_x11_dri2(drv, disp); } + if (!initialized) + initialized = dri2_initialize_x11_swrast(drv, disp); + return initialized; }