diff --git a/gst-libs/gst/gl/gstglbasefilter.h b/gst-libs/gst/gl/gstglbasefilter.h index fa16d07011..f893127ada 100644 --- a/gst-libs/gst/gl/gstglbasefilter.h +++ b/gst-libs/gst/gl/gstglbasefilter.h @@ -58,7 +58,7 @@ struct _GstGLBaseFilter GstCaps *out_caps; /* */ - gpointer _padding[GST_PADDING]; + gpointer _padding[GST_PADDING]; GstGLBaseFilterPrivate *priv; }; diff --git a/gst-libs/gst/gl/gstglbasememory.h b/gst-libs/gst/gl/gstglbasememory.h index bee28444ee..22129d0f34 100644 --- a/gst-libs/gst/gl/gstglbasememory.h +++ b/gst-libs/gst/gl/gstglbasememory.h @@ -112,6 +112,8 @@ struct _GstGLBaseMemory GDestroyNotify notify; gpointer user_data; + + gpointer _padding[GST_PADDING]; }; typedef struct _GstGLAllocationParams GstGLAllocationParams; @@ -174,6 +176,9 @@ struct _GstGLAllocationParams gpointer wrapped_data; /* GST_GL_ALLOCATION_PARAMS_ALLOC_FLAG_WRAP_GPU_HANDLE only */ gpointer gl_handle; + + /* */ + gpointer _padding[GST_PADDING]; }; gboolean gst_gl_allocation_params_init (GstGLAllocationParams * params, @@ -293,6 +298,8 @@ struct _GstGLBaseMemoryAllocator /*< private >*/ GstAllocator parent; GstMemoryCopyFunction fallback_mem_copy; + + gpointer _padding[GST_PADDING]; }; /** @@ -315,13 +322,16 @@ struct _GstGLBaseMemoryAllocatorClass GstGLBaseMemoryAllocatorCreateFunction create; GstGLBaseMemoryAllocatorMapFunction map; + GstGLBaseMemoryAllocatorUnmapFunction unmap; + GstGLBaseMemoryAllocatorCopyFunction copy; + GstGLBaseMemoryAllocatorDestroyFunction destroy; #if 0 GstGLBaseMemoryAllocatorFlushFunction flush; /* make CPU writes visible to the GPU */ GstGLBaseMemoryAllocatorInvalidateFunction invalidate; /* make GPU writes visible to the CPU */ #endif - GstGLBaseMemoryAllocatorUnmapFunction unmap; - GstGLBaseMemoryAllocatorCopyFunction copy; - GstGLBaseMemoryAllocatorDestroyFunction destroy; + + /* */ + gpointer _padding[GST_PADDING]; }; #include diff --git a/gst-libs/gst/gl/gstglbuffer.h b/gst-libs/gst/gl/gstglbuffer.h index ef519d8534..e481536e95 100644 --- a/gst-libs/gst/gl/gstglbuffer.h +++ b/gst-libs/gst/gl/gstglbuffer.h @@ -74,6 +74,9 @@ struct _GstGLBufferAllocationParams guint gl_target; guint gl_usage; + + /* */ + gpointer _padding[GST_PADDING]; }; GstGLBufferAllocationParams * gst_gl_buffer_allocation_params_new (GstGLContext * context, @@ -90,6 +93,9 @@ GstGLBufferAllocationParams * gst_gl_buffer_allocation_params_new (GstGLCo struct _GstGLBufferAllocator { GstGLBaseMemoryAllocator parent; + + /* */ + gpointer _padding[GST_PADDING]; }; /** @@ -100,6 +106,9 @@ struct _GstGLBufferAllocator struct _GstGLBufferAllocatorClass { GstGLBaseMemoryAllocatorClass parent_class; + + /* */ + gpointer _padding[GST_PADDING]; }; #define GST_CAPS_FEATURE_MEMORY_GL_BUFFER "memory:GLBuffer" diff --git a/gst-libs/gst/gl/gstglbufferpool.h b/gst-libs/gst/gl/gstglbufferpool.h index 2f964a872f..a136955176 100644 --- a/gst-libs/gst/gl/gstglbufferpool.h +++ b/gst-libs/gst/gl/gstglbufferpool.h @@ -47,7 +47,10 @@ struct _GstGLBufferPool GstGLContext *context; + /* */ GstGLBufferPoolPrivate *priv; + + gpointer _padding[GST_PADDING]; }; /** @@ -58,6 +61,9 @@ struct _GstGLBufferPool struct _GstGLBufferPoolClass { GstBufferPoolClass parent_class; + + /* */ + gpointer _padding[GST_PADDING]; }; GstBufferPool *gst_gl_buffer_pool_new (GstGLContext * context); diff --git a/gst-libs/gst/gl/gstglcolorconvert.h b/gst-libs/gst/gl/gstglcolorconvert.h index fbbbf3b0d7..d978e7ed95 100644 --- a/gst-libs/gst/gl/gstglcolorconvert.h +++ b/gst-libs/gst/gl/gstglcolorconvert.h @@ -76,6 +76,9 @@ struct _GstGLColorConvert struct _GstGLColorConvertClass { GstObjectClass object_class; + + /* */ + gpointer _padding[GST_PADDING]; }; /** diff --git a/gst-libs/gst/gl/gstglcontext.h b/gst-libs/gst/gl/gstglcontext.h index 5cbc8ad841..83e159d0d4 100644 --- a/gst-libs/gst/gl/gstglcontext.h +++ b/gst-libs/gst/gl/gstglcontext.h @@ -69,7 +69,6 @@ typedef enum * Opaque #GstGLContext object */ struct _GstGLContext { - /*< private >*/ GstObject parent; GstGLDisplay *display; @@ -77,9 +76,10 @@ struct _GstGLContext { GstGLFuncs *gl_vtable; - gpointer _reserved[GST_PADDING]; - + /*< private >*/ GstGLContextPrivate *priv; + + gpointer _reserved[GST_PADDING]; }; /** diff --git a/gst-libs/gst/gl/gstgldebug.h b/gst-libs/gst/gl/gstgldebug.h index f568a2b910..f131428ea8 100644 --- a/gst-libs/gst/gl/gstgldebug.h +++ b/gst-libs/gst/gl/gstgldebug.h @@ -51,6 +51,8 @@ struct _GstGLAsyncDebug GstGLAsyncDebugLogGetMessage callback; gpointer user_data; GDestroyNotify notify; + + gpointer _padding[GST_PADDING]; }; GstGLAsyncDebug * gst_gl_async_debug_new (void); diff --git a/gst-libs/gst/gl/gstgldisplay.h b/gst-libs/gst/gl/gstgldisplay.h index 7f49a44324..bc00b68021 100644 --- a/gst-libs/gst/gl/gstgldisplay.h +++ b/gst-libs/gst/gl/gstgldisplay.h @@ -85,6 +85,9 @@ struct _GstGLDisplayClass GstObjectClass object_class; guintptr (*get_handle) (GstGLDisplay * display); + + /* */ + gpointer _padding[GST_PADDING]; }; GstGLDisplay *gst_gl_display_new (void); diff --git a/gst-libs/gst/gl/gstglfeature.h b/gst-libs/gst/gl/gstglfeature.h index fdc3137abe..f1ae1428b1 100644 --- a/gst-libs/gst/gl/gstglfeature.h +++ b/gst-libs/gst/gl/gstglfeature.h @@ -40,8 +40,8 @@ * */ -#ifndef __COGL_FEATURE_PRIVATE_H -#define __COGL_FEATURE_PRIVATE_H +#ifndef __GST_GL_FEATURE_H__ +#define __GST_GL_FEATURE_H__ #include @@ -113,4 +113,4 @@ _gst_gl_feature_check_ext_functions (GstGLContext *context, G_END_DECLS -#endif /* __COGL_FEATURE_PRIVATE_H */ +#endif /* __GST_GL_FEATURE_H__ */ diff --git a/gst-libs/gst/gl/gstglfilter.h b/gst-libs/gst/gl/gstglfilter.h index f56e2d0547..cdebe57db2 100644 --- a/gst-libs/gst/gl/gstglfilter.h +++ b/gst-libs/gst/gl/gstglfilter.h @@ -81,6 +81,8 @@ struct _GstGLFilter GLuint vertex_buffer; GLint draw_attr_position_loc; GLint draw_attr_texture_loc; + + gpointer _padding[GST_PADDING]; }; /** @@ -114,6 +116,8 @@ struct _GstGLFilterClass /* useful to init and cleanup custom gl resources */ void (*display_init_cb) (GstGLFilter *filter); void (*display_reset_cb) (GstGLFilter *filter); + + gpointer _padding[GST_PADDING]; }; gboolean gst_gl_filter_filter_texture (GstGLFilter * filter, GstBuffer * inbuf, diff --git a/gst-libs/gst/gl/gstglframebuffer.h b/gst-libs/gst/gl/gstglframebuffer.h index 0e135c8f91..6298af1602 100644 --- a/gst-libs/gst/gl/gstglframebuffer.h +++ b/gst-libs/gst/gl/gstglframebuffer.h @@ -49,18 +49,22 @@ struct _GstGLFramebuffer { GstObject object; - /* */ GstGLContext *context; + /* */ guint fbo_id; GArray *attachments; + gpointer _padding[GST_PADDING]; + GstGLFramebufferPrivate *priv; }; struct _GstGLFramebufferClass { GstObjectClass object_class; + + gpointer _padding[GST_PADDING]; }; GstGLFramebuffer * gst_gl_framebuffer_new (GstGLContext *context); diff --git a/gst-libs/gst/gl/gstglmemory.h b/gst-libs/gst/gl/gstglmemory.h index f36f64bebc..d63256476b 100644 --- a/gst-libs/gst/gl/gstglmemory.h +++ b/gst-libs/gst/gl/gstglmemory.h @@ -78,6 +78,9 @@ struct _GstGLMemory gboolean texture_wrapped; guint unpack_length; guint tex_width; + + /* */ + gpointer _padding[GST_PADDING]; }; typedef struct _GstGLVideoAllocationParams GstGLVideoAllocationParams; @@ -93,6 +96,9 @@ struct _GstGLVideoAllocationParams GstVideoAlignment *valign; GstGLTextureTarget target; GstVideoGLTextureType tex_type; + + /* */ + gpointer _padding[GST_PADDING]; }; gboolean gst_gl_video_allocation_params_init_full (GstGLVideoAllocationParams * params, @@ -165,6 +171,9 @@ void gst_gl_video_allocation_params_copy_data (GstGLVideoAllocatio struct _GstGLMemoryAllocator { GstGLBaseMemoryAllocator parent; + + /* */ + gpointer _padding[GST_PADDING]; }; /** @@ -179,6 +188,9 @@ struct _GstGLMemoryAllocatorClass GstGLBaseMemoryAllocatorMapFunction map; GstGLBaseMemoryAllocatorCopyFunction copy; GstGLBaseMemoryAllocatorUnmapFunction unmap; + + /* */ + gpointer _padding[GST_PADDING]; }; #include diff --git a/gst-libs/gst/gl/gstglmemorypbo.h b/gst-libs/gst/gl/gstglmemorypbo.h index aa4110e51d..830c0f42ac 100644 --- a/gst-libs/gst/gl/gstglmemorypbo.h +++ b/gst-libs/gst/gl/gstglmemorypbo.h @@ -52,6 +52,9 @@ struct _GstGLMemoryPBO /* */ GstGLBuffer *pbo; + + /* */ + gpointer _padding[GST_PADDING]; }; /** @@ -84,6 +87,9 @@ gboolean gst_gl_memory_pbo_copy_into_texture (GstGLMemoryPBO *gl_mem, struct _GstGLMemoryPBOAllocator { GstGLMemoryAllocator parent; + + /* */ + gpointer _padding[GST_PADDING]; }; /** @@ -94,6 +100,9 @@ struct _GstGLMemoryPBOAllocator struct _GstGLMemoryPBOAllocatorClass { GstGLMemoryAllocatorClass parent_class; + + /* */ + gpointer _padding[GST_PADDING]; }; G_END_DECLS diff --git a/gst-libs/gst/gl/gstgloverlaycompositor.h b/gst-libs/gst/gl/gstgloverlaycompositor.h index dcecb4968b..dc8434a869 100644 --- a/gst-libs/gst/gl/gstgloverlaycompositor.h +++ b/gst-libs/gst/gl/gstgloverlaycompositor.h @@ -43,7 +43,10 @@ GType gst_gl_overlay_compositor_get_type (void); struct _GstGLOverlayCompositor { GstObject parent; + GstGLContext *context; + + /* */ guint last_window_width; guint last_window_height; @@ -52,6 +55,8 @@ struct _GstGLOverlayCompositor GstGLShader *shader; GLint position_attrib; GLint texcoord_attrib; + + gpointer _padding[GST_PADDING]; }; /** @@ -61,6 +66,9 @@ struct _GstGLOverlayCompositor struct _GstGLOverlayCompositorClass { GstObjectClass object_class; + + /* */ + gpointer _padding[GST_PADDING]; }; GstGLOverlayCompositor *gst_gl_overlay_compositor_new (GstGLContext * context); diff --git a/gst-libs/gst/gl/gstglquery.h b/gst-libs/gst/gl/gstglquery.h index 9cf06fa73e..33777d4e97 100644 --- a/gst-libs/gst/gl/gstglquery.h +++ b/gst-libs/gst/gl/gstglquery.h @@ -42,6 +42,9 @@ struct _GstGLQuery gboolean start_called; GstGLAsyncDebug debug; + + /* */ + gpointer _padding[GST_PADDING]; }; void gst_gl_query_init (GstGLQuery * query, diff --git a/gst-libs/gst/gl/gstglrenderbuffer.h b/gst-libs/gst/gl/gstglrenderbuffer.h index 1ed323e190..5a9a1c07b9 100644 --- a/gst-libs/gst/gl/gstglrenderbuffer.h +++ b/gst-libs/gst/gl/gstglrenderbuffer.h @@ -69,6 +69,9 @@ struct _GstGLRenderbuffer /* */ gboolean renderbuffer_wrapped; + + /* */ + gpointer _padding[GST_PADDING]; }; /** @@ -79,6 +82,9 @@ struct _GstGLRenderbuffer struct _GstGLRenderbufferAllocator { GstGLBaseMemoryAllocator parent; + + /* */ + gpointer _padding[GST_PADDING]; }; /** @@ -89,6 +95,9 @@ struct _GstGLRenderbufferAllocator struct _GstGLRenderbufferAllocatorClass { GstGLBaseMemoryAllocatorClass parent_class; + + /* */ + gpointer _padding[GST_PADDING]; }; #include @@ -100,6 +109,9 @@ typedef struct GstVideoGLTextureType renderbuffer_type; guint width; guint height; + + /* */ + gpointer _padding[GST_PADDING]; } GstGLRenderbufferAllocationParams; GstGLRenderbufferAllocationParams * gst_gl_renderbuffer_allocation_params_new (GstGLContext * context, diff --git a/gst-libs/gst/gl/gstglshader.h b/gst-libs/gst/gl/gstglshader.h index 2200b89fcb..2164f21286 100644 --- a/gst-libs/gst/gl/gstglshader.h +++ b/gst-libs/gst/gl/gstglshader.h @@ -34,12 +34,13 @@ GType gst_gl_shader_get_type (void); #define GST_IS_GL_SHADER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GST_GL_TYPE_SHADER)) #define GST_GL_SHADER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_GL_TYPE_SHADER, GstGLShaderClass)) -struct _GstGLShader { - /*< private >*/ +struct _GstGLShader +{ GstObject parent; GstGLContext *context; + /*< private >*/ GstGLShaderPrivate *priv; gpointer _padding[GST_PADDING]; diff --git a/gst-libs/gst/gl/gstglslstage.h b/gst-libs/gst/gl/gstglslstage.h index 31dcbec032..3521e22705 100644 --- a/gst-libs/gst/gl/gstglslstage.h +++ b/gst-libs/gst/gl/gstglslstage.h @@ -39,11 +39,11 @@ G_BEGIN_DECLS */ struct _GstGLSLStage { - /*< private >*/ GstObject parent; GstGLContext *context; + /*< private >*/ GstGLSLStagePrivate *priv; gpointer _padding[GST_PADDING]; @@ -56,8 +56,10 @@ struct _GstGLSLStage */ struct _GstGLSLStageClass { - /*< private >*/ GstObjectClass parent; + + /* */ + gpointer _padding[GST_PADDING]; }; GType gst_glsl_stage_get_type (void); diff --git a/gst-libs/gst/gl/gstglupload.h b/gst-libs/gst/gl/gstglupload.h index d158502f05..3e00298978 100644 --- a/gst-libs/gst/gl/gstglupload.h +++ b/gst-libs/gst/gl/gstglupload.h @@ -59,11 +59,11 @@ typedef enum */ struct _GstGLUpload { - /* */ GstObject parent; GstGLContext *context; + /* */ GstGLUploadPrivate *priv; gpointer _reserved[GST_PADDING]; @@ -77,6 +77,9 @@ struct _GstGLUpload struct _GstGLUploadClass { GstObjectClass object_class; + + /* */ + gpointer _padding[GST_PADDING]; }; GstCaps * gst_gl_upload_get_input_template_caps (void); diff --git a/gst-libs/gst/gl/gstglviewconvert.h b/gst-libs/gst/gl/gstglviewconvert.h index ee1166cc90..4783dd1c4d 100644 --- a/gst-libs/gst/gl/gstglviewconvert.h +++ b/gst-libs/gst/gl/gstglviewconvert.h @@ -70,12 +70,18 @@ struct _GstGLViewConvert GstGLFramebuffer *fbo; + /* */ GstGLViewConvertPrivate *priv; + + gpointer _padding[GST_PADDING]; }; struct _GstGLViewConvertClass { GstObjectClass object_class; + + /* */ + gpointer _padding[GST_PADDING]; }; GType gst_gl_view_convert_get_type (void);