From c506c194b6ae51a97e8c5adc044805944661a24d Mon Sep 17 00:00:00 2001
From: Bilal Elmoussaoui <belmouss@redhat.com>
Date: Sun, 26 May 2024 16:11:47 +0200
Subject: [PATCH] cogl: Don't allow overriding renderer winsys_id

It is an API that no longer makes sense, as Cogl is only usable inside of Mutter

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3781>
---
 cogl/cogl/cogl-renderer-private.h |  1 -
 cogl/cogl/cogl-renderer.c         | 15 ---------------
 cogl/cogl/cogl-renderer.h         | 17 -----------------
 3 files changed, 33 deletions(-)

diff --git a/cogl/cogl/cogl-renderer-private.h b/cogl/cogl/cogl-renderer-private.h
index d3a362fa2..f71d71eb9 100644
--- a/cogl/cogl/cogl-renderer-private.h
+++ b/cogl/cogl/cogl-renderer-private.h
@@ -50,7 +50,6 @@ struct _CoglRenderer
   const CoglWinsysVtable *winsys_vtable;
   void *custom_winsys_user_data;
   CoglCustomWinsysVtableGetter custom_winsys_vtable_getter;
-  CoglWinsysID winsys_id_override;
 
   GArray *poll_fds;
   int poll_fds_age;
diff --git a/cogl/cogl/cogl-renderer.c b/cogl/cogl/cogl-renderer.c
index 1fec8693c..bc68c93a4 100644
--- a/cogl/cogl/cogl-renderer.c
+++ b/cogl/cogl/cogl-renderer.c
@@ -522,12 +522,6 @@ cogl_renderer_connect (CoglRenderer *renderer, GError **error)
       const CoglWinsysVtable *winsys = _cogl_winsys_vtable_getters[i]();
       GError *tmp_error = NULL;
 
-      if (renderer->winsys_id_override != COGL_WINSYS_ID_ANY)
-        {
-          if (renderer->winsys_id_override != winsys->id)
-            continue;
-        }
-
       /* At least temporarily we will associate this winsys with
        * the renderer in-case ->renderer_connect calls API that
        * wants to query the current winsys... */
@@ -629,15 +623,6 @@ _cogl_renderer_remove_native_filter (CoglRenderer *renderer,
     }
 }
 
-void
-cogl_renderer_set_winsys_id (CoglRenderer *renderer,
-                             CoglWinsysID winsys_id)
-{
-  g_return_if_fail (!renderer->connected);
-
-  renderer->winsys_id_override = winsys_id;
-}
-
 CoglWinsysID
 cogl_renderer_get_winsys_id (CoglRenderer *renderer)
 {
diff --git a/cogl/cogl/cogl-renderer.h b/cogl/cogl/cogl-renderer.h
index 60fa06923..24480ef0e 100644
--- a/cogl/cogl/cogl-renderer.h
+++ b/cogl/cogl/cogl-renderer.h
@@ -143,23 +143,6 @@ typedef enum
   COGL_WINSYS_ID_CUSTOM,
 } CoglWinsysID;
 
-/**
- * cogl_renderer_set_winsys_id:
- * @renderer: A #CoglRenderer
- * @winsys_id: An ID of the winsys you explicitly want to use.
- *
- * This allows you to explicitly select a winsys backend to use instead
- * of letting Cogl automatically select a backend.
- *
- * if you select an unsupported backend then cogl_renderer_connect()
- * will fail and report an error.
- *
- * This may only be called on an un-connected #CoglRenderer.
- */
-COGL_EXPORT void
-cogl_renderer_set_winsys_id (CoglRenderer *renderer,
-                             CoglWinsysID winsys_id);
-
 /**
  * cogl_renderer_get_winsys_id:
  * @renderer: A #CoglRenderer