From 8e259dad4cf4848883d1e349c6fdd2f3ed1fdcdc Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Mon, 17 Aug 2020 20:32:45 +0200 Subject: [PATCH] egl/x11: simplify dri2_initialize_x11() eglInitialize() already handles the "retry using the software path" logic, there's no need to repeat it here. Signed-off-by: Eric Engestrom Reviewed-by: Emil Velikov Part-of: --- src/egl/drivers/dri2/platform_x11.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c index 96a8a88d725..b8011866234 100644 --- a/src/egl/drivers/dri2/platform_x11.c +++ b/src/egl/drivers/dri2/platform_x11.c @@ -1520,22 +1520,16 @@ dri2_initialize_x11_dri2(_EGLDisplay *disp) EGLBoolean dri2_initialize_x11(_EGLDisplay *disp) { - EGLBoolean initialized = EGL_FALSE; + if (disp->Options.ForceSoftware) + return dri2_initialize_x11_swrast(disp); - if (!disp->Options.ForceSoftware) { #ifdef HAVE_DRI3 - if (!env_var_as_boolean("LIBGL_DRI3_DISABLE", false)) - initialized = dri2_initialize_x11_dri3(disp); + if (!env_var_as_boolean("LIBGL_DRI3_DISABLE", false)) + if (dri2_initialize_x11_dri3(disp)) + return EGL_TRUE; #endif - if (!initialized) - initialized = dri2_initialize_x11_dri2(disp); - } - - if (!initialized) - initialized = dri2_initialize_x11_swrast(disp); - - return initialized; + return dri2_initialize_x11_dri2(disp); } void -- 2.30.2