Mesa (main): egl: don't make LIBGL_ALWAYS_SOFTWARE and MESA_LOADER_DRIVER_OVERRIDE=zink exclusive

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 42ff02de14b9d680a35abce038affae854b00ae3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=42ff02de14b9d680a35abce038affae854b00ae3

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Mon Apr 11 10:31:40 2022 -0400

egl: don't make LIBGL_ALWAYS_SOFTWARE and MESA_LOADER_DRIVER_OVERRIDE=zink exclusive

Reviewed-by: Yonggang Luo <luoyonggang at gmail.com>
Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15857>

---

 src/egl/main/eglapi.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
index 0284931af02..d0238fe95e4 100644
--- a/src/egl/main/eglapi.c
+++ b/src/egl/main/eglapi.c
@@ -628,11 +628,10 @@ eglInitialize(EGLDisplay dpy, EGLint *major, EGLint *minor)
          env_var_as_boolean("LIBGL_ALWAYS_SOFTWARE", false);
       if (disp->Options.ForceSoftware)
          _eglLog(_EGL_DEBUG, "Found 'LIBGL_ALWAYS_SOFTWARE' set, will use a CPU renderer");
-      else {
-         const char *env = getenv("MESA_LOADER_DRIVER_OVERRIDE");
-         disp->Options.Zink = env && !strcmp(env, "zink");
-         disp->Options.ForceSoftware |= disp->Options.Zink;
-      }
+
+      const char *env = getenv("MESA_LOADER_DRIVER_OVERRIDE");
+      disp->Options.Zink = env && !strcmp(env, "zink");
+      disp->Options.ForceSoftware |= disp->Options.Zink;
 
       /**
        * Initialize the display using the driver's function.