From 2fd63724af53805cbd0d33059d21ca4fb7896bc5 Mon Sep 17 00:00:00 2001 From: Simon Schneegans Date: Wed, 18 May 2022 07:43:58 +0200 Subject: [PATCH] cogl/snippet: Make API introspectable This change ensures that the Snippet API of Cogl is exposed to GJS, making it possible to create custom shader programs in GJS. Related: https://gitlab.gnome.org/GNOME/mutter/-/issues/2280 Part-of: --- cogl/cogl/cogl-snippet.h | 18 +++++++++--------- cogl/cogl/meson.build | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cogl/cogl/cogl-snippet.h b/cogl/cogl/cogl-snippet.h index 2d14b91fb..5965fc629 100644 --- a/cogl/cogl/cogl-snippet.h +++ b/cogl/cogl/cogl-snippet.h @@ -679,14 +679,14 @@ typedef enum * cogl_snippet_new: * @hook: The point in the pipeline that this snippet will wrap around * or replace. - * @declarations: The source code for the declarations for this + * @declarations: (nullable): The source code for the declarations for this * snippet or %NULL. See cogl_snippet_set_declarations(). - * @post: The source code to run after the hook point where this + * @post: (nullable): The source code to run after the hook point where this * shader snippet is attached or %NULL. See cogl_snippet_set_post(). * * Allocates and initializes a new snippet with the given source strings. * - * Return value: a pointer to a new #CoglSnippet + * Return value: (transfer full): a pointer to a new #CoglSnippet * * Since: 1.10 * Stability: Unstable @@ -700,8 +700,8 @@ cogl_snippet_new (CoglSnippetHook hook, * cogl_snippet_get_hook: * @snippet: A #CoglSnippet * - * Return value: the hook that was set when cogl_snippet_new() was - * called. + * Return value: (transfer none): the hook that was set when cogl_snippet_new() + * was called. * Since: 1.10 * Stability: Unstable */ @@ -749,7 +749,7 @@ cogl_snippet_set_declarations (CoglSnippet *snippet, * cogl_snippet_get_declarations: * @snippet: A #CoglSnippet * - * Return value: the source string that was set with + * Return value: (transfer none): the source string that was set with * cogl_snippet_set_declarations() or %NULL if none was set. * * Since: 1.10 @@ -783,7 +783,7 @@ cogl_snippet_set_pre (CoglSnippet *snippet, * cogl_snippet_get_pre: * @snippet: A #CoglSnippet * - * Return value: the source string that was set with + * Return value: (transfer none): the source string that was set with * cogl_snippet_set_pre() or %NULL if none was set. * * Since: 1.10 @@ -817,7 +817,7 @@ cogl_snippet_set_replace (CoglSnippet *snippet, * cogl_snippet_get_replace: * @snippet: A #CoglSnippet * - * Return value: the source string that was set with + * Return value: (transfer none): the source string that was set with * cogl_snippet_set_replace() or %NULL if none was set. * * Since: 1.10 @@ -851,7 +851,7 @@ cogl_snippet_set_post (CoglSnippet *snippet, * cogl_snippet_get_post: * @snippet: A #CoglSnippet * - * Return value: the source string that was set with + * Return value: (transfer none): the source string that was set with * cogl_snippet_set_post() or %NULL if none was set. * * Since: 1.10 diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build index fa34eac52..3618524a9 100644 --- a/cogl/cogl/meson.build +++ b/cogl/cogl/meson.build @@ -82,6 +82,7 @@ cogl_headers = [ 'cogl-pipeline-state.h', 'cogl-pipeline-layer-state.h', 'cogl-pixel-format.h', + 'cogl-snippet.h', 'cogl-texture.h', 'cogl-texture-2d.h', 'cogl-texture-2d-sliced.h', @@ -96,7 +97,6 @@ cogl_nonintrospected_headers = [ 'cogl-onscreen-template.h', 'cogl-dma-buf-handle.h', 'cogl-display.h', - 'cogl-snippet.h', 'cogl-index-buffer.h', 'cogl-attribute-buffer.h', 'cogl-indices.h',