From 568a4ca899762fe96fc9b34d2288d07e6656af87 Mon Sep 17 00:00:00 2001
From: "duncan.hopkins" <duncan.hopkins@foundry.com>
Date: Tue, 26 Nov 2024 10:19:44 +0000
Subject: [PATCH] glx: ignore zink check for has_explicit_modifiers and DRI3 on
 MacOS.

MacOS has neither of these so always fails to start up zink.

Reviewed-By: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32568>
---
 src/glx/glxext.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/glx/glxext.c b/src/glx/glxext.c
index 433230a6266..8d7518e1f47 100644
--- a/src/glx/glxext.c
+++ b/src/glx/glxext.c
@@ -1039,6 +1039,7 @@ __glXInitialize(Display * dpy)
    if (glx_direct)
       glx_driver |= GLX_DRIVER_SW;
 
+#if !defined(GLX_USE_APPLE)
    if (!dpyPriv->has_explicit_modifiers && glx_accel && !debug_get_bool_option("LIBGL_KOPPER_DRI2", false)) {
       if (glx_driver & GLX_DRIVER_ZINK_YES) {
          /* only print error if zink was explicitly requested */
@@ -1049,6 +1050,7 @@ __glXInitialize(Display * dpy)
       /* if no dri3 and not using dri2, disable zink */
       glx_driver &= ~GLX_DRIVER_ZINK_INFER;
    }
+#endif
 
 #ifdef GLX_USE_WINDOWSGL
    if (glx_direct && glx_accel)