From 8840fac91d1837f63280089953f00a434ca0def6 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Wed, 29 May 2024 10:20:26 +0200
Subject: [PATCH] egl: fix teardown when using xcb

cc: mesa-stable

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29459>
(cherry picked from commit 54dd83e736425143de8f5f8d4cb0688e9837b035)
---
 .pick_status.json               | 2 +-
 src/egl/drivers/dri2/egl_dri2.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index e22f18184c8..d24861a72cc 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -304,7 +304,7 @@
         "description": "egl: fix teardown when using xcb",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index dd345924b1b..23a6001f44c 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -1167,6 +1167,7 @@ dri2_display_destroy(_EGLDisplay *disp)
 
    switch (disp->Platform) {
    case _EGL_PLATFORM_X11:
+   case _EGL_PLATFORM_XCB:
       dri2_teardown_x11(dri2_dpy);
       break;
    case _EGL_PLATFORM_DRM: