diff --git a/gdk/wayland/gdkglcontext-wayland.c b/gdk/wayland/gdkglcontext-wayland.c
index 01ca529356..83feca9a2c 100644
--- a/gdk/wayland/gdkglcontext-wayland.c
+++ b/gdk/wayland/gdkglcontext-wayland.c
@@ -46,16 +46,14 @@
 
 G_DEFINE_TYPE (GdkWaylandGLContext, gdk_wayland_gl_context, GDK_TYPE_GL_CONTEXT)
 
-static void
-gdk_wayland_gl_context_begin_frame (GdkDrawContext  *draw_context,
-                                    GdkMemoryDepth   depth,
-                                    cairo_region_t  *region,
-                                    GdkColorState  **out_color_state,
-                                    GdkMemoryDepth  *out_depth)
+static gboolean
+gdk_wayland_gl_context_make_current (GdkGLContext *context,
+                                     gboolean      surfaceless)
 {
-  gdk_wayland_surface_ensure_wl_egl_window (gdk_draw_context_get_surface (draw_context));
+  if (!surfaceless)
+    gdk_wayland_surface_ensure_wl_egl_window (gdk_gl_context_get_surface (context));
 
-  GDK_DRAW_CONTEXT_CLASS (gdk_wayland_gl_context_parent_class)->begin_frame (draw_context, depth, region, out_color_state, out_depth);
+  return GDK_GL_CONTEXT_CLASS (gdk_wayland_gl_context_parent_class)->make_current (context, surfaceless);
 }
 
 static void
@@ -97,13 +95,13 @@ static void
 gdk_wayland_gl_context_class_init (GdkWaylandGLContextClass *klass)
 {
   GdkDrawContextClass *draw_context_class = GDK_DRAW_CONTEXT_CLASS (klass);
-  GdkGLContextClass *context_class = GDK_GL_CONTEXT_CLASS (klass);
+  GdkGLContextClass *gl_context_class = GDK_GL_CONTEXT_CLASS (klass);
 
-  draw_context_class->begin_frame = gdk_wayland_gl_context_begin_frame;
   draw_context_class->end_frame = gdk_wayland_gl_context_end_frame;
   draw_context_class->empty_frame = gdk_wayland_gl_context_empty_frame;
 
-  context_class->backend_type = GDK_GL_EGL;
+  gl_context_class->make_current = gdk_wayland_gl_context_make_current;
+  gl_context_class->backend_type = GDK_GL_EGL;
 }
 
 static void