Mesa (master): egl/android: simplify dri2_initialize_android()
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Sep 1 18:46:31 UTC 2020
Module: Mesa
Branch: master
Commit: 83b5c1abc6ccaa5807f931e914842d181ab2410a
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=83b5c1abc6ccaa5807f931e914842d181ab2410a
Author: Eric Engestrom <eric at engestrom.ch>
Date: Mon Aug 17 20:30:47 2020 +0200
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 at engestrom.ch>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6353>
---
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";
More information about the mesa-commit
mailing list