From 83b5c1abc6ccaa5807f931e914842d181ab2410a Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Mon, 17 Aug 2020 20:30:47 +0200 Subject: [PATCH] egl/android: simplify dri2_initialize_android() 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_android.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c index 9d3598726d4..3f11147bf09 100644 --- a/src/egl/drivers/dri2/platform_android.c +++ b/src/egl/drivers/dri2/platform_android.c @@ -1601,10 +1601,7 @@ dri2_initialize_android(_EGLDisplay *disp) } disp->DriverData = (void *) dri2_dpy; - if (!disp->Options.ForceSoftware) - device_opened = droid_open_device(disp, false); - if (!device_opened) - device_opened = droid_open_device(disp, true); + device_opened = droid_open_device(disp, disp->Options.ForceSoftware); if (!device_opened) { err = "DRI2: failed to open device"; -- 2.30.2