From 40205d8f1b4ce1017d2c749468377b65956a7eb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Thu, 28 Nov 2019 17:49:55 +0100
Subject: [PATCH] cogl: Make pipeline creation introspectable

This means CoglContext is now also introspected, although its
constructor and some getters are skipped to avoid having to expose even
more types. This makes it possible to create pipelines using Javascript.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/935
---
 cogl/cogl/cogl-context.h     | 6 +++---
 cogl/cogl/cogl-framebuffer.h | 2 +-
 cogl/cogl/cogl-pipeline.h    | 2 +-
 cogl/cogl/meson.build        | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cogl/cogl/cogl-context.h b/cogl/cogl/cogl-context.h
index c4854041f..241a09bfb 100644
--- a/cogl/cogl/cogl-context.h
+++ b/cogl/cogl/cogl-context.h
@@ -102,7 +102,7 @@ G_BEGIN_DECLS
 GType cogl_context_get_gtype (void);
 
 /**
- * cogl_context_new: (constructor)
+ * cogl_context_new: (constructor) (skip)
  * @display: (allow-none): A #CoglDisplay pointer
  * @error: A GError return location.
  *
@@ -118,7 +118,7 @@ cogl_context_new (CoglDisplay *display,
                   GError **error);
 
 /**
- * cogl_context_get_display:
+ * cogl_context_get_display: (skip)
  * @context: A #CoglContext pointer
  *
  * Retrieves the #CoglDisplay that is internally associated with the
@@ -136,7 +136,7 @@ CoglDisplay *
 cogl_context_get_display (CoglContext *context);
 
 /**
- * cogl_context_get_renderer:
+ * cogl_context_get_renderer: (skip)
  * @context: A #CoglContext pointer
  *
  * Retrieves the #CoglRenderer that is internally associated with the
diff --git a/cogl/cogl/cogl-framebuffer.h b/cogl/cogl/cogl-framebuffer.h
index 79fa02753..63c8cc8fb 100644
--- a/cogl/cogl/cogl-framebuffer.h
+++ b/cogl/cogl/cogl-framebuffer.h
@@ -987,7 +987,7 @@ cogl_framebuffer_resolve_samples_region (CoglFramebuffer *framebuffer,
                                          int height);
 
 /**
- * cogl_framebuffer_get_context: (skip)
+ * cogl_framebuffer_get_context:
  * @framebuffer: A #CoglFramebuffer
  *
  * Can be used to query the #CoglContext a given @framebuffer was
diff --git a/cogl/cogl/cogl-pipeline.h b/cogl/cogl/cogl-pipeline.h
index 9e81b659c..52cb2e063 100644
--- a/cogl/cogl/cogl-pipeline.h
+++ b/cogl/cogl/cogl-pipeline.h
@@ -72,7 +72,7 @@ G_BEGIN_DECLS
 GType cogl_pipeline_get_gtype (void);
 
 /**
- * cogl_pipeline_new: (skip)
+ * cogl_pipeline_new: (constructor)
  * @context: a #CoglContext
  *
  * Allocates and initializes a default simple pipeline that will color
diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build
index d72effe20..8fe6af1df 100644
--- a/cogl/cogl/meson.build
+++ b/cogl/cogl/meson.build
@@ -75,6 +75,7 @@ cogl_headers = [
   'cogl1-context.h',
   'cogl-bitmap.h',
   'cogl-color.h',
+  'cogl-context.h',
   'cogl-framebuffer.h',
   'cogl-matrix.h',
   'cogl-object.h',
@@ -96,7 +97,6 @@ cogl_nonintrospected_headers = [
   'cogl-swap-chain.h',
   'cogl-onscreen-template.h',
   'cogl-display.h',
-  'cogl-context.h',
   'cogl-snippet.h',
   'cogl-index-buffer.h',
   'cogl-attribute-buffer.h',