OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

egl/x11: simplify dri2_initialize_x11()

Browse Source 
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>
This commit is contained in:
Eric Engestrom
2020-08-17 20:32:45 +02:00
committed by Marge Bot
parent bd385c424b
commit 8e259dad4c
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/egl/drivers/dri2/platform_x11.c
View File

@@ -1520,22 +1520,16 @@ dri2_initialize_x11_dri2(_EGLDisplay *disp)
EGLBoolean EGLBoolean
dri2_initialize_x11(_EGLDisplay *disp) 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 #ifdef HAVE_DRI3
if (!env_var_as_boolean("LIBGL_DRI3_DISABLE", false)) if (!env_var_as_boolean("LIBGL_DRI3_DISABLE", false))
initialized = dri2_initialize_x11_dri3(disp); if (dri2_initialize_x11_dri3(disp))
return EGL_TRUE;
#endif #endif
if (!initialized) return dri2_initialize_x11_dri2(disp);
initialized = dri2_initialize_x11_dri2(disp);
}
if (!initialized)
initialized = dri2_initialize_x11_swrast(disp);
return initialized;
} }
void void