From 90198daed162b0e307ac548437452a08f246c549 Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Mon, 5 Feb 2018 14:58:06 +1100 Subject: [PATCH] gl: some annotation fixes --- gst-libs/gst/gl/gstglbasememory.c | 2 +- gst-libs/gst/gl/gstglmemory.c | 4 ++-- gst-libs/gst/gl/gstglmemory.h | 4 ++-- gst-libs/gst/gl/gstglshader.c | 46 ++++++++++++++++++++++++--------------- gst-libs/gst/gl/gstglshader.h | 16 +++++++------- gst-libs/gst/gl/gstglsl.h | 4 ++-- 6 files changed, 44 insertions(+), 32 deletions(-) diff --git a/gst-libs/gst/gl/gstglbasememory.c b/gst-libs/gst/gl/gstglbasememory.c index 4bebedc..24cfd3a 100644 --- a/gst-libs/gst/gl/gstglbasememory.c +++ b/gst-libs/gst/gl/gstglbasememory.c @@ -596,7 +596,7 @@ gst_gl_base_memory_memcpy (GstGLBaseMemory * src, GstGLBaseMemory * dest, } /** - * gst_gl_allocation_params_init: + * gst_gl_allocation_params_init: (skip) * @params: the #GstGLAllocationParams to initialize * @struct_size: the struct size of the implementation * @alloc_flags: some alloc flags diff --git a/gst-libs/gst/gl/gstglmemory.c b/gst-libs/gst/gl/gstglmemory.c index f811c73..76d7034 100644 --- a/gst-libs/gst/gl/gstglmemory.c +++ b/gst-libs/gst/gl/gstglmemory.c @@ -621,7 +621,7 @@ _gl_tex_unmap (GstGLMemory * gl_mem, GstMapInfo * info) /** * gst_gl_memory_copy_teximage: - * @gl_mem: the source #GstGLMemory + * @src: the source #GstGLMemory * @tex_id: the destination texture id * @out_target: the destination #GstGLTextureTarget * @out_tex_format: the destination #GstGLFormat @@ -1150,7 +1150,7 @@ _gst_gl_video_allocation_params_set_video_alignment (GstGLVideoAllocationParams } /** - * gst_gl_video_allocation_params_init_full: + * gst_gl_video_allocation_params_init_full: (skip) * @params: a #GstGLVideoAllocationParams to initialize * @struct_size: the size of the struct in @params * @alloc_flags: some allocation flags diff --git a/gst-libs/gst/gl/gstglmemory.h b/gst-libs/gst/gl/gstglmemory.h index e7721a7..71dd999 100644 --- a/gst-libs/gst/gl/gstglmemory.h +++ b/gst-libs/gst/gl/gstglmemory.h @@ -268,8 +268,8 @@ gboolean gst_gl_memory_copy_teximage (GstGLMemory * src, guint tex_id, GstGLTextureTarget out_target, GstGLFormat out_tex_format, - gint width, - gint height); + gint out_width, + gint out_height); GST_EXPORT gboolean gst_gl_memory_read_pixels (GstGLMemory * gl_mem, diff --git a/gst-libs/gst/gl/gstglshader.c b/gst-libs/gst/gl/gstglshader.c index 9e5e1f7..6d14159 100644 --- a/gst-libs/gst/gl/gstglshader.c +++ b/gst-libs/gst/gl/gstglshader.c @@ -865,7 +865,7 @@ gst_gl_shader_set_uniform_1f (GstGLShader * shader, const gchar * name, */ void gst_gl_shader_set_uniform_1fv (GstGLShader * shader, const gchar * name, - guint count, gfloat * value) + guint count, const gfloat * value) { GstGLShaderPrivate *priv; GstGLFuncs *gl; @@ -918,7 +918,7 @@ gst_gl_shader_set_uniform_1i (GstGLShader * shader, const gchar * name, */ void gst_gl_shader_set_uniform_1iv (GstGLShader * shader, const gchar * name, - guint count, gint * value) + guint count, const gint * value) { GstGLShaderPrivate *priv; GstGLFuncs *gl; @@ -938,13 +938,14 @@ gst_gl_shader_set_uniform_1iv (GstGLShader * shader, const gchar * name, * gst_gl_shader_set_uniform_2f: * @shader: a #GstGLShader * @name: name of the uniform - * @value: value to set + * @v0: first value to set + * @v1: second value to set * * Perform glUniform2f() for @name on @shader */ void gst_gl_shader_set_uniform_2f (GstGLShader * shader, const gchar * name, - gfloat value0, gfloat value1) + gfloat v0, gfloat v1) { GstGLShaderPrivate *priv; GstGLFuncs *gl; @@ -957,7 +958,7 @@ gst_gl_shader_set_uniform_2f (GstGLShader * shader, const gchar * name, location = _get_uniform_location (shader, name); - gl->Uniform2f (location, value0, value1); + gl->Uniform2f (location, v0, v1); } /** @@ -971,7 +972,7 @@ gst_gl_shader_set_uniform_2f (GstGLShader * shader, const gchar * name, */ void gst_gl_shader_set_uniform_2fv (GstGLShader * shader, const gchar * name, - guint count, gfloat * value) + guint count, const gfloat * value) { GstGLShaderPrivate *priv; GstGLFuncs *gl; @@ -991,7 +992,8 @@ gst_gl_shader_set_uniform_2fv (GstGLShader * shader, const gchar * name, * gst_gl_shader_set_uniform_2i: * @shader: a #GstGLShader * @name: name of the uniform - * @value: value to set + * @v0: first value to set + * @v1: second value to set * * Perform glUniform2i() for @name on @shader */ @@ -1024,7 +1026,7 @@ gst_gl_shader_set_uniform_2i (GstGLShader * shader, const gchar * name, */ void gst_gl_shader_set_uniform_2iv (GstGLShader * shader, const gchar * name, - guint count, gint * value) + guint count, const gint * value) { GstGLShaderPrivate *priv; GstGLFuncs *gl; @@ -1044,7 +1046,9 @@ gst_gl_shader_set_uniform_2iv (GstGLShader * shader, const gchar * name, * gst_gl_shader_set_uniform_3f: * @shader: a #GstGLShader * @name: name of the uniform - * @value: value to set + * @v0: first value to set + * @v1: second value to set + * @v2: third value to set * * Perform glUniform3f() for @name on @shader */ @@ -1077,7 +1081,7 @@ gst_gl_shader_set_uniform_3f (GstGLShader * shader, const gchar * name, */ void gst_gl_shader_set_uniform_3fv (GstGLShader * shader, const gchar * name, - guint count, gfloat * value) + guint count, const gfloat * value) { GstGLShaderPrivate *priv; GstGLFuncs *gl; @@ -1097,7 +1101,9 @@ gst_gl_shader_set_uniform_3fv (GstGLShader * shader, const gchar * name, * gst_gl_shader_set_uniform_3i: * @shader: a #GstGLShader * @name: name of the uniform - * @value: value to set + * @v0: first value to set + * @v1: second value to set + * @v2: third value to set * * Perform glUniform3i() for @name on @shader */ @@ -1130,7 +1136,7 @@ gst_gl_shader_set_uniform_3i (GstGLShader * shader, const gchar * name, */ void gst_gl_shader_set_uniform_3iv (GstGLShader * shader, const gchar * name, - guint count, gint * value) + guint count, const gint * value) { GstGLShaderPrivate *priv; GstGLFuncs *gl; @@ -1150,7 +1156,10 @@ gst_gl_shader_set_uniform_3iv (GstGLShader * shader, const gchar * name, * gst_gl_shader_set_uniform_4f: * @shader: a #GstGLShader * @name: name of the uniform - * @value: value to set + * @v0: first value to set + * @v1: second value to set + * @v2: third value to set + * @v3: fourth value to set * * Perform glUniform4f() for @name on @shader */ @@ -1183,7 +1192,7 @@ gst_gl_shader_set_uniform_4f (GstGLShader * shader, const gchar * name, */ void gst_gl_shader_set_uniform_4fv (GstGLShader * shader, const gchar * name, - guint count, gfloat * value) + guint count, const gfloat * value) { GstGLShaderPrivate *priv; GstGLFuncs *gl; @@ -1203,7 +1212,10 @@ gst_gl_shader_set_uniform_4fv (GstGLShader * shader, const gchar * name, * gst_gl_shader_set_uniform_4i: * @shader: a #GstGLShader * @name: name of the uniform - * @value: value to set + * @v0: first value to set + * @v1: second value to set + * @v2: third value to set + * @v3: fourth value to set * * Perform glUniform4i() for @name on @shader */ @@ -1236,7 +1248,7 @@ gst_gl_shader_set_uniform_4i (GstGLShader * shader, const gchar * name, */ void gst_gl_shader_set_uniform_4iv (GstGLShader * shader, const gchar * name, - guint count, gint * value) + guint count, const gint * value) { GstGLShaderPrivate *priv; GstGLFuncs *gl; @@ -1258,7 +1270,7 @@ gst_gl_shader_set_uniform_4iv (GstGLShader * shader, const gchar * name, * @name: name of the uniform * @count: number of 2x2 matrices to set * @transpose: transpose the matrix - * @value: values to set + * @value: matrix to set * * Perform glUniformMatrix2fv() for @name on @shader */ diff --git a/gst-libs/gst/gl/gstglshader.h b/gst-libs/gst/gl/gstglshader.h index 0e49123..c3bc57c 100644 --- a/gst-libs/gst/gl/gstglshader.h +++ b/gst-libs/gst/gl/gstglshader.h @@ -100,35 +100,35 @@ void gst_gl_context_clear_shader (GstGLContext *context); GST_EXPORT void gst_gl_shader_set_uniform_1i (GstGLShader *shader, const gchar *name, gint value); GST_EXPORT -void gst_gl_shader_set_uniform_1iv (GstGLShader *shader, const gchar *name, guint count, gint *value); +void gst_gl_shader_set_uniform_1iv (GstGLShader *shader, const gchar *name, guint count, const gint *value); GST_EXPORT void gst_gl_shader_set_uniform_1f (GstGLShader *shader, const gchar *name, gfloat value); GST_EXPORT -void gst_gl_shader_set_uniform_1fv (GstGLShader *shader, const gchar *name, guint count, gfloat *value); +void gst_gl_shader_set_uniform_1fv (GstGLShader *shader, const gchar *name, guint count, const gfloat *value); GST_EXPORT void gst_gl_shader_set_uniform_2i (GstGLShader *shader, const gchar *name, gint v0, gint v1); GST_EXPORT -void gst_gl_shader_set_uniform_2iv (GstGLShader *shader, const gchar *name, guint count, gint *value); +void gst_gl_shader_set_uniform_2iv (GstGLShader *shader, const gchar *name, guint count, const gint *value); GST_EXPORT void gst_gl_shader_set_uniform_2f (GstGLShader *shader, const gchar *name, gfloat v0, gfloat v1); GST_EXPORT -void gst_gl_shader_set_uniform_2fv (GstGLShader *shader, const gchar *name, guint count, gfloat *value); +void gst_gl_shader_set_uniform_2fv (GstGLShader *shader, const gchar *name, guint count, const gfloat *value); GST_EXPORT void gst_gl_shader_set_uniform_3i (GstGLShader *shader, const gchar *name, gint v0, gint v1, gint v2); GST_EXPORT -void gst_gl_shader_set_uniform_3iv (GstGLShader *shader, const gchar *name, guint count, gint * value); +void gst_gl_shader_set_uniform_3iv (GstGLShader *shader, const gchar *name, guint count, const gint * value); GST_EXPORT void gst_gl_shader_set_uniform_3f (GstGLShader *shader, const gchar *name, gfloat v0, gfloat v1, gfloat v2); GST_EXPORT -void gst_gl_shader_set_uniform_3fv (GstGLShader *shader, const gchar *name, guint count, gfloat *value); +void gst_gl_shader_set_uniform_3fv (GstGLShader *shader, const gchar *name, guint count, const gfloat *value); GST_EXPORT void gst_gl_shader_set_uniform_4i (GstGLShader *shader, const gchar *name, gint v0, gint v1, gint v2, gint v3); GST_EXPORT -void gst_gl_shader_set_uniform_4iv (GstGLShader *shader, const gchar *name, guint count, gint *value); +void gst_gl_shader_set_uniform_4iv (GstGLShader *shader, const gchar *name, guint count, const gint *value); GST_EXPORT void gst_gl_shader_set_uniform_4f (GstGLShader *shader, const gchar *name, gfloat v0, gfloat v1, gfloat v2, gfloat v3); GST_EXPORT -void gst_gl_shader_set_uniform_4fv (GstGLShader *shader, const gchar *name, guint count, gfloat *value); +void gst_gl_shader_set_uniform_4fv (GstGLShader *shader, const gchar *name, guint count, const gfloat *value); GST_EXPORT void gst_gl_shader_set_uniform_matrix_2fv (GstGLShader *shader, const gchar *name, gint count, gboolean transpose, const gfloat* value); GST_EXPORT diff --git a/gst-libs/gst/gl/gstglsl.h b/gst-libs/gst/gl/gstglsl.h index af837fd..83a5436 100644 --- a/gst-libs/gst/gl/gstglsl.h +++ b/gst-libs/gst/gl/gstglsl.h @@ -137,8 +137,8 @@ gchar * gst_glsl_version_profile_to_string (GstGLSLVersion version, GstGLSLProfile profile); GST_EXPORT gboolean gst_glsl_version_profile_from_string (const gchar * string, - GstGLSLVersion * version, - GstGLSLProfile * profile); + GstGLSLVersion * version_ret, + GstGLSLProfile * profile_ret); GST_EXPORT gboolean gst_glsl_string_get_version_profile (const gchar *s, -- 2.7.4