From df65f05e276c145b87b6cdde1273a5793153bda4 Mon Sep 17 00:00:00 2001
From: Daniel van Vugt <daniel.van.vugt@canonical.com>
Date: Tue, 9 Jun 2020 18:06:13 +0800
Subject: [PATCH] cogl: Remove unused swap-related COGL_FEATURE_ID_ flags

What we actually use is `COGL_WINSYS_FEATURE_SWAP_BUFFERS_EVENT`, which
is also set in the same locations.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1297
---
 cogl/cogl/cogl-context.h                   | 7 -------
 cogl/cogl/winsys/cogl-winsys-glx.c         | 9 +--------
 src/backends/native/meta-renderer-native.c | 5 -----
 3 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/cogl/cogl/cogl-context.h b/cogl/cogl/cogl-context.h
index 1baa4145e..b6e8b8152 100644
--- a/cogl/cogl/cogl-context.h
+++ b/cogl/cogl/cogl-context.h
@@ -186,14 +186,9 @@ cogl_is_context (void *object);
  *     supported with CoglBufferAccess including read support.
  * @COGL_FEATURE_ID_MAP_BUFFER_FOR_WRITE: Whether cogl_buffer_map() is
  *     supported with CoglBufferAccess including write support.
- * @COGL_FEATURE_ID_SWAP_BUFFERS_EVENT:
- *     Available if the window system supports reporting an event
- *     for swap buffer completions.
  * @COGL_FEATURE_ID_BUFFER_AGE: Available if the age of #CoglOnscreen back
  *    buffers are tracked and so cogl_onscreen_get_buffer_age() can be
  *    expected to return age values other than 0.
- * @COGL_FEATURE_ID_PRESENTATION_TIME: Whether frame presentation
- *    time stamps will be recorded in #CoglFrameInfo objects.
  * @COGL_FEATURE_ID_BLIT_FRAMEBUFFER: Whether blitting using
  *    cogl_blit_framebuffer() is supported.
  *
@@ -208,8 +203,6 @@ typedef enum _CoglFeatureID
   COGL_FEATURE_ID_UNSIGNED_INT_INDICES,
   COGL_FEATURE_ID_MAP_BUFFER_FOR_READ,
   COGL_FEATURE_ID_MAP_BUFFER_FOR_WRITE,
-  COGL_FEATURE_ID_SWAP_BUFFERS_EVENT,
-  COGL_FEATURE_ID_PRESENTATION_TIME,
   COGL_FEATURE_ID_FENCE,
   COGL_FEATURE_ID_TEXTURE_RG,
   COGL_FEATURE_ID_BUFFER_AGE,
diff --git a/cogl/cogl/winsys/cogl-winsys-glx.c b/cogl/cogl/winsys/cogl-winsys-glx.c
index 452a88060..00e70ade6 100644
--- a/cogl/cogl/winsys/cogl-winsys-glx.c
+++ b/cogl/cogl/winsys/cogl-winsys-glx.c
@@ -839,14 +839,7 @@ update_winsys_features (CoglContext *context, GError **error)
   if (_cogl_winsys_has_feature (COGL_WINSYS_FEATURE_SYNC_AND_COMPLETE_EVENT))
     {
       COGL_FLAGS_SET (context->winsys_features,
-		      COGL_WINSYS_FEATURE_SWAP_BUFFERS_EVENT, TRUE);
-      /* TODO: remove this deprecated feature */
-      COGL_FLAGS_SET (context->features,
-                      COGL_FEATURE_ID_SWAP_BUFFERS_EVENT,
-                      TRUE);
-      COGL_FLAGS_SET (context->features,
-                      COGL_FEATURE_ID_PRESENTATION_TIME,
-                      TRUE);
+                      COGL_WINSYS_FEATURE_SWAP_BUFFERS_EVENT, TRUE);
     }
 
   /* We'll manually handle queueing dirty events in response to
diff --git a/src/backends/native/meta-renderer-native.c b/src/backends/native/meta-renderer-native.c
index eb11be9a5..75bbe3e25 100644
--- a/src/backends/native/meta-renderer-native.c
+++ b/src/backends/native/meta-renderer-native.c
@@ -2147,11 +2147,6 @@ meta_renderer_native_init_egl_context (CoglContext *cogl_context,
   MetaRendererNativeGpuData *renderer_gpu_data = cogl_renderer_egl->platform;
 #endif
 
-  COGL_FLAGS_SET (cogl_context->features,
-                  COGL_FEATURE_ID_PRESENTATION_TIME, TRUE);
-  COGL_FLAGS_SET (cogl_context->features,
-                  COGL_FEATURE_ID_SWAP_BUFFERS_EVENT, TRUE);
-  /* TODO: remove this deprecated feature */
   COGL_FLAGS_SET (cogl_context->winsys_features,
                   COGL_WINSYS_FEATURE_SWAP_BUFFERS_EVENT,
                   TRUE);