Commit e225af3e authored by Matthew Waters's avatar Matthew Waters 🐨 Committed by Tim-Philipp Müller

gl: silence all the compiler warnings

parent a884d6fe
...@@ -37,7 +37,7 @@ gst_gl_effects_bulge_callback (gint width, gint height, guint texture, ...@@ -37,7 +37,7 @@ gst_gl_effects_bulge_callback (gint width, gint height, guint texture,
if (!shader) { if (!shader) {
shader = gst_gl_shader_new (context); shader = gst_gl_shader_new (context);
g_hash_table_insert (effects->shaderstable, "bulge0", shader); g_hash_table_insert (effects->shaderstable, (gchar *) "bulge0", shader);
} }
if (!gst_gl_shader_compile_and_check (shader, if (!gst_gl_shader_compile_and_check (shader,
......
...@@ -37,7 +37,7 @@ gst_gl_effects_fisheye_callback (gint width, gint height, guint texture, ...@@ -37,7 +37,7 @@ gst_gl_effects_fisheye_callback (gint width, gint height, guint texture,
if (!shader) { if (!shader) {
shader = gst_gl_shader_new (context); shader = gst_gl_shader_new (context);
g_hash_table_insert (effects->shaderstable, "fisheye0", shader); g_hash_table_insert (effects->shaderstable, (gchar *) "fisheye0", shader);
} }
if (!gst_gl_shader_compile_and_check (shader, if (!gst_gl_shader_compile_and_check (shader,
......
...@@ -40,7 +40,7 @@ gst_gl_effects_glow_step_one (gint width, gint height, guint texture, ...@@ -40,7 +40,7 @@ gst_gl_effects_glow_step_one (gint width, gint height, guint texture,
if (!shader) { if (!shader) {
shader = gst_gl_shader_new (context); shader = gst_gl_shader_new (context);
g_hash_table_insert (effects->shaderstable, "glow0", shader); g_hash_table_insert (effects->shaderstable, (gchar *) "glow0", shader);
} }
if (!gst_gl_shader_compile_and_check (shader, if (!gst_gl_shader_compile_and_check (shader,
...@@ -80,7 +80,7 @@ gst_gl_effects_glow_step_two (gint width, gint height, guint texture, ...@@ -80,7 +80,7 @@ gst_gl_effects_glow_step_two (gint width, gint height, guint texture,
if (!shader) { if (!shader) {
shader = gst_gl_shader_new (context); shader = gst_gl_shader_new (context);
g_hash_table_insert (effects->shaderstable, "glow1", shader); g_hash_table_insert (effects->shaderstable, (gchar *) "glow1", shader);
} }
if (!kernel_ready) { if (!kernel_ready) {
...@@ -113,7 +113,7 @@ gst_gl_effects_glow_step_two (gint width, gint height, guint texture, ...@@ -113,7 +113,7 @@ gst_gl_effects_glow_step_two (gint width, gint height, guint texture,
gst_gl_filter_draw_texture (filter, texture, width, height); gst_gl_filter_draw_texture (filter, texture, width, height);
} }
void static void
gst_gl_effects_glow_step_three (gint width, gint height, guint texture, gst_gl_effects_glow_step_three (gint width, gint height, guint texture,
gpointer data) gpointer data)
{ {
...@@ -127,7 +127,7 @@ gst_gl_effects_glow_step_three (gint width, gint height, guint texture, ...@@ -127,7 +127,7 @@ gst_gl_effects_glow_step_three (gint width, gint height, guint texture,
if (!shader) { if (!shader) {
shader = gst_gl_shader_new (context); shader = gst_gl_shader_new (context);
g_hash_table_insert (effects->shaderstable, "glow2", shader); g_hash_table_insert (effects->shaderstable, (gchar *) "glow2", shader);
} }
if (!gst_gl_shader_compile_and_check (shader, if (!gst_gl_shader_compile_and_check (shader,
...@@ -155,7 +155,7 @@ gst_gl_effects_glow_step_three (gint width, gint height, guint texture, ...@@ -155,7 +155,7 @@ gst_gl_effects_glow_step_three (gint width, gint height, guint texture,
gst_gl_filter_draw_texture (filter, texture, width, height); gst_gl_filter_draw_texture (filter, texture, width, height);
} }
void static void
gst_gl_effects_glow_step_four (gint width, gint height, guint texture, gst_gl_effects_glow_step_four (gint width, gint height, guint texture,
gpointer data) gpointer data)
{ {
...@@ -169,7 +169,7 @@ gst_gl_effects_glow_step_four (gint width, gint height, guint texture, ...@@ -169,7 +169,7 @@ gst_gl_effects_glow_step_four (gint width, gint height, guint texture,
if (!shader) { if (!shader) {
shader = gst_gl_shader_new (context); shader = gst_gl_shader_new (context);
g_hash_table_insert (effects->shaderstable, "glow3", shader); g_hash_table_insert (effects->shaderstable, (gchar *) "glow3", shader);
} }
if (!gst_gl_shader_compile_and_check (shader, if (!gst_gl_shader_compile_and_check (shader,
......
...@@ -51,7 +51,8 @@ gst_gl_effects_identity_callback (gint width, gint height, guint texture, ...@@ -51,7 +51,8 @@ gst_gl_effects_identity_callback (gint width, gint height, guint texture,
if (!shader) { if (!shader) {
shader = gst_gl_shader_new (context); shader = gst_gl_shader_new (context);
g_hash_table_insert (effects->shaderstable, "identity0", shader); g_hash_table_insert (effects->shaderstable, (gchar *) "identity0",
shader);
if (shader) { if (shader) {
GError *error = NULL; GError *error = NULL;
......
...@@ -38,7 +38,7 @@ gst_gl_effects_luma_to_curve (GstGLEffects * effects, ...@@ -38,7 +38,7 @@ gst_gl_effects_luma_to_curve (GstGLEffects * effects,
if (!shader) { if (!shader) {
shader = gst_gl_shader_new (context); shader = gst_gl_shader_new (context);
g_hash_table_insert (effects->shaderstable, "lumamap0", shader); g_hash_table_insert (effects->shaderstable, (gchar *) "lumamap0", shader);
} }
if (!gst_gl_shader_compile_and_check (shader, if (!gst_gl_shader_compile_and_check (shader,
......
...@@ -43,7 +43,7 @@ gst_gl_effects_mirror_callback (gint width, gint height, guint texture, ...@@ -43,7 +43,7 @@ gst_gl_effects_mirror_callback (gint width, gint height, guint texture,
if (!shader) { if (!shader) {
shader = gst_gl_shader_new (context); shader = gst_gl_shader_new (context);
g_hash_table_insert (effects->shaderstable, "mirror0", shader); g_hash_table_insert (effects->shaderstable, (gchar *) "mirror0", shader);
#if GST_GL_HAVE_GLES2 #if GST_GL_HAVE_GLES2
if (USING_GLES2 (context)) { if (USING_GLES2 (context)) {
......
...@@ -38,7 +38,7 @@ gst_gl_effects_rgb_to_curve (GstGLEffects * effects, ...@@ -38,7 +38,7 @@ gst_gl_effects_rgb_to_curve (GstGLEffects * effects,
if (!shader) { if (!shader) {
shader = gst_gl_shader_new (context); shader = gst_gl_shader_new (context);
g_hash_table_insert (effects->shaderstable, "rgbmap0", shader); g_hash_table_insert (effects->shaderstable, (gchar *) "rgbmap0", shader);
} }
if (!gst_gl_shader_compile_and_check (shader, if (!gst_gl_shader_compile_and_check (shader,
......
...@@ -37,7 +37,7 @@ gst_gl_effects_sin_callback (gint width, gint height, guint texture, ...@@ -37,7 +37,7 @@ gst_gl_effects_sin_callback (gint width, gint height, guint texture,
if (!shader) { if (!shader) {
shader = gst_gl_shader_new (context); shader = gst_gl_shader_new (context);
g_hash_table_insert (effects->shaderstable, "sin0", shader); g_hash_table_insert (effects->shaderstable, (gchar *) "sin0", shader);
} }
if (!gst_gl_shader_compile_and_check (shader, if (!gst_gl_shader_compile_and_check (shader,
......
...@@ -37,7 +37,7 @@ gst_gl_effects_square_callback (gint width, gint height, guint texture, ...@@ -37,7 +37,7 @@ gst_gl_effects_square_callback (gint width, gint height, guint texture,
if (!shader) { if (!shader) {
shader = gst_gl_shader_new (context); shader = gst_gl_shader_new (context);
g_hash_table_insert (effects->shaderstable, "square0", shader); g_hash_table_insert (effects->shaderstable, (gchar *) "square0", shader);
} }
if (!gst_gl_shader_compile_and_check (shader, if (!gst_gl_shader_compile_and_check (shader,
......
...@@ -43,7 +43,7 @@ gst_gl_effects_squeeze_callback (gint width, gint height, guint texture, ...@@ -43,7 +43,7 @@ gst_gl_effects_squeeze_callback (gint width, gint height, guint texture,
if (!shader) { if (!shader) {
shader = gst_gl_shader_new (context); shader = gst_gl_shader_new (context);
g_hash_table_insert (effects->shaderstable, "squeeze0", shader); g_hash_table_insert (effects->shaderstable, (gchar *) "squeeze0", shader);
#if GST_GL_HAVE_GLES2 #if GST_GL_HAVE_GLES2
if (USING_GLES2 (context)) { if (USING_GLES2 (context)) {
......
...@@ -37,7 +37,7 @@ gst_gl_effects_stretch_callback (gint width, gint height, guint texture, ...@@ -37,7 +37,7 @@ gst_gl_effects_stretch_callback (gint width, gint height, guint texture,
if (!shader) { if (!shader) {
shader = gst_gl_shader_new (context); shader = gst_gl_shader_new (context);
g_hash_table_insert (effects->shaderstable, "stretch0", shader); g_hash_table_insert (effects->shaderstable, (gchar *) "stretch0", shader);
} }
if (!gst_gl_shader_compile_and_check (shader, if (!gst_gl_shader_compile_and_check (shader,
......
...@@ -37,7 +37,7 @@ gst_gl_effects_tunnel_callback (gint width, gint height, guint texture, ...@@ -37,7 +37,7 @@ gst_gl_effects_tunnel_callback (gint width, gint height, guint texture,
if (!shader) { if (!shader) {
shader = gst_gl_shader_new (context); shader = gst_gl_shader_new (context);
g_hash_table_insert (effects->shaderstable, "tunnel0", shader); g_hash_table_insert (effects->shaderstable, (gchar *) "tunnel0", shader);
} }
if (!gst_gl_shader_compile_and_check (shader, if (!gst_gl_shader_compile_and_check (shader,
......
...@@ -37,7 +37,7 @@ gst_gl_effects_twirl_callback (gint width, gint height, guint texture, ...@@ -37,7 +37,7 @@ gst_gl_effects_twirl_callback (gint width, gint height, guint texture,
if (!shader) { if (!shader) {
shader = gst_gl_shader_new (GST_GL_FILTER (effects)->context); shader = gst_gl_shader_new (GST_GL_FILTER (effects)->context);
g_hash_table_insert (effects->shaderstable, "twirl0", shader); g_hash_table_insert (effects->shaderstable, (gchar *) "twirl0", shader);
} }
if (!gst_gl_shader_compile_and_check (shader, if (!gst_gl_shader_compile_and_check (shader,
......
...@@ -52,7 +52,7 @@ gst_gl_effects_xray_step_two (gint width, gint height, guint texture, ...@@ -52,7 +52,7 @@ gst_gl_effects_xray_step_two (gint width, gint height, guint texture,
if (!shader) { if (!shader) {
shader = gst_gl_shader_new (context); shader = gst_gl_shader_new (context);
g_hash_table_insert (effects->shaderstable, "xray1", shader); g_hash_table_insert (effects->shaderstable, (gchar *) "xray1", shader);
} }
if (!kernel_ready) { if (!kernel_ready) {
...@@ -99,7 +99,7 @@ gst_gl_effects_xray_step_three (gint width, gint height, guint texture, ...@@ -99,7 +99,7 @@ gst_gl_effects_xray_step_three (gint width, gint height, guint texture,
if (!shader) { if (!shader) {
shader = gst_gl_shader_new (context); shader = gst_gl_shader_new (context);
g_hash_table_insert (effects->shaderstable, "xray2", shader); g_hash_table_insert (effects->shaderstable, (gchar *) "xray2", shader);
} }
if (!gst_gl_shader_compile_and_check (shader, if (!gst_gl_shader_compile_and_check (shader,
...@@ -142,7 +142,7 @@ gst_gl_effects_xray_desaturate (gint width, gint height, guint texture, ...@@ -142,7 +142,7 @@ gst_gl_effects_xray_desaturate (gint width, gint height, guint texture,
if (!shader) { if (!shader) {
shader = gst_gl_shader_new (context); shader = gst_gl_shader_new (context);
g_hash_table_insert (effects->shaderstable, "xray_desat", shader); g_hash_table_insert (effects->shaderstable, (gchar *) "xray_desat", shader);
} }
if (!gst_gl_shader_compile_and_check (shader, if (!gst_gl_shader_compile_and_check (shader,
...@@ -182,7 +182,8 @@ gst_gl_effects_xray_sobel_hconv (gint width, gint height, guint texture, ...@@ -182,7 +182,8 @@ gst_gl_effects_xray_sobel_hconv (gint width, gint height, guint texture,
if (!shader) { if (!shader) {
shader = gst_gl_shader_new (context); shader = gst_gl_shader_new (context);
g_hash_table_insert (effects->shaderstable, "xray_sob_hconv", shader); g_hash_table_insert (effects->shaderstable, (gchar *) "xray_sob_hconv",
shader);
} }
if (!gst_gl_shader_compile_and_check (shader, if (!gst_gl_shader_compile_and_check (shader,
...@@ -224,7 +225,8 @@ gst_gl_effects_xray_sobel_vconv (gint width, gint height, guint texture, ...@@ -224,7 +225,8 @@ gst_gl_effects_xray_sobel_vconv (gint width, gint height, guint texture,
if (!shader) { if (!shader) {
shader = gst_gl_shader_new (context); shader = gst_gl_shader_new (context);
g_hash_table_insert (effects->shaderstable, "xray_sob_vconv", shader); g_hash_table_insert (effects->shaderstable, (gchar *) "xray_sob_vconv",
shader);
} }
if (!gst_gl_shader_compile_and_check (shader, if (!gst_gl_shader_compile_and_check (shader,
...@@ -266,7 +268,8 @@ gst_gl_effects_xray_sobel_length (gint width, gint height, guint texture, ...@@ -266,7 +268,8 @@ gst_gl_effects_xray_sobel_length (gint width, gint height, guint texture,
if (!shader) { if (!shader) {
shader = gst_gl_shader_new (context); shader = gst_gl_shader_new (context);
g_hash_table_insert (effects->shaderstable, "xray_sob_len", shader); g_hash_table_insert (effects->shaderstable, (gchar *) "xray_sob_len",
shader);
} }
if (!gst_gl_shader_compile_and_check (shader, if (!gst_gl_shader_compile_and_check (shader,
...@@ -295,7 +298,7 @@ gst_gl_effects_xray_sobel_length (gint width, gint height, guint texture, ...@@ -295,7 +298,7 @@ gst_gl_effects_xray_sobel_length (gint width, gint height, guint texture,
/* end of sobel passes */ /* end of sobel passes */
void static void
gst_gl_effects_xray_step_five (gint width, gint height, guint texture, gst_gl_effects_xray_step_five (gint width, gint height, guint texture,
gpointer data) gpointer data)
{ {
...@@ -309,7 +312,7 @@ gst_gl_effects_xray_step_five (gint width, gint height, guint texture, ...@@ -309,7 +312,7 @@ gst_gl_effects_xray_step_five (gint width, gint height, guint texture,
if (!shader) { if (!shader) {
shader = gst_gl_shader_new (context); shader = gst_gl_shader_new (context);
g_hash_table_insert (effects->shaderstable, "xray4", shader); g_hash_table_insert (effects->shaderstable, (gchar *) "xray4", shader);
} }
if (!gst_gl_shader_compile_and_check (shader, if (!gst_gl_shader_compile_and_check (shader,
......
...@@ -56,4 +56,6 @@ struct _GstGLDifferenceMatteClass ...@@ -56,4 +56,6 @@ struct _GstGLDifferenceMatteClass
GstGLFilterClass filter_class; GstGLFilterClass filter_class;
}; };
GType gst_gl_differencematte_get_type (void);
#endif /* _GST_GL_DIFFERENCEMATTE_H_ */ #endif /* _GST_GL_DIFFERENCEMATTE_H_ */
...@@ -48,7 +48,7 @@ struct _GstGLFilterAppClass ...@@ -48,7 +48,7 @@ struct _GstGLFilterAppClass
GstGLFilterClass filter_class; GstGLFilterClass filter_class;
}; };
GType gst_gl_glfilterapp_get_type (void); GType gst_gl_filter_app_get_type (void);
G_END_DECLS G_END_DECLS
......
...@@ -48,6 +48,6 @@ struct _GstGLFilterBlurClass ...@@ -48,6 +48,6 @@ struct _GstGLFilterBlurClass
GstGLFilterClass filter_class; GstGLFilterClass filter_class;
}; };
GType gst_gl_glfilterblur_get_type (void); GType gst_gl_filterblur_get_type (void);
#endif /* _GST_GL_FILTERBLUR_H_ */ #endif /* _GST_GL_FILTERBLUR_H_ */
...@@ -58,7 +58,7 @@ struct _GstGLFilterCubeClass ...@@ -58,7 +58,7 @@ struct _GstGLFilterCubeClass
GstGLFilterClass filter_class; GstGLFilterClass filter_class;
}; };
GType gst_gl_glfiltercube_get_type (void); GType gst_gl_filter_cube_get_type (void);
G_END_DECLS G_END_DECLS
......
...@@ -49,7 +49,7 @@ struct _GstGLFilterGlassClass ...@@ -49,7 +49,7 @@ struct _GstGLFilterGlassClass
GstGLFilterClass filter_class; GstGLFilterClass filter_class;
}; };
GType gst_gl_glfilterglass_get_type (void); GType gst_gl_filter_glass_get_type (void);
G_END_DECLS G_END_DECLS
......
...@@ -46,7 +46,7 @@ struct _GstGLFilterLaplacianClass ...@@ -46,7 +46,7 @@ struct _GstGLFilterLaplacianClass
GstGLFilterClass filter_class; GstGLFilterClass filter_class;
}; };
GType gst_gl_glfilterlaplacian_get_type (void); GType gst_gl_filter_laplacian_get_type (void);
G_END_DECLS G_END_DECLS
......
...@@ -334,7 +334,7 @@ gst_gl_filter_reflected_screen_draw_screen (GstGLFilter * filter, ...@@ -334,7 +334,7 @@ gst_gl_filter_reflected_screen_draw_screen (GstGLFilter * filter,
} }
static void static void
gst_gl_filter_reflected_screen_draw_background () gst_gl_filter_reflected_screen_draw_background (void)
{ {
glBegin (GL_QUADS); glBegin (GL_QUADS);
...@@ -352,7 +352,7 @@ gst_gl_filter_reflected_screen_draw_background () ...@@ -352,7 +352,7 @@ gst_gl_filter_reflected_screen_draw_background ()
} }
static void static void
gst_gl_filter_reflected_screen_draw_floor () gst_gl_filter_reflected_screen_draw_floor (void)
{ {
GLUquadricObj *q; GLUquadricObj *q;
//create a quadric for the floor's drawing //create a quadric for the floor's drawing
......
...@@ -53,7 +53,7 @@ struct _GstGLFilterReflectedScreenClass ...@@ -53,7 +53,7 @@ struct _GstGLFilterReflectedScreenClass
GstGLFilterClass filter_class; GstGLFilterClass filter_class;
}; };
GType gst_gl_glfilterreflectedscreen_get_type (void); GType gst_gl_filter_reflected_screen_get_type (void);
G_END_DECLS G_END_DECLS
......
...@@ -50,6 +50,6 @@ struct _GstGLFilterShaderClass ...@@ -50,6 +50,6 @@ struct _GstGLFilterShaderClass
GstGLFilterClass filter_class; GstGLFilterClass filter_class;
}; };
GType gst_gl_glfiltershader_get_type (void); GType gst_gl_filtershader_get_type (void);
#endif /* _GST_GL_FILTERSHADER_H_ */ #endif /* _GST_GL_FILTERSHADER_H_ */
...@@ -51,6 +51,6 @@ struct _GstGLFilterSobelClass ...@@ -51,6 +51,6 @@ struct _GstGLFilterSobelClass
GstGLFilterClass filter_class; GstGLFilterClass filter_class;
}; };
GType gst_gl_glfiltersobel_get_type (void); GType gst_gl_filtersobel_get_type (void);
#endif /* _GST_GL_FILTERSOBEL_H_ */ #endif /* _GST_GL_FILTERSOBEL_H_ */
...@@ -75,6 +75,8 @@ struct _GstGLOverlayClass ...@@ -75,6 +75,8 @@ struct _GstGLOverlayClass
GstGLFilterClass filter_class; GstGLFilterClass filter_class;
}; };
GType gst_gl_overlay_get_type (void);
G_END_DECLS G_END_DECLS
#endif /* _GST_GL_OVERLAY_H_ */ #endif /* _GST_GL_OVERLAY_H_ */
...@@ -55,42 +55,23 @@ ...@@ -55,42 +55,23 @@
#include "gstgleffects.h" #include "gstgleffects.h"
#include "gstglcolorscale.h" #include "gstglcolorscale.h"
GType gst_gl_filter_cube_get_type (void);
GType gst_gl_effects_get_type (void);
#if GST_GL_HAVE_OPENGL #if GST_GL_HAVE_OPENGL
#include "gstgltestsrc.h" #include "gstgltestsrc.h"
#include "gstglfilterlaplacian.h" #include "gstglfilterlaplacian.h"
#include "gstglfilterglass.h" #include "gstglfilterglass.h"
#include "gstglfilterapp.h" #include "gstglfilterapp.h"
#include "gstglfilterblur.h"
#include "gstglfilterreflectedscreen.h" #include "gstglfilterreflectedscreen.h"
#include "gstglfiltershader.h" #include "gstglfiltershader.h"
#include "gstglfiltersobel.h"
#include "gstgldeinterlace.h" #include "gstgldeinterlace.h"
#include "gstglmosaic.h" #include "gstglmosaic.h"
#include "gstglvideomixer.h" #include "gstglvideomixer.h"
GType gst_gl_deinterlace_get_type (void);
GType gst_gl_filter_app_get_type (void);
GType gst_gl_filter_reflected_screen_get_type (void);
GType gst_gl_filterblur_get_type (void);
GType gst_gl_filtershader_get_type (void);
GType gst_gl_filtersobel_get_type (void);
GType gst_gl_filter_laplacian_get_type (void);
GType gst_gl_filter_glass_get_type (void);
GType gst_gl_mosaic_get_type (void);
#if HAVE_PNG #if HAVE_PNG
#include "gstgldifferencematte.h" #include "gstgldifferencematte.h"
#include "gstglbumper.h" #include "gstglbumper.h"
GType gst_gl_differencematte_get_type (void);
GType gst_gl_bumper_get_type (void);
#if HAVE_JPEG #if HAVE_JPEG
#include "gstgloverlay.h" #include "gstgloverlay.h"
GType gst_gl_overlay_get_type (void);
#endif /* HAVE_JPEG */ #endif /* HAVE_JPEG */
#endif /* HAVE_PNG */ #endif /* HAVE_PNG */
#endif /* GST_GL_HAVE_OPENGL */ #endif /* GST_GL_HAVE_OPENGL */
......
...@@ -78,7 +78,7 @@ gst_gl_api_to_string (GstGLAPI api) ...@@ -78,7 +78,7 @@ gst_gl_api_to_string (GstGLAPI api)
out: out:
if (!str) if (!str)
return "unknown"; str = g_string_new ("unknown");
ret = g_string_free (str, FALSE); ret = g_string_free (str, FALSE);
return ret; return ret;
...@@ -168,7 +168,7 @@ gst_gl_platform_to_string (GstGLPlatform platform) ...@@ -168,7 +168,7 @@ gst_gl_platform_to_string (GstGLPlatform platform)
out: out:
if (!str) if (!str)
return "unknown"; str = g_string_new ("unknown");
ret = g_string_free (str, FALSE); ret = g_string_free (str, FALSE);
return ret; return ret;
......
...@@ -585,7 +585,7 @@ _create_context_gles2 (GstGLContext * context, gint * gl_major, gint * gl_minor, ...@@ -585,7 +585,7 @@ _create_context_gles2 (GstGLContext * context, gint * gl_major, gint * gl_minor,
return TRUE; return TRUE;
} }
gboolean static gboolean
_create_context_opengl (GstGLContext * context, gint * gl_major, _create_context_opengl (GstGLContext * context, gint * gl_major,
gint * gl_minor, GError ** error) gint * gl_minor, GError ** error)
{ {
...@@ -631,7 +631,7 @@ _create_context_opengl (GstGLContext * context, gint * gl_major, ...@@ -631,7 +631,7 @@ _create_context_opengl (GstGLContext * context, gint * gl_major,
return TRUE; return TRUE;
} }
GstGLAPI static GstGLAPI
_compiled_api (void) _compiled_api (void)
{ {
GstGLAPI ret = GST_GL_API_NONE; GstGLAPI ret = GST_GL_API_NONE;
...@@ -999,13 +999,3 @@ static void ...@@ -999,13 +999,3 @@ static void
gst_gl_wrapped_context_init (GstGLWrappedContext * context) gst_gl_wrapped_context_init (GstGLWrappedContext * context)
{ {
} }
/* Must be called in the gl thread */
GstGLWrappedContext *
gst_gl_wrapped_context_new (void)
{
GstGLWrappedContext *context =
g_object_new (GST_GL_TYPE_WRAPPED_CONTEXT, NULL);
return context;
}
...@@ -86,7 +86,7 @@ static const GstGLFeatureData gst_gl_feature_ext_functions_data[] = { ...@@ -86,7 +86,7 @@ static const GstGLFeatureData gst_gl_feature_ext_functions_data[] = {
#undef GST_GL_EXT_FUNCTION #undef GST_GL_EXT_FUNCTION
#undef GST_GL_EXT_END #undef GST_GL_EXT_END
gboolean static gboolean
_gst_gl_feature_check_for_extension (const GstGLFeatureData * data, _gst_gl_feature_check_for_extension (const GstGLFeatureData * data,
const char *driver_prefix, const char *extensions_string, const char *driver_prefix, const char *extensions_string,
const char **suffix) const char **suffix)
......
...@@ -112,7 +112,7 @@ _gl_mem_new (GstAllocator * allocator, GstMemory * parent, ...@@ -112,7 +112,7 @@ _gl_mem_new (GstAllocator * allocator, GstMemory * parent,
return mem; return mem;
} }
gpointer static gpointer
_gl_mem_map (GstGLMemory * gl_mem, gsize maxsize, GstMapFlags flags) _gl_mem_map (GstGLMemory * gl_mem, gsize maxsize, GstMapFlags flags)
{ {
gpointer data; gpointer data;
...@@ -182,7 +182,7 @@ error: ...@@ -182,7 +182,7 @@ error:
} }
} }
void static void
_gl_mem_unmap (GstGLMemory * gl_mem) _gl_mem_unmap (GstGLMemory * gl_mem)
{ {
if ((gl_mem->map_flags & GST_MAP_WRITE) == GST_MAP_WRITE) { if ((gl_mem->map_flags & GST_MAP_WRITE) == GST_MAP_WRITE) {
...@@ -196,7 +196,7 @@ _gl_mem_unmap (GstGLMemory * gl_mem) ...@@ -196,7 +196,7 @@ _gl_mem_unmap (GstGLMemory * gl_mem)
gl_mem->map_flags = 0; gl_mem->map_flags = 0;
} }
void static void
_gl_mem_copy_thread (GstGLContext * context, gpointer data) _gl_mem_copy_thread (GstGLContext * context, gpointer data)
{ {
GstGLMemoryCopyParams *copy_params; GstGLMemoryCopyParams *copy_params;
...@@ -303,7 +303,7 @@ error: ...@@ -303,7 +303,7 @@ error:
} }
} }
GstMemory * static GstMemory *
_gl_mem_copy (GstGLMemory * src, gssize offset, gssize size) _gl_mem_copy (GstGLMemory * src, gssize offset, gssize size)
{ {
GstGLMemory *dest; GstGLMemory *dest;
...@@ -344,19 +344,19 @@ _gl_mem_copy (GstGLMemory * src, gssize offset, gssize size) ...@@ -344,19 +344,19 @@ _gl_mem_copy (GstGLMemory * src, gssize offset, gssize size)
return (GstMemory *) dest; return (GstMemory *) dest;
} }