cogl/xlib-renderer: Remove [add|remove]_filter

They end up calling the Renderer APIs & they are not used outside
of Cogl

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3910>

cogl/cogl/cogl-xlib-renderer.c

@@ -430,9 +430,9 @@ _cogl_xlib_renderer_connect (CoglRenderer *renderer, GError **error)
 
   register_xlib_renderer (renderer);
 
-  cogl_xlib_renderer_add_filter (renderer,
+  _cogl_renderer_add_native_filter (renderer,
-                                 randr_filter,
+                                    (CoglNativeFilterFunc)randr_filter,
-                                 renderer);
+                                    renderer);
 
   return TRUE;
 }
@@ -473,24 +473,6 @@ cogl_xlib_renderer_handle_event (CoglRenderer *renderer,
   return _cogl_renderer_handle_native_event (renderer, event);
 }
 
-void
-cogl_xlib_renderer_add_filter (CoglRenderer *renderer,
-                               CoglXlibFilterFunc func,
-                               void *data)
-{
-  _cogl_renderer_add_native_filter (renderer,
-                                    (CoglNativeFilterFunc)func, data);
-}
-
-void
-cogl_xlib_renderer_remove_filter (CoglRenderer *renderer,
-                                  CoglXlibFilterFunc func,
-                                  void *data)
-{
-  _cogl_renderer_remove_native_filter (renderer,
-                                       (CoglNativeFilterFunc)func, data);
-}
-
 float
 _cogl_xlib_renderer_refresh_rate_for_rectangle (CoglRenderer *renderer,
                                                 int           x,

cogl/cogl/cogl-xlib-renderer.h

@@ -54,48 +54,6 @@ COGL_EXPORT CoglFilterReturn
 cogl_xlib_renderer_handle_event (CoglRenderer *renderer,
                                  XEvent *event);
 
-/*
- * CoglXlibFilterFunc:
- * @event: pointer to an XEvent structure
- * @data: the data that was given when the filter was added
- *
- * A callback function that can be registered with
- * cogl_xlib_renderer_add_filter(). The function should return
- * %COGL_FILTER_REMOVE if it wants to prevent further processing or
- * %COGL_FILTER_CONTINUE otherwise.
- */
-typedef CoglFilterReturn (* CoglXlibFilterFunc) (XEvent *event,
-                                                 void *data);
-
-/**
- * cogl_xlib_renderer_add_filter: (skip)
- * @renderer: a #CoglRenderer
- * @func: the callback function
- * @data: user data passed to @func when called
- *
- * Adds a callback function that will receive all native events. The
- * function can stop further processing of the event by return
- * %COGL_FILTER_REMOVE.
- */
-COGL_EXPORT void
-cogl_xlib_renderer_add_filter (CoglRenderer *renderer,
-                               CoglXlibFilterFunc func,
-                               void *data);
-
-/**
- * cogl_xlib_renderer_remove_filter: (skip)
- * @renderer: a #CoglRenderer
- * @func: the callback function
- * @data: user data given when the callback was installed
- *
- * Removes a callback that was previously added with
- * cogl_xlib_renderer_add_filter().
- */
-COGL_EXPORT void
-cogl_xlib_renderer_remove_filter (CoglRenderer *renderer,
-                                  CoglXlibFilterFunc func,
-                                  void *data);
-
 /**
  * cogl_xlib_renderer_set_foreign_display: (skip)
  * @renderer: a #CoglRenderer

cogl/cogl/winsys/cogl-texture-pixmap-x11.c

@@ -223,9 +223,9 @@ set_damage_object_internal (CoglContext *ctx,
 
   if (tex_pixmap->damage)
     {
-      cogl_xlib_renderer_remove_filter (ctx->display->renderer,
+      _cogl_renderer_remove_native_filter (ctx->display->renderer,
-                                        _cogl_texture_pixmap_x11_filter,
+                                           (CoglNativeFilterFunc)_cogl_texture_pixmap_x11_filter,
-                                        tex_pixmap);
+                                           tex_pixmap);
 
       if (tex_pixmap->damage_owned)
         {
@@ -238,9 +238,9 @@ set_damage_object_internal (CoglContext *ctx,
   tex_pixmap->damage_report_level = report_level;
 
   if (damage)
-    cogl_xlib_renderer_add_filter (ctx->display->renderer,
+    _cogl_renderer_add_native_filter (ctx->display->renderer,
-                                   _cogl_texture_pixmap_x11_filter,
+                                      (CoglNativeFilterFunc)_cogl_texture_pixmap_x11_filter,
-                                   tex_pixmap);
+                                      tex_pixmap);
 }
 
 static void

cogl/cogl/winsys/cogl-winsys-egl-x11.c

@@ -323,9 +323,9 @@ static gboolean
 _cogl_winsys_egl_context_init (CoglContext *context,
                                GError **error)
 {
-  cogl_xlib_renderer_add_filter (context->display->renderer,
+  _cogl_renderer_add_native_filter (context->display->renderer,
-                                 event_filter_cb,
+                                    (CoglNativeFilterFunc)event_filter_cb,
-                                 context);
+                                    context);
 
   /* We'll manually handle queueing dirty events in response to
    * Expose events from X */
@@ -339,9 +339,9 @@ _cogl_winsys_egl_context_init (CoglContext *context,
 static void
 _cogl_winsys_egl_context_deinit (CoglContext *context)
 {
-  cogl_xlib_renderer_remove_filter (context->display->renderer,
+  _cogl_renderer_remove_native_filter (context->display->renderer,
-                                    event_filter_cb,
+                                       (CoglNativeFilterFunc)event_filter_cb,
-                                    context);
+                                       context);
 }
 
 static gboolean

cogl/cogl/winsys/cogl-winsys-glx.c

@@ -853,18 +853,18 @@ _cogl_winsys_context_init (CoglContext *context, GError **error)
 {
   context->winsys = g_new0 (CoglContextGLX, 1);
 
-  cogl_xlib_renderer_add_filter (context->display->renderer,
+  _cogl_renderer_add_native_filter (context->display->renderer,
-                                 glx_event_filter_cb,
+                                    (CoglNativeFilterFunc)glx_event_filter_cb,
-                                 context);
+                                    context);
   return update_winsys_features (context, error);
 }
 
 static void
 _cogl_winsys_context_deinit (CoglContext *context)
 {
-  cogl_xlib_renderer_remove_filter (context->display->renderer,
+  _cogl_renderer_remove_native_filter (context->display->renderer,
-                                    glx_event_filter_cb,
+                                       (CoglNativeFilterFunc)glx_event_filter_cb,
-                                    context);
+                                       context);
   g_free (context->winsys);
 }