Module: Mesa Branch: main Commit: 8fe667afbb6dca4510e9319cc0edeb998c9ed2d3 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8fe667afbb6dca4510e9319cc0edeb998c9ed2d3
Author: Yiwei Zhang <[email protected]> Date: Tue Sep 6 17:54:17 2022 +0000 loader: use os_get_option for driver override Android requires this to enable zink. Signed-off-by: Yiwei Zhang <[email protected]> Reviewed-By: Mike Blumenkrantz <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18453> --- src/loader/loader.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/loader/loader.c b/src/loader/loader.c index 4ebd5429ec0..7ac871cb4c2 100644 --- a/src/loader/loader.c +++ b/src/loader/loader.c @@ -48,6 +48,7 @@ #include <GL/internal/dri_interface.h> #include "loader.h" #include "util/os_file.h" +#include "util/os_misc.h" #ifdef HAVE_LIBDRM #include <xf86drm.h> @@ -561,9 +562,9 @@ loader_get_driver_for_fd(int fd) * and may be useful for some touch testing of i915 on an i965 host. */ if (geteuid() == getuid()) { - driver = getenv("MESA_LOADER_DRIVER_OVERRIDE"); - if (driver) - return strdup(driver); + const char *override = os_get_option("MESA_LOADER_DRIVER_OVERRIDE"); + if (override) + return strdup(override); } #if defined(HAVE_LIBDRM) && defined(USE_DRICONF)
