diff --git a/src/backends/native/meta-onscreen-native.c b/src/backends/native/meta-onscreen-native.c
index 8a25fca8cc4499d7f4fa7f6a1bb142cdb4e9af3a..78eebf7fa187622cbfe03e80f25ca1209e418590 100644
--- a/src/backends/native/meta-onscreen-native.c
+++ b/src/backends/native/meta-onscreen-native.c
@@ -1350,27 +1350,10 @@ meta_onscreen_native_swap_buffers_with_damage (CoglOnscreen  *onscreen,
         }
 
       primary_gpu_fb = META_DRM_BUFFER (g_steal_pointer (&buffer_gbm));
-      break;
-    case META_RENDERER_NATIVE_MODE_SURFACELESS:
-      g_assert_not_reached ();
-      break;
-#ifdef HAVE_EGL_DEVICE
-    case META_RENDERER_NATIVE_MODE_EGL_DEVICE:
-      break;
-#endif
-    }
-
-  buffer = acquire_front_buffer (onscreen,
-                                 &egl_context_changed,
-                                 primary_gpu_fb,
-                                 secondary_gpu_fb);
-
-  g_warn_if_fail (!onscreen_native->next_frame);
-  onscreen_native->next_frame = clutter_frame_ref (frame);
-
-  switch (renderer_gpu_data->mode)
-    {
-    case META_RENDERER_NATIVE_MODE_GBM:
+      buffer = acquire_front_buffer (onscreen,
+                                     &egl_context_changed,
+                                     primary_gpu_fb,
+                                     secondary_gpu_fb);
       meta_frame_native_set_buffer (frame_native, buffer);
 
       if (!meta_drm_buffer_ensure_fb_id (buffer, &error))
@@ -1392,6 +1375,9 @@ meta_onscreen_native_swap_buffers_with_damage (CoglOnscreen  *onscreen,
 #endif
     }
 
+  g_warn_if_fail (!onscreen_native->next_frame);
+  onscreen_native->next_frame = clutter_frame_ref (frame);
+
   /*
    * If we changed EGL context, cogl will have the wrong idea about what is
    * current, making it fail to set it when it needs to. Avoid that by making