[gtk/wip/damaged-but-no-frost-bite: 5/5] Revert "xxx! pretend like i'm using nvidia vendor driver"

[Ray Strode <halfline src gnome org>]

commit 9edc35f8f2f038cad6bc017f79f2d4be184241ef
Author: Ray Strode <rstrode redhat com>
Date:   Fri May 29 16:05:29 2020 -0400

    Revert "xxx! pretend like i'm using nvidia vendor driver"
    
    This reverts commit 1c1b44adadc65e1f281d23618219f17cd59bde61.

 gdk/x11/gdkglcontext-x11.c | 38 +++++++++++++-------------------------
 1 file changed, 13 insertions(+), 25 deletions(-)
---
diff --git a/gdk/x11/gdkglcontext-x11.c b/gdk/x11/gdkglcontext-x11.c
index 67a7cc3f2b..f2a752d690 100644
--- a/gdk/x11/gdkglcontext-x11.c
+++ b/gdk/x11/gdkglcontext-x11.c
@@ -575,29 +575,6 @@ create_legacy_context (GdkDisplay   *display,
   return res;
 }
 
-static gboolean
-on_timeout_for_testing (GdkGLContext *context)
-{
-  GdkX11GLContext *context_x11 = GDK_X11_GL_CONTEXT (context);
-  GdkSurface *surface = gdk_gl_context_get_surface (context);
-
-  if (context_x11->frame_fence)
-    {
-      GLenum wait_result;
-
-      wait_result = glClientWaitSync (context_x11->frame_fence, 0, 16000000);
-
-      if (wait_result == GL_ALREADY_SIGNALED || TRUE)
-        {
-          glDeleteSync (context_x11->frame_fence);
-          context_x11->frame_fence = 0;
-          _gdk_x11_surface_set_still_painting_frame (surface, FALSE);
-        }
-    }
-
-  return G_SOURCE_REMOVE;
-}
-
 #ifdef HAVE_XDAMAGE
 static gboolean
 on_gl_surface_xevent (GdkGLContext   *context,
@@ -619,7 +596,19 @@ on_gl_surface_xevent (GdkGLContext   *context,
   if (damage_xevent->damage != context_x11->xdamage)
     return FALSE;
 
-  g_timeout_add (4, on_timeout_for_testing, context);
+  if (context_x11->frame_fence)
+    {
+      GLenum wait_result;
+
+      wait_result = glClientWaitSync (context_x11->frame_fence, 0, 0);
+
+      if (wait_result == GL_ALREADY_SIGNALED)
+        {
+          glDeleteSync (context_x11->frame_fence);
+          context_x11->frame_fence = 0;
+          _gdk_x11_surface_set_still_painting_frame (surface, FALSE);
+        }
+    }
 
   return FALSE;
 }
@@ -932,7 +921,6 @@ gdk_x11_screen_init_gl (GdkX11Screen *screen)
        */
       display_x11->has_async_glx_swap_buffers = TRUE;
     }
-  display_x11->has_async_glx_swap_buffers = TRUE;
 
   GDK_DISPLAY_NOTE (display, OPENGL,
             g_message ("GLX version %d.%d found\n"