diff options
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/glx/glxext.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json index 7816f86dca5..4dbb12bce16 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -67,7 +67,7 @@ "description": "glx: omit loader_loader() for macOS", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "b699d070a6de273fb3a964e05944b203d0b57090" }, 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 <X11/Xlib-xcb.h> #include <xcb/xcb.h> @@ -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. |