From 9907166c4203b1d68ef4ec558849d15f95376813 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Mon, 29 Jul 2024 13:16:42 -0400
Subject: [PATCH] egl: always check dri caps for EGL_WL_bind_wayland_display
 support

this should be functionally the same

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30472>
---
 src/egl/drivers/dri2/egl_dri2.h | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h
index 3393fb48b80..082ce10de91 100644
--- a/src/egl/drivers/dri2/egl_dri2.h
+++ b/src/egl/drivers/dri2/egl_dri2.h
@@ -630,19 +630,12 @@ dri2_set_WL_bind_wayland_display(_EGLDisplay *disp)
 #ifdef HAVE_WAYLAND_PLATFORM
    struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
 
-   if (!dri2_dpy->swrast && dri2_dpy->image) {
-      if (dri2_dpy->image->base.version >= 10 &&
-          dri2_dpy->image->getCapabilities != NULL) {
-         int capabilities;
+   int capabilities;
 
-         capabilities =
-            dri2_get_capabilities(dri2_dpy->dri_screen_render_gpu);
-         disp->Extensions.WL_bind_wayland_display =
-            (capabilities & __DRI_IMAGE_CAP_GLOBAL_NAMES) != 0;
-      } else {
-         disp->Extensions.WL_bind_wayland_display = EGL_TRUE;
-      }
-   }
+   capabilities =
+      dri2_get_capabilities(dri2_dpy->dri_screen_render_gpu);
+   disp->Extensions.WL_bind_wayland_display =
+      (capabilities & __DRI_IMAGE_CAP_GLOBAL_NAMES) != 0;
 #endif
 }