brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hide internal glx and egl(x) backend symbols.

Browse Source 
The glx and egl(x) backends export some internal symbols. Hide these
symbols (using '_' prefix) to reduce ABI differentiation between the
glx and eglx flavours.

http://bugzilla.clutter-project.org/show_bug.cgi?id=2267

Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
This commit is contained in:
Alexandros Frantzis 2010-08-13 17:48:30 +03:00 committed by Emmanuele Bassi
parent cda5afb419
commit 12e58c7813
10 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
clutter/egl/clutter-backend-egl.c
View File

@ -50,9 +50,9 @@ static ClutterBackendEGL *backend_singleton = NULL;
static const gchar *clutter_fb_device = NULL;
#ifdef COGL_HAS_X11_SUPPORT
G_DEFINE_TYPE (ClutterBackendEGL, clutter_backend_egl, CLUTTER_TYPE_BACKEND_X11);
G_DEFINE_TYPE (ClutterBackendEGL, _clutter_backend_egl, CLUTTER_TYPE_BACKEND_X11);
#else
G_DEFINE_TYPE (ClutterBackendEGL, clutter_backend_egl, CLUTTER_TYPE_BACKEND);
G_DEFINE_TYPE (ClutterBackendEGL, _clutter_backend_egl, CLUTTER_TYPE_BACKEND);
#endif
static void
@ -69,7 +69,7 @@ clutter_backend_egl_pre_parse (ClutterBackend *backend,
const gchar *env_string;
#ifdef COGL_HAS_X11_SUPPORT
ClutterBackendClass *backend_x11_class =
CLUTTER_BACKEND_CLASS (clutter_backend_egl_parent_class);
CLUTTER_BACKEND_CLASS (_clutter_backend_egl_parent_class);
if (!backend_x11_class->pre_parse (backend, error))
return FALSE;
@ -90,7 +90,7 @@ clutter_backend_egl_post_parse (ClutterBackend *backend,
#ifdef COGL_HAS_X11_SUPPORT
ClutterBackendX11 *backend_x11 = CLUTTER_BACKEND_X11 (backend);
ClutterBackendClass *backend_x11_class =
CLUTTER_BACKEND_CLASS (clutter_backend_egl_parent_class);
CLUTTER_BACKEND_CLASS (_clutter_backend_egl_parent_class);
#endif
EGLBoolean status;
@ -475,7 +475,7 @@ clutter_backend_egl_redraw (ClutterBackend *backend,
g_assert (CLUTTER_IS_STAGE_EGL (impl));
clutter_stage_egl_redraw (CLUTTER_STAGE_EGL (impl), stage);
_clutter_stage_egl_redraw (CLUTTER_STAGE_EGL (impl), stage);
}
#ifdef HAVE_TSLIB
@ -493,7 +493,7 @@ clutter_backend_egl_finalize (GObject *gobject)
if (backend_singleton)
backend_singleton = NULL;
G_OBJECT_CLASS (clutter_backend_egl_parent_class)->finalize (gobject);
G_OBJECT_CLASS (_clutter_backend_egl_parent_class)->finalize (gobject);
}
static void
@ -510,7 +510,7 @@ clutter_backend_egl_dispose (GObject *gobject)
ClutterBackendX11 will destroy all of the stages before we
destroy the egl context. Otherwise the actors may try to make GL
calls during destruction which causes a crash */
G_OBJECT_CLASS (clutter_backend_egl_parent_class)->dispose (gobject);
G_OBJECT_CLASS (_clutter_backend_egl_parent_class)->dispose (gobject);
#ifdef HAVE_TSLIB
/* XXX: This should be renamed to _clutter_events_tslib_uninit */
@ -583,7 +583,7 @@ clutter_backend_egl_constructor (GType gtype,
if (!backend_singleton)
{
parent_class = G_OBJECT_CLASS (clutter_backend_egl_parent_class);
parent_class = G_OBJECT_CLASS (_clutter_backend_egl_parent_class);
retval = parent_class->constructor (gtype, n_params, params);
backend_singleton = CLUTTER_BACKEND_EGL (retval);
@ -733,7 +733,7 @@ clutter_backend_egl_get_visual_info (ClutterBackendX11 *backend_x11)
#endif
static void
clutter_backend_egl_class_init (ClutterBackendEGLClass *klass)
_clutter_backend_egl_class_init (ClutterBackendEGLClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
ClutterBackendClass *backend_class = CLUTTER_BACKEND_CLASS (klass);
@ -762,7 +762,7 @@ clutter_backend_egl_class_init (ClutterBackendEGLClass *klass)
}
static void
clutter_backend_egl_init (ClutterBackendEGL *backend_egl)
_clutter_backend_egl_init (ClutterBackendEGL *backend_egl)
{
#ifndef COGL_HAS_XLIB_SUPPORT
ClutterBackend *backend = CLUTTER_BACKEND (backend_egl);
@ -784,7 +784,7 @@ clutter_backend_egl_init (ClutterBackendEGL *backend_egl)
GType
_clutter_backend_impl_get_type (void)
{
return clutter_backend_egl_get_type ();
return _clutter_backend_egl_get_type ();
}
#ifdef COGL_HAS_XLIB_SUPPORT

4
clutter/egl/clutter-backend-egl.h
View File

@ -43,7 +43,7 @@
G_BEGIN_DECLS
#define CLUTTER_TYPE_BACKEND_EGL (clutter_backend_egl_get_type ())
#define CLUTTER_TYPE_BACKEND_EGL (_clutter_backend_egl_get_type ())
#define CLUTTER_BACKEND_EGL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_BACKEND_EGL, ClutterBackendEGL))
#define CLUTTER_IS_BACKEND_EGL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_BACKEND_EGL))
#define CLUTTER_BACKEND_EGL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_BACKEND_EGL, ClutterBackendEGLClass))
@ -106,7 +106,7 @@ struct _ClutterBackendEGLClass
#endif
};
GType clutter_backend_egl_get_type (void) G_GNUC_CONST;
GType _clutter_backend_egl_get_type (void) G_GNUC_CONST;
void _clutter_events_egl_init (ClutterBackendEGL *backend);
void _clutter_events_egl_uninit (ClutterBackendEGL *backend);

14
clutter/egl/clutter-stage-egl.c
View File

@ -25,7 +25,7 @@ static ClutterStageWindowIface *clutter_stage_egl_parent_iface = NULL;
static void clutter_stage_window_iface_init (ClutterStageWindowIface *iface);
G_DEFINE_TYPE_WITH_CODE (ClutterStageEGL,
clutter_stage_egl,
_clutter_stage_egl,
#ifdef COGL_HAS_X11_SUPPORT
CLUTTER_TYPE_STAGE_X11,
#else
@ -306,11 +306,11 @@ clutter_stage_window_iface_init (ClutterStageWindowIface *iface)
static void
clutter_stage_egl_dispose (GObject *gobject)
{
G_OBJECT_CLASS (clutter_stage_egl_parent_class)->dispose (gobject);
G_OBJECT_CLASS (_clutter_stage_egl_parent_class)->dispose (gobject);
}
static void
clutter_stage_egl_class_init (ClutterStageEGLClass *klass)
_clutter_stage_egl_class_init (ClutterStageEGLClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
@ -318,7 +318,7 @@ clutter_stage_egl_class_init (ClutterStageEGLClass *klass)
}
static void
clutter_stage_egl_init (ClutterStageEGL *stage)
_clutter_stage_egl_init (ClutterStageEGL *stage)
{
stage->egl_surface = EGL_NO_SURFACE;
}
@ -326,12 +326,12 @@ clutter_stage_egl_init (ClutterStageEGL *stage)
#else /* COGL_HAS_X11_SUPPORT */
static void
clutter_stage_egl_class_init (ClutterStageEGLClass *klass)
_clutter_stage_egl_class_init (ClutterStageEGLClass *klass)
{
}
static void
clutter_stage_egl_init (ClutterStageEGL *stage)
_clutter_stage_egl_init (ClutterStageEGL *stage)
{
/* Without X we only support one surface and that is associated
* with the backend directly instead of the stage */
@ -340,7 +340,7 @@ clutter_stage_egl_init (ClutterStageEGL *stage)
#endif /* COGL_HAS_X11_SUPPORT */
void
clutter_stage_egl_redraw (ClutterStageEGL *stage_egl,
_clutter_stage_egl_redraw (ClutterStageEGL *stage_egl,
ClutterStage *stage)
{
ClutterBackend *backend = clutter_get_default_backend ();

6
clutter/egl/clutter-stage-egl.h
View File

@ -13,7 +13,7 @@
#include "../x11/clutter-stage-x11.h"
#define CLUTTER_TYPE_STAGE_EGL (clutter_stage_egl_get_type ())
#define CLUTTER_TYPE_STAGE_EGL (_clutter_stage_egl_get_type ())
#define CLUTTER_STAGE_EGL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_STAGE_EGL, ClutterStageEGL))
#define CLUTTER_IS_STAGE_EGL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_STAGE_EGL))
#define CLUTTER_STAGE_EGL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_STAGE_EGL, ClutterStageEGLClass))
@ -47,9 +47,9 @@ struct _ClutterStageEGLClass
ClutterStageX11Class parent_class;
};
GType clutter_stage_egl_get_type (void) G_GNUC_CONST;
GType _clutter_stage_egl_get_type (void) G_GNUC_CONST;
void clutter_stage_egl_redraw (ClutterStageEGL *stage_egl,
void _clutter_stage_egl_redraw (ClutterStageEGL *stage_egl,
ClutterStage *stage);
#endif /* __CLUTTER_STAGE_EGL_H__ */

24
clutter/glx/clutter-backend-glx.c
View File

@ -51,7 +51,7 @@
#include "cogl/cogl.h"
G_DEFINE_TYPE (ClutterBackendGLX, clutter_backend_glx, CLUTTER_TYPE_BACKEND_X11);
G_DEFINE_TYPE (ClutterBackendGLX, _clutter_backend_glx, CLUTTER_TYPE_BACKEND_X11);
/* singleton object */
static ClutterBackendGLX *backend_singleton = NULL;
@ -59,7 +59,7 @@ static ClutterBackendGLX *backend_singleton = NULL;
static gchar *clutter_vblank_name = NULL;
G_CONST_RETURN gchar*
clutter_backend_glx_get_vblank_method (void)
_clutter_backend_glx_get_vblank_method (void)
{
return clutter_vblank_name;
}
@ -87,7 +87,7 @@ clutter_backend_glx_post_parse (ClutterBackend *backend,
ClutterBackendX11 *backend_x11 = CLUTTER_BACKEND_X11 (backend);
ClutterBackendGLX *backend_glx = CLUTTER_BACKEND_GLX (backend);
ClutterBackendClass *backend_class =
CLUTTER_BACKEND_CLASS (clutter_backend_glx_parent_class);
CLUTTER_BACKEND_CLASS (_clutter_backend_glx_parent_class);
int glx_major, glx_minor;
if (!backend_class->post_parse (backend, error))
@ -143,7 +143,7 @@ clutter_backend_glx_finalize (GObject *gobject)
if (backend_singleton)
backend_singleton = NULL;
G_OBJECT_CLASS (clutter_backend_glx_parent_class)->finalize (gobject);
G_OBJECT_CLASS (_clutter_backend_glx_parent_class)->finalize (gobject);
}
static void
@ -174,7 +174,7 @@ clutter_backend_glx_dispose (GObject *gobject)
backend_glx->dummy_xwin = None;
}
G_OBJECT_CLASS (clutter_backend_glx_parent_class)->dispose (gobject);
G_OBJECT_CLASS (_clutter_backend_glx_parent_class)->dispose (gobject);
}
static GObject *
@ -187,7 +187,7 @@ clutter_backend_glx_constructor (GType gtype,
if (!backend_singleton)
{
parent_class = G_OBJECT_CLASS (clutter_backend_glx_parent_class);
parent_class = G_OBJECT_CLASS (_clutter_backend_glx_parent_class);
retval = parent_class->constructor (gtype, n_params, params);
backend_singleton = CLUTTER_BACKEND_GLX (retval);
@ -776,8 +776,8 @@ clutter_backend_glx_redraw (ClutterBackend *backend,
g_assert (CLUTTER_IS_STAGE_GLX (impl));
clutter_stage_glx_redraw (CLUTTER_STAGE_GLX (impl),
stage);
_clutter_stage_glx_redraw (CLUTTER_STAGE_GLX (impl),
stage);
}
static ClutterStageWindow *
@ -810,7 +810,7 @@ clutter_backend_glx_create_stage (ClutterBackend *backend,
}
static void
clutter_backend_glx_class_init (ClutterBackendGLXClass *klass)
_clutter_backend_glx_class_init (ClutterBackendGLXClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
ClutterBackendClass *backend_class = CLUTTER_BACKEND_CLASS (klass);
@ -830,11 +830,11 @@ clutter_backend_glx_class_init (ClutterBackendGLXClass *klass)
backend_class->ensure_context = clutter_backend_glx_ensure_context;
backendx11_class->get_visual_info = clutter_backend_glx_get_visual_info;
backendx11_class->handle_event = clutter_backend_glx_handle_event;
backendx11_class->handle_event = _clutter_backend_glx_handle_event;
}
static void
clutter_backend_glx_init (ClutterBackendGLX *backend_glx)
_clutter_backend_glx_init (ClutterBackendGLX *backend_glx)
{
}
@ -843,5 +843,5 @@ clutter_backend_glx_init (ClutterBackendGLX *backend_glx)
GType
_clutter_backend_impl_get_type (void)
{
return clutter_backend_glx_get_type ();
return _clutter_backend_glx_get_type ();
}

4
clutter/glx/clutter-backend-glx.h
View File

@ -35,7 +35,7 @@
G_BEGIN_DECLS
#define CLUTTER_TYPE_BACKEND_GLX (clutter_backend_glx_get_type ())
#define CLUTTER_TYPE_BACKEND_GLX (_clutter_backend_glx_get_type ())
#define CLUTTER_BACKEND_GLX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_BACKEND_GLX, ClutterBackendGLX))
#define CLUTTER_IS_BACKEND_GLX(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_BACKEND_GLX))
#define CLUTTER_BACKEND_GLX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_BACKEND_GLX, ClutterBackendGLXClass))
@ -108,7 +108,7 @@ struct _ClutterBackendGLXClass
ClutterBackendX11Class parent_class;
};
GType clutter_backend_glx_get_type (void) G_GNUC_CONST;
GType _clutter_backend_glx_get_type (void) G_GNUC_CONST;
gboolean
_clutter_backend_glx_get_fbconfig (ClutterBackendGLX *backend_x11,

2
clutter/glx/clutter-event-glx.c
View File

@ -40,7 +40,7 @@
#include <glib.h>
gboolean
clutter_backend_glx_handle_event (ClutterBackendX11 *backend_x11,
_clutter_backend_glx_handle_event (ClutterBackendX11 *backend_x11,
XEvent *xevent)
{
#ifdef GLX_INTEL_swap_event

2
clutter/glx/clutter-event-glx.h
View File

@ -29,7 +29,7 @@
G_BEGIN_DECLS
gboolean
clutter_backend_glx_handle_event (ClutterBackendX11 *backend,
_clutter_backend_glx_handle_event (ClutterBackendX11 *backend,
XEvent *xevent);
G_END_DECLS

10
clutter/glx/clutter-stage-glx.c
View File

@ -62,7 +62,7 @@ static void clutter_stage_window_iface_init (ClutterStageWindowIface *iface);
static ClutterStageWindowIface *clutter_stage_glx_parent_iface = NULL;
G_DEFINE_TYPE_WITH_CODE (ClutterStageGLX,
clutter_stage_glx,
_clutter_stage_glx,
CLUTTER_TYPE_STAGE_X11,
G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_STAGE_WINDOW,
clutter_stage_window_iface_init));
@ -276,11 +276,11 @@ clutter_stage_glx_get_pending_swaps (ClutterStageWindow *stage_window)
static void
clutter_stage_glx_dispose (GObject *gobject)
{
G_OBJECT_CLASS (clutter_stage_glx_parent_class)->dispose (gobject);
G_OBJECT_CLASS (_clutter_stage_glx_parent_class)->dispose (gobject);
}
static void
clutter_stage_glx_class_init (ClutterStageGLXClass *klass)
_clutter_stage_glx_class_init (ClutterStageGLXClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
@ -288,7 +288,7 @@ clutter_stage_glx_class_init (ClutterStageGLXClass *klass)
}
static void
clutter_stage_glx_init (ClutterStageGLX *stage)
_clutter_stage_glx_init (ClutterStageGLX *stage)
{
}
@ -490,7 +490,7 @@ wait_for_vblank (ClutterBackendGLX *backend_glx)
}
void
clutter_stage_glx_redraw (ClutterStageGLX *stage_glx,
_clutter_stage_glx_redraw (ClutterStageGLX *stage_glx,
ClutterStage *stage)
{
ClutterBackend *backend;

6
clutter/glx/clutter-stage-glx.h
View File

@ -34,7 +34,7 @@
G_BEGIN_DECLS
#define CLUTTER_TYPE_STAGE_GLX (clutter_stage_glx_get_type ())
#define CLUTTER_TYPE_STAGE_GLX (_clutter_stage_glx_get_type ())
#define CLUTTER_STAGE_GLX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_STAGE_GLX, ClutterStageGLX))
#define CLUTTER_IS_STAGE_GLX(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_STAGE_GLX))
#define CLUTTER_STAGE_GLX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_STAGE_GLX, ClutterStageGLXClass))
@ -62,9 +62,9 @@ struct _ClutterStageGLXClass
ClutterStageX11Class parent_class;
};
GType clutter_stage_glx_get_type (void) G_GNUC_CONST;
GType _clutter_stage_glx_get_type (void) G_GNUC_CONST;
void clutter_stage_glx_redraw (ClutterStageGLX *stage_glx,
void _clutter_stage_glx_redraw (ClutterStageGLX *stage_glx,
ClutterStage *stage);
G_END_DECLS