From: Benjamin Otte <otte@redhat.com>
Date: Tue, 15 Jun 2021 12:48:55 +0000 (+0200)
Subject: Revert "x11: Always fall back to GLX on NVIDIA"
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~3^2~9^2~33
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=eb3423312fec9a0fc7fbc4f5fc55a77bde8de661;p=gtk4.git

Revert "x11: Always fall back to GLX on NVIDIA"

This reverts commit c35a6725b99722d91b0ed6580546c27c8f0849ba.

This approach doesn't work because if NVIDIA doesn't work for EGL, the
EGL implementation won't be provided by NVIDIA, so checking the vendor
doesn't work.
---

diff --git a/gdk/x11/gdkglcontext-egl.c b/gdk/x11/gdkglcontext-egl.c
index 1156b0e633..61cabceb16 100644
--- a/gdk/x11/gdkglcontext-egl.c
+++ b/gdk/x11/gdkglcontext-egl.c
@@ -486,19 +486,6 @@ gdk_x11_display_init_egl (GdkX11Display  *self,
       return FALSE;
     }
 
-  /* While NVIDIA might support EGL, it might very well not support
-   * all the EGL subset we rely on; we should be looking at more
-   * EGL extensions, but for the time being, this is a blanket
-   * fallback to GLX
-   */
-  const char *vendor = eglQueryString (self->egl_display, EGL_VENDOR);
-  if (strstr (vendor, "NVIDIA") != NULL)
-    {
-      eglTerminate (self->egl_display);
-      self->egl_display = NULL;
-      return FALSE;
-    }
-
   self->egl_version = epoxy_egl_version (dpy);
 
   self->has_egl_khr_create_context =