From b0aacf4093d18c3b17180cbf9f52460393c61f4d Mon Sep 17 00:00:00 2001
From: Bilal Elmoussaoui <belmouss@redhat.com>
Date: Sat, 15 Jun 2024 00:31:00 +0200
Subject: [PATCH] cogl: Mark XlibRenderer.get_display private

Nothing uses it externally, take the opportunity to remove an unused function
as well

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3813>
---
 cogl/cogl/cogl-renderer.c              |  8 --------
 cogl/cogl/cogl-xlib-renderer-private.h |  3 +++
 cogl/cogl/cogl-xlib-renderer.c         |  2 +-
 cogl/cogl/cogl-xlib-renderer.h         | 17 -----------------
 4 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/cogl/cogl/cogl-renderer.c b/cogl/cogl/cogl-renderer.c
index 75b11745b..eae6f8890 100644
--- a/cogl/cogl/cogl-renderer.c
+++ b/cogl/cogl/cogl-renderer.c
@@ -227,14 +227,6 @@ cogl_xlib_renderer_set_foreign_display (CoglRenderer *renderer,
   renderer->xlib_enable_event_retrieval = FALSE;
 }
 
-Display *
-cogl_xlib_renderer_get_foreign_display (CoglRenderer *renderer)
-{
-  g_return_val_if_fail (COGL_IS_RENDERER (renderer), NULL);
-
-  return renderer->foreign_xdpy;
-}
-
 void
 cogl_xlib_renderer_request_reset_on_video_memory_purge (CoglRenderer *renderer,
                                                         gboolean enable)
diff --git a/cogl/cogl/cogl-xlib-renderer-private.h b/cogl/cogl/cogl-xlib-renderer-private.h
index f4a6ec7db..b6c5a5315 100644
--- a/cogl/cogl/cogl-xlib-renderer-private.h
+++ b/cogl/cogl/cogl-xlib-renderer-private.h
@@ -75,3 +75,6 @@ _cogl_xlib_renderer_refresh_rate_for_rectangle (CoglRenderer *renderer,
                                                 int           y,
                                                 int           width,
                                                 int           height);
+
+Display *
+cogl_xlib_renderer_get_display (CoglRenderer *renderer);
diff --git a/cogl/cogl/cogl-xlib-renderer.c b/cogl/cogl/cogl-xlib-renderer.c
index 3de88ae6e..5d96b8eee 100644
--- a/cogl/cogl/cogl-xlib-renderer.c
+++ b/cogl/cogl/cogl-xlib-renderer.c
@@ -93,7 +93,7 @@ unregister_xlib_renderer (CoglRenderer *renderer)
 static Display *
 assert_xlib_display (CoglRenderer *renderer, GError **error)
 {
-  Display *xdpy = cogl_xlib_renderer_get_foreign_display (renderer);
+  Display *xdpy = renderer->foreign_xdpy;
   CoglXlibRenderer *xlib_renderer = _cogl_xlib_renderer_get_data (renderer);
 
   /* A foreign display may have already been set... */
diff --git a/cogl/cogl/cogl-xlib-renderer.h b/cogl/cogl/cogl-xlib-renderer.h
index ed77eec4d..61f0127d9 100644
--- a/cogl/cogl/cogl-xlib-renderer.h
+++ b/cogl/cogl/cogl-xlib-renderer.h
@@ -96,17 +96,6 @@ cogl_xlib_renderer_remove_filter (CoglRenderer *renderer,
                                   CoglXlibFilterFunc func,
                                   void *data);
 
-/**
- * cogl_xlib_renderer_get_foreign_display: (skip)
- * @renderer: a #CoglRenderer
- *
- * Return value: the foreign Xlib display that will be used by any Xlib based
- * winsys backend. The display needs to be set with
- * cogl_xlib_renderer_set_foreign_display() before this function is called.
- */
-COGL_EXPORT Display *
-cogl_xlib_renderer_get_foreign_display (CoglRenderer *renderer);
-
 /**
  * cogl_xlib_renderer_set_foreign_display: (skip)
  * @renderer: a #CoglRenderer
@@ -123,12 +112,6 @@ COGL_EXPORT void
 cogl_xlib_renderer_set_foreign_display (CoglRenderer *renderer,
                                         Display *display);
 
-/**
- * cogl_xlib_renderer_get_display: (skip)
- */
-COGL_EXPORT Display *
-cogl_xlib_renderer_get_display (CoglRenderer *renderer);
-
 /**
  * cogl_xlib_renderer_request_reset_on_video_memory_purge: (skip)
  * @renderer: a #CoglRenderer