From: Eric Engestrom <eric.engestrom@imgtec.com>
Date: Wed, 20 Dec 2017 15:53:10 +0000 (+0000)
Subject: egl: don't try the software path twice
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e5a7ef0013cfd0d9514a04d2be1186b7d41532b7;p=mesa.git

egl: don't try the software path twice

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

diff --git a/src/egl/main/egldriver.c b/src/egl/main/egldriver.c
index ee3dc86e388..218b3daef25 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);
    }