[gtk/wip/otte/gleanup: 69/73] Revert "gdk: Add a GL workaround for nvidia"

[Chun-wei Fan <fanchunwei src gnome org>]

commit 97c2db52e8ef58794276582dbc12338ba8c5551e
Author: Benjamin Otte <otte redhat com>
Date:   Sat Jul 10 02:37:26 2021 +0200

    Revert "gdk: Add a GL workaround for nvidia"
    
    This reverts commit 6120c20a3edd160f626a35cd592cbca4988b32ef.

 gdk/gdkglcontext.c        | 28 +++++++++++-----------------
 gdk/gdkglcontextprivate.h |  2 --
 gsk/gl/gskglrenderer.c    |  5 +----
 gsk/ngl/gsknglrenderer.c  |  7 -------
 4 files changed, 12 insertions(+), 30 deletions(-)
---
diff --git a/gdk/gdkglcontext.c b/gdk/gdkglcontext.c
index 59cb4f550f..5c0193c0ec 100644
--- a/gdk/gdkglcontext.c
+++ b/gdk/gdkglcontext.c
@@ -1143,13 +1143,22 @@ gdk_gl_context_check_extensions (GdkGLContext *context)
   priv->extensions_checked = TRUE;
 }
 
+/**
+ * gdk_gl_context_make_current:
+ * @context: a `GdkGLContext`
+ *
+ * Makes the @context the current one.
+ */
 void
-gdk_gl_context_make_current_full (GdkGLContext *context,
-                                  gboolean      surfaceless)
+gdk_gl_context_make_current (GdkGLContext *context)
 {
   GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context);
   MaskedContext *current, *masked_context;
+  gboolean surfaceless;
+
+  g_return_if_fail (GDK_IS_GL_CONTEXT (context));
 
+  surfaceless = !gdk_draw_context_is_in_frame (GDK_DRAW_CONTEXT (context));
   masked_context = mask_context (context, surfaceless);
 
   current = g_private_get (&thread_current_context);
@@ -1181,21 +1190,6 @@ gdk_gl_context_make_current_full (GdkGLContext *context,
   gdk_gl_context_check_extensions (context);
 }
 
-/**
- * gdk_gl_context_make_current:
- * @context: a `GdkGLContext`
- *
- * Makes the @context the current one.
- */
-void
-gdk_gl_context_make_current (GdkGLContext *context)
-{
-  g_return_if_fail (GDK_IS_GL_CONTEXT (context));
-
-  gdk_gl_context_make_current_full (context,
-                                    !gdk_draw_context_is_in_frame (GDK_DRAW_CONTEXT (context)));
-};
-
 /**
  * gdk_gl_context_get_display:
  * @context: a `GdkGLContext`
diff --git a/gdk/gdkglcontextprivate.h b/gdk/gdkglcontextprivate.h
index 4cc9cb783b..e762c59075 100644
--- a/gdk/gdkglcontextprivate.h
+++ b/gdk/gdkglcontextprivate.h
@@ -99,8 +99,6 @@ void                    gdk_gl_context_upload_texture           (GdkGLContext
                                                                  int              stride,
                                                                  GdkMemoryFormat  data_format,
                                                                  guint            texture_target);
-void                    gdk_gl_context_make_current_full        (GdkGLContext    *context,
-                                                                 gboolean         surfaceless);
 GdkGLContextPaintData * gdk_gl_context_get_paint_data           (GdkGLContext    *context);
 gboolean                gdk_gl_context_use_texture_rectangle    (GdkGLContext    *context);
 gboolean                gdk_gl_context_has_unpack_subimage      (GdkGLContext    *context);
diff --git a/gsk/gl/gskglrenderer.c b/gsk/gl/gskglrenderer.c
index 4439594028..a801f55ab3 100644
--- a/gsk/gl/gskglrenderer.c
+++ b/gsk/gl/gskglrenderer.c
@@ -3557,10 +3557,7 @@ gsk_gl_renderer_realize (GskRenderer  *renderer,
   if (!gdk_gl_context_realize (self->gl_context, error))
     return FALSE;
 
-  /* Use make_current_full() to work around nvidia bug where the first
-   * make_current() must not happen surfaceless or the GL context
-   * will never be able to render to the surface directly */
-  gdk_gl_context_make_current_full (self->gl_context, FALSE);
+  gdk_gl_context_make_current (self->gl_context);
 
   g_assert (self->gl_driver == NULL);
   self->gl_profiler = gsk_gl_profiler_new (self->gl_context);
diff --git a/gsk/ngl/gsknglrenderer.c b/gsk/ngl/gsknglrenderer.c
index f5e8f6375b..fa393c11cf 100644
--- a/gsk/ngl/gsknglrenderer.c
+++ b/gsk/ngl/gsknglrenderer.c
@@ -31,8 +31,6 @@
 #include "gsknglrenderjobprivate.h"
 #include "gsknglrendererprivate.h"
 
-#include "gdk/gdkglcontextprivate.h"
-
 struct _GskNglRendererClass
 {
   GskRendererClass parent_class;
@@ -106,11 +104,6 @@ gsk_ngl_renderer_realize (GskRenderer  *renderer,
       !gdk_gl_context_realize (context, error))
     goto failure;
 
-  /* Use make_current_full() to work around nvidia bug where the first
-   * make_current() must not happen surfaceless or the GL context
-   * will never be able to render to the surface directly */
-  gdk_gl_context_make_current_full (context, FALSE);
-
 #ifdef G_ENABLE_DEBUG
   if (GSK_RENDERER_DEBUG_CHECK (GSK_RENDERER (self), SHADERS))
     debug_shaders = TRUE;