From 22406da75671438bf9de68bc47e2b8871e5fa3e6 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Tue, 7 Apr 2020 17:45:33 +0100 Subject: [PATCH 1/1] glx: omit loader_loader() for macOS Earlier commit added the code unconditionally, since the loader code itself is already built on macOS. Although it did not consider the #include mayhem that src/glx is. In particular, none of the __GLXDRI{screen,context,drawable) are available for macOS... those are pulled by dri_common.[ch]. Ideally we'll untangle that, but for the time being simply #ifdef out the include/call. Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/2726 Fixes: b699d070a6d ("glx: set the loader_logger early and for everyone") Signed-off-by: Emil Velikov Part-of: --- src/glx/glxext.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/glx/glxext.c b/src/glx/glxext.c index cbc59e80921..34e86ae734d 100644 --- a/src/glx/glxext.c +++ b/src/glx/glxext.c @@ -50,7 +50,9 @@ #include "glxextensions.h" #include "util/debug.h" +#ifndef GLX_USE_APPLEGL #include "dri_common.h" +#endif #include #include @@ -908,8 +910,10 @@ __glXInitialize(Display * dpy) dpyPriv->drawHash = __glxHashCreate(); +#ifndef GLX_USE_APPLEGL /* Set the logger before the *CreateDisplay functions. */ loader_set_logger(dri_message); +#endif /* ** Initialize the direct rendering per display data and functions. -- 2.30.2