From 82955b48aaa8c76abd5b497a50c52ee2755fbeb2 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Fri, 19 Jul 2024 10:00:29 -0400
Subject: [PATCH] glx: use base screen has_multibuffer for drisw

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

diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c
index 2bb8e8ab8bb..019bc8ef489 100644
--- a/src/glx/drisw_glx.c
+++ b/src/glx/drisw_glx.c
@@ -728,7 +728,7 @@ driswCreateDrawable(struct glx_screen *base, XID xDrawable,
       pdp->driDrawable =
          kopper->createNewDrawable(psc->driScreen, config->driConfig, pdp,
          &(__DRIkopperDrawableInfo){
-            .multiplanes_available = psc->has_multibuffer,
+            .multiplanes_available = base->display->has_multibuffer,
             .is_pixmap = !(type & GLX_WINDOW_BIT),
          });
 
@@ -998,9 +998,7 @@ driswCreateScreen(int screen, struct glx_display *priv, enum glx_driver glx_driv
 
 #if defined(HAVE_DRI3)
    if (glx_driver) {
-      bool err;
-      psc->has_multibuffer = loader_dri3_check_multibuffer(XGetXCBConnection(priv->dpy), &err);
-      if (!psc->has_multibuffer &&
+      if (!priv->has_multibuffer &&
           !debug_get_bool_option("LIBGL_ALWAYS_SOFTWARE", false) &&
           !debug_get_bool_option("LIBGL_KOPPER_DRI2", false)) {
          /* only print error if zink was explicitly requested */
diff --git a/src/glx/drisw_priv.h b/src/glx/drisw_priv.h
index 7bdf6fe7278..7c7d770e9f4 100644
--- a/src/glx/drisw_priv.h
+++ b/src/glx/drisw_priv.h
@@ -52,8 +52,6 @@ struct drisw_screen
    const __DRIconfig **driver_configs;
 
    char *name;
-
-   bool has_multibuffer;
 };
 
 struct drisw_drawable