egl: don't try the software path twice
authorEric Engestrom <eric.engestrom@imgtec.com>
Wed, 20 Dec 2017 15:53:10 +0000 (15:53 +0000)
committerEmil Velikov <emil.l.velikov@gmail.com>
Wed, 27 Dec 2017 22:31:56 +0000 (22:31 +0000)
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>
src/egl/main/egldriver.c

index ee3dc86e388512c291b0ccce27483fb71e66740c..218b3daef25bf476c601d074183178cb835c647d 100644 (file)
@@ -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);
    }