From 8078a938f5e7f90bc38fee5a4c3cdc87db9d9245 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Fri, 19 Jul 2024 07:54:34 -0400
Subject: [PATCH] glx: simplify zink init variables

no functional changes

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30375>
---
 src/glx/drisw_glx.c |  2 +-
 src/glx/glxclient.h |  2 +-
 src/glx/glxext.c    | 12 +++++-------
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c
index 5e4b1c948c3..bf225ae6f15 100644
--- a/src/glx/drisw_glx.c
+++ b/src/glx/drisw_glx.c
@@ -929,7 +929,7 @@ kopperGetSwapInterval(__GLXDRIdrawable *pdraw)
    return pdp->swapInterval;
 }
 
-static struct glx_screen *
+struct glx_screen *
 driswCreateScreenDriver(int screen, struct glx_display *priv,
                         const char *driver, bool driver_name_is_inferred)
 {
diff --git a/src/glx/glxclient.h b/src/glx/glxclient.h
index 3ba7699b428..9274d41316f 100644
--- a/src/glx/glxclient.h
+++ b/src/glx/glxclient.h
@@ -148,7 +148,7 @@ void dri3_destroy_display(__GLXDRIdisplay * dpy);
 struct glx_screen *dri2CreateScreen(int screen, struct glx_display * priv, bool driver_name_is_inferred);
 void dri2DestroyDisplay(__GLXDRIdisplay * dpy);
 
-struct glx_screen *driswCreateScreen(int screen, struct glx_display *priv, bool driver_name_is_inferred);
+struct glx_screen * driswCreateScreenDriver(int screen, struct glx_display *priv, const char *driver, bool driver_name_is_inferred);
 void driswDestroyDisplay(__GLXDRIdisplay * dpy);
 #endif
 
diff --git a/src/glx/glxext.c b/src/glx/glxext.c
index c1ad8356fb0..a73535a100c 100644
--- a/src/glx/glxext.c
+++ b/src/glx/glxext.c
@@ -885,7 +885,7 @@ __glXInitialize(Display * dpy)
    dpyPriv->glXDrawHash = __glxHashCreate();
 
    Bool zink = False;
-   Bool try_zink = False;
+   enum try_zink try_zink = TRY_ZINK_NO;
    const char *env = getenv("MESA_LOADER_DRIVER_OVERRIDE");
 
 #if defined(GLX_DIRECT_RENDERING) && (!defined(GLX_USE_APPLEGL) || defined(GLX_USE_APPLE))
@@ -893,7 +893,6 @@ __glXInitialize(Display * dpy)
    Bool glx_accel = !debug_get_bool_option("LIBGL_ALWAYS_SOFTWARE", false);
 
    zink = env && !strcmp(env, "zink");
-   try_zink = False;
 
    dpyPriv->drawHash = __glxHashCreate();
 
@@ -915,7 +914,7 @@ __glXInitialize(Display * dpy)
          dpyPriv->dri3Display = dri3_create_display(dpy);
          /* nouveau wants to fallback to zink so if we get a screen enable try_zink */
          if (dpyPriv->dri3Display)
-            try_zink = !debug_get_bool_option("LIBGL_KOPPER_DISABLE", false);
+            try_zink = !debug_get_bool_option("LIBGL_KOPPER_DISABLE", false) ? TRY_ZINK_INFER : TRY_ZINK_NO;
       }
 #endif /* HAVE_DRI3 */
 #if defined(HAVE_X11_DRI2)
@@ -925,13 +924,12 @@ __glXInitialize(Display * dpy)
 #if defined(HAVE_ZINK)
       if (!dpyPriv->dri3Display && !dpyPriv->dri2Display)
          try_zink = !debug_get_bool_option("LIBGL_KOPPER_DISABLE", false) &&
-                    !getenv("GALLIUM_DRIVER");
+                    !getenv("GALLIUM_DRIVER") ? TRY_ZINK_INFER : TRY_ZINK_NO;
 #endif /* HAVE_ZINK */
    }
 #endif /* GLX_USE_DRM */
    if (glx_direct)
-      dpyPriv->driswDisplay = driswCreateDisplay(dpy, zink ? TRY_ZINK_YES :
-                                                             try_zink ? TRY_ZINK_INFER : TRY_ZINK_NO);
+      dpyPriv->driswDisplay = driswCreateDisplay(dpy, zink ? TRY_ZINK_YES : try_zink);
 
 #ifdef GLX_USE_WINDOWSGL
    if (glx_direct && glx_accel)
@@ -946,7 +944,7 @@ __glXInitialize(Display * dpy)
    }
 #endif
 
-   if (!AllocAndFetchScreenConfigs(dpy, dpyPriv, zink | try_zink, zink || try_zink ? try_zink : !env)) {
+   if (!AllocAndFetchScreenConfigs(dpy, dpyPriv, zink || try_zink, !env)) {
       Bool fail = True;
 #if defined(GLX_DIRECT_RENDERING) && (!defined(GLX_USE_APPLEGL) || defined(GLX_USE_APPLE))
       if (try_zink) {