From f5dd5e4b4404aa3f18697cebde3de82edf01281f Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Thu, 25 Jul 2024 07:02:50 -0400
Subject: [PATCH] glx: delete __DRImesaCoreExtension usage

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30400>
---
 src/glx/dri2_glx.c   | 1 -
 src/glx/dri2_priv.h  | 1 -
 src/glx/dri3_glx.c   | 6 ------
 src/glx/dri3_priv.h  | 1 -
 src/glx/drisw_glx.c  | 1 -
 src/glx/drisw_priv.h | 1 -
 6 files changed, 11 deletions(-)

diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c
index e4478b0731e..6ea7527395f 100644
--- a/src/glx/dri2_glx.c
+++ b/src/glx/dri2_glx.c
@@ -1024,7 +1024,6 @@ dri2CreateScreen(int screen, struct glx_display * priv, bool driver_name_is_infe
 
    static const struct dri_extension_match exts[] = {
        { __DRI_DRI2, 5, offsetof(struct dri2_screen, dri2), false },
-       { __DRI_MESA, 2, offsetof(struct dri2_screen, mesa), false },
    };
    if (!loader_bind_extensions(psc, exts, ARRAY_SIZE(exts), extensions))
       goto handle_error;
diff --git a/src/glx/dri2_priv.h b/src/glx/dri2_priv.h
index a5f69aaed69..b56ecbf8133 100644
--- a/src/glx/dri2_priv.h
+++ b/src/glx/dri2_priv.h
@@ -45,7 +45,6 @@ struct dri2_screen {
    __DRIscreen *driScreen;
    __GLXDRIscreen vtable;
    const __DRIdri2Extension *dri2;
-   const __DRImesaCoreExtension *mesa;
 
    const __DRI2flushExtension *f;
    const __DRI2configQueryExtension *config;
diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c
index d5f591f84bc..752c365101a 100644
--- a/src/glx/dri3_glx.c
+++ b/src/glx/dri3_glx.c
@@ -838,12 +838,6 @@ dri3_create_screen(int screen, struct glx_display * priv, bool driver_name_is_in
    if (extensions == NULL)
       goto handle_error;
 
-   static const struct dri_extension_match exts[] = {
-       { __DRI_MESA, 2, offsetof(struct dri3_screen, mesa), false },
-   };
-   if (!loader_bind_extensions(psc, exts, ARRAY_SIZE(exts), extensions))
-      goto handle_error;
-
    if (psc->fd_render_gpu != psc->fd_display_gpu) {
       driverNameDisplayGPU = loader_get_driver_for_fd(psc->fd_display_gpu);
       if (driverNameDisplayGPU) {
diff --git a/src/glx/dri3_priv.h b/src/glx/dri3_priv.h
index ce552af9a05..0c0af2c2a3b 100644
--- a/src/glx/dri3_priv.h
+++ b/src/glx/dri3_priv.h
@@ -80,7 +80,6 @@ struct dri3_screen {
    __DRIscreen *driScreenRenderGPU;
 
    const __DRIimageExtension *image;
-   const __DRImesaCoreExtension *mesa;
    const __DRI2flushExtension *f;
    const __DRI2configQueryExtension *config;
    const __DRItexBufferExtension *texBuffer;
diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c
index 84a067ca817..6ffbb5f6c13 100644
--- a/src/glx/drisw_glx.c
+++ b/src/glx/drisw_glx.c
@@ -965,7 +965,6 @@ driswCreateScreen(int screen, struct glx_display *priv, enum glx_driver glx_driv
        { __DRI_SWRAST, 5, offsetof(struct drisw_screen, swrast), false },
        { __DRI_KOPPER, 1, offsetof(struct drisw_screen, kopper), true },
        { __DRI_COPY_SUB_BUFFER, 1, offsetof(struct drisw_screen, copySubBuffer), true },
-       { __DRI_MESA, 2, offsetof(struct drisw_screen, mesa), false },
    };
    if (!loader_bind_extensions(psc, exts, ARRAY_SIZE(exts), extensions))
       goto handle_error;
diff --git a/src/glx/drisw_priv.h b/src/glx/drisw_priv.h
index 2360437eae8..d34a5abb914 100644
--- a/src/glx/drisw_priv.h
+++ b/src/glx/drisw_priv.h
@@ -39,7 +39,6 @@ struct drisw_screen
 
    __DRIscreen *driScreen;
    __GLXDRIscreen vtable;
-   const __DRImesaCoreExtension *mesa;
    const __DRIswrastExtension *swrast;
    const __DRIkopperExtension *kopper;
    const __DRI2flushExtension *f;