From: Eric Engestrom <eric@engestrom.ch>
Date: Mon, 17 Aug 2020 18:30:47 +0000 (+0200)
Subject: egl/android: simplify dri2_initialize_android()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=83b5c1abc6ccaa5807f931e914842d181ab2410a;p=mesa.git

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 <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_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";