Revert "x11: Always fall back to GLX on NVIDIA"
authorBenjamin Otte <otte@redhat.com>
Tue, 15 Jun 2021 12:48:55 +0000 (14:48 +0200)
committerBenjamin Otte <otte@redhat.com>
Thu, 22 Jul 2021 14:06:06 +0000 (16:06 +0200)
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.

gdk/x11/gdkglcontext-egl.c

index 1156b0e6330169c2ff4cb019cf4080534757ee18..61cabceb164fcde596aa170bfccd75c7a4026ae8 100644 (file)
@@ -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 =