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 <eric@engestrom.ch>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6353>
diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c
index 96a8a88..b801186 100644
--- a/src/egl/drivers/dri2/platform_x11.c
+++ b/src/egl/drivers/dri2/platform_x11.c
@@ -1520,22 +1520,16 @@
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
