Mesa (master): egl: don't try the software path twice

[Emil Velikov]

Module: Mesa
Branch: master
Commit: e5a7ef0013cfd0d9514a04d2be1186b7d41532b7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e5a7ef0013cfd0d9514a04d2be1186b7d41532b7

Author: Eric Engestrom <eric.engestrom at imgtec.com>
Date:   Wed Dec 20 15:53:10 2017 +0000

egl: don't try the software path twice

Signed-off-by: Eric Engestrom <eric.engestrom at imgtec.com>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
Reported-by: Brendan King <Brendan.King at imgtec.com>

---

 src/egl/main/egldriver.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/egl/main/egldriver.c b/src/egl/main/egldriver.c
index ee3dc86e38..218b3daef2 100644
--- a/src/egl/main/egldriver.c
+++ b/src/egl/main/egldriver.c
@@ -88,7 +88,7 @@ _eglMatchDriver(_EGLDisplay *dpy)
       env_var_as_boolean("LIBGL_ALWAYS_SOFTWARE", false);
 
    best_drv = _eglMatchAndInitialize(dpy);
-   if (!best_drv) {
+   if (!best_drv && !dpy->Options.ForceSoftware) {
       dpy->Options.ForceSoftware = EGL_TRUE;
       best_drv = _eglMatchAndInitialize(dpy);
    }