From 03c3b642bd03020c0355372a05ed4d46be2fce6b Mon Sep 17 00:00:00 2001
From: Robert Mader <robert.mader@collabora.com>
Date: Sat, 26 Aug 2023 11:48:42 +0200
Subject: [PATCH] cogl: Move CoglScanout declarations from onscreen to types

While closely related, types appears to be the more appropriate place
these days.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3559>
---
 cogl/cogl/cogl-onscreen.h | 11 -----------
 cogl/cogl/cogl-types.h    | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/cogl/cogl/cogl-onscreen.h b/cogl/cogl/cogl-onscreen.h
index f22a8979e..33928d31e 100644
--- a/cogl/cogl/cogl-onscreen.h
+++ b/cogl/cogl/cogl-onscreen.h
@@ -45,8 +45,6 @@
 
 G_BEGIN_DECLS
 
-typedef struct _CoglScanout CoglScanout;
-
 #define COGL_TYPE_ONSCREEN (cogl_onscreen_get_type ())
 COGL_EXPORT
 G_DECLARE_DERIVABLE_TYPE (CoglOnscreen, cogl_onscreen,
@@ -85,15 +83,6 @@ struct _CoglOnscreenClass
   int (* get_buffer_age) (CoglOnscreen *onscreen);
 };
 
-#define COGL_SCANOUT_ERROR (cogl_scanout_error_quark ())
-COGL_EXPORT GQuark
-cogl_scanout_error_quark (void);
-
-typedef enum _CoglScanoutError
-{
-  COGL_SCANOUT_ERROR_INHIBITED,
-} CoglScanoutError;
-
 /**
  * cogl_onscreen_show:
  * @onscreen: The onscreen framebuffer to make visible
diff --git a/cogl/cogl/cogl-types.h b/cogl/cogl/cogl-types.h
index e46c94880..30749da1c 100644
--- a/cogl/cogl/cogl-types.h
+++ b/cogl/cogl/cogl-types.h
@@ -425,4 +425,20 @@ typedef enum
   COGL_STEREO_RIGHT
 } CoglStereoMode;
 
+typedef struct _CoglScanout CoglScanout;
+
+#define COGL_SCANOUT_ERROR (cogl_scanout_error_quark ())
+
+/**
+ * CoglScanoutError:
+ * @COGL_SCANOUT_ERROR_INHIBITED: Scanout inhibited
+ */
+typedef enum _CoglScanoutError
+{
+  COGL_SCANOUT_ERROR_INHIBITED,
+} CoglScanoutError;
+
+COGL_EXPORT GQuark
+cogl_scanout_error_quark (void);
+
 G_END_DECLS