Mesa (main): gallium/dri: Guard DRI driver global variables on MacOS if Zink is enabled.
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Jun 4 09:27:08 UTC 2021
Module: Mesa
Branch: main
Commit: 3102892fb8f17527bdd7fbf74bb5a1d6c857facf
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3102892fb8f17527bdd7fbf74bb5a1d6c857facf
Author: Duncan Hopkins <duncan at thefoundry.co.uk>
Date: Thu Jun 3 15:32:29 2021 +0100
gallium/dri: Guard DRI driver global variables on MacOS if Zink is enabled.
Protect the DRI galliumdrm_driver_api and galliumdrm_driver_extensions variables from __APPLE__ builds, as DRI2 cannot be enabled.
Reviewed-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11129>
---
src/gallium/targets/dri/target.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/gallium/targets/dri/target.c b/src/gallium/targets/dri/target.c
index 3ecc6159612..9df8da61803 100644
--- a/src/gallium/targets/dri/target.c
+++ b/src/gallium/targets/dri/target.c
@@ -118,7 +118,7 @@ DEFINE_LOADER_DRM_ENTRYPOINT(sun4i_drm)
DEFINE_LOADER_DRM_ENTRYPOINT(lima)
#endif
-#if defined(GALLIUM_ZINK)
+#if defined(GALLIUM_ZINK) && !defined(__APPLE__)
DEFINE_LOADER_DRM_ENTRYPOINT(zink);
#endif
More information about the mesa-commit
mailing list