mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-05-05 05:18:08 +02:00
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: b699d070a6 ("glx: set the loader_logger early and for everyone")
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4490>
(cherry picked from commit 22406da756)
This commit is contained in:
parent
88f89f7a10
commit
fc140276b4
2 changed files with 5 additions and 1 deletions
|
|
@ -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"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue