From 48ebbe27779f2576f72aef9eed13c4e4da1115b3 Mon Sep 17 00:00:00 2001 From: "duncan.hopkins" Date: Mon, 16 Dec 2024 11:42:33 +0000 Subject: [PATCH] glx: Guard some of the bind_extensions() code with the same conditions as `glx_screen`s `frontend_screen` member. Configution like simple MacOS builds do not have `frontend_screen` and fail to build. Fixes: 34dea2b38eb336e0414d60b168b9209e029a8cad ("glx: unify extension binding") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12317 Tested-by: Yurii Kolesnykov Part-of: --- src/glx/glxext.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/glx/glxext.c b/src/glx/glxext.c index 8d7518e1f47..1ed850cac89 100644 --- a/src/glx/glxext.c +++ b/src/glx/glxext.c @@ -790,6 +790,7 @@ bind_extensions(struct glx_screen *psc, const char *driverName) __glXEnableDirectExtension(psc, "GLX_INTEL_swap_event"); } +#if defined(GLX_DIRECT_RENDERING) && (!defined(GLX_USE_APPLEGL) || defined(GLX_USE_APPLE)) mask = driGetAPIMask(psc->frontend_screen); __glXEnableDirectExtension(psc, "GLX_ARB_create_context"); @@ -846,6 +847,7 @@ bind_extensions(struct glx_screen *psc, const char *driverName) psc->keep_native_window_glx_drawable = keep_native_window_glx_drawable; } } +#endif }