OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loader: use os_get_option for driver override

Browse Source 
Android requires this to enable zink.

Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org>
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18453>
This commit is contained in:
Yiwei Zhang
2022-09-06 17:54:17 +00:00
committed by Marge Bot
parent d0cb99e96a
commit 8fe667afbb
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/loader/loader.c
View File

@@ -48,6 +48,7 @@
#include <GL/internal/dri_interface.h> #include <GL/internal/dri_interface.h>
#include "loader.h" #include "loader.h"
#include "util/os_file.h" #include "util/os_file.h"
#include "util/os_misc.h"
#ifdef HAVE_LIBDRM #ifdef HAVE_LIBDRM
#include <xf86drm.h> #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. * and may be useful for some touch testing of i915 on an i965 host.
*/ */
if (geteuid() == getuid()) { if (geteuid() == getuid()) {
driver = getenv("MESA_LOADER_DRIVER_OVERRIDE"); const char *override = os_get_option("MESA_LOADER_DRIVER_OVERRIDE");
if (driver) if (override)
return strdup(driver); return strdup(override);
} }
#if defined(HAVE_LIBDRM) && defined(USE_DRICONF) #if defined(HAVE_LIBDRM) && defined(USE_DRICONF)