From 6366a8992f30f95abfec8342b372d2c2987b2042 Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Fri, 4 Jul 2025 15:23:06 -0400
Subject: [PATCH] egl/x11: Stop mixing kopper and swrast extensions

Neither has any dependence on the other.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36014>
---
 src/egl/drivers/dri2/egl_dri2.c     | 11 +++++++++++
 src/egl/drivers/dri2/platform_x11.c |  5 +----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index 60681bdea0a..2798a358d28 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -154,6 +154,16 @@ dri2_get_pbuffer_drawable_info(struct dri_drawable *draw, int *x, int *y, int *w
    *h = dri2_surf->base.Height;
 }
 
+static void
+dri2_kopper_get_pbuffer_drawable_info(struct dri_drawable *draw,
+                                      int *w, int *h, void *loaderPrivate)
+{
+   struct dri2_egl_surface *dri2_surf = loaderPrivate;
+
+   *w = dri2_surf->base.Width;
+   *h = dri2_surf->base.Height;
+}
+
 static int
 dri2_get_bytes_per_pixel(struct dri2_egl_surface *dri2_surf)
 {
@@ -245,6 +255,7 @@ const __DRIswrastLoaderExtension swrast_pbuffer_loader_extension = {
 
 const __DRIkopperLoaderExtension kopper_pbuffer_loader_extension = {
    .base = {__DRI_KOPPER_LOADER, 1},
+   .GetDrawableInfo = dri2_kopper_get_pbuffer_drawable_info,
    .SetSurfaceCreateInfo = NULL,
 };
 
diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c
index a5aa04fa221..9e1ee2efe98 100644
--- a/src/egl/drivers/dri2/platform_x11.c
+++ b/src/egl/drivers/dri2/platform_x11.c
@@ -1073,23 +1073,20 @@ static const __DRIkopperLoaderExtension kopper_loader_extension = {
 };
 
 static const __DRIextension *kopper_loader_extensions[] = {
-   &swrast_loader_extension.base,
-   &image_lookup_extension.base,
    &kopper_loader_extension.base,
+   &image_lookup_extension.base,
    NULL,
 };
 
 static const __DRIextension *swrast_loader_extensions[] = {
    &swrast_loader_extension.base,
    &image_lookup_extension.base,
-   &kopper_loader_extension.base,
    NULL,
 };
 
 static const __DRIextension *swrast_loader_shm_extensions[] = {
    &swrast_loader_shm_extension.base,
    &image_lookup_extension.base,
-   &kopper_loader_extension.base,
    NULL,
 };