isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-23 11:32:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove all remaining _EXP suffix defines

Browse Source 
To delimit which symbols were considered experimental we used to use
some preprocessor defines to gives experimental symbols an _EXP suffix
so that anyone monitoring the ABI for changes would easily be able to
discount changes made to clearly experimental functions.

These days we simply rely on the gtk-doc "Stability: unstable"
annotation to serve this purpose because changing the actual symbol name
made it slightly more awkward to debug Cogl using GDB and was an extra
mechanical step we decided we could do without.

This patch removes the last remaining _EXP suffix defines in Cogl

(cherry picked from commit 5a1c4a979e00accd492097cfb8f6a8d0fd8331bc)
This commit is contained in:
Robert Bragg 2012-09-01 01:17:20 +01:00
parent ce5d06afe1
commit 13f228fe69
13 changed files with 35 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cogl/cogl-object.h
View File

@ -157,9 +157,6 @@ cogl_object_get_user_data (CoglObject *object,
#ifdef COGL_ENABLE_EXPERIMENTAL_API
#define cogl_debug_object_foreach_type \
cogl_debug_object_foreach_type_EXP
/**
* cogl_debug_object_foreach_type:
* func: A callback function for each type
@ -177,9 +174,6 @@ void
cogl_debug_object_foreach_type (CoglDebugObjectForeachTypeCallback func,
void *user_data);
#define cogl_debug_object_print_instances \
cogl_debug_object_print_instances_EXP
/**
* cogl_debug_object_print_instances:
*

1
cogl/cogl-onscreen-template.h
View File

@ -39,7 +39,6 @@ typedef struct _CoglOnscreenTemplate CoglOnscreenTemplate;
#define COGL_ONSCREEN_TEMPLATE(OBJECT) ((CoglOnscreenTemplate *)OBJECT)
#define cogl_onscreen_template_new cogl_onscreen_template_new_EXP
CoglOnscreenTemplate *
cogl_onscreen_template_new (CoglSwapChain *swap_chain);

13
cogl/cogl-pixel-buffer.h
View File

@ -38,21 +38,8 @@
G_BEGIN_DECLS
/* All of the cogl-pixel-buffer API is currently experimental so we
* suffix the actual symbols with _EXP so if somone is monitoring for
* ABI changes it will hopefully be clearer to them what's going on if
* any of the symbols dissapear at a later date.
*/
#define COGL_PIXEL_BUFFER(buffer) ((CoglPixelBuffer *)(buffer))
#define cogl_pixel_buffer_new cogl_pixel_buffer_new_EXP
#define cogl_pixel_buffer_new_with_size cogl_pixel_buffer_new_with_size_EXP
#define cogl_is_pixel_buffer cogl_is_pixel_buffer_EXP
#if 0
#define cogl_pixel_buffer_set_region cogl_pixel_buffer_set_region_EXP
#endif
typedef struct _CoglPixelBuffer CoglPixelBuffer;
/**

3
cogl/cogl-primitive.h
View File

@ -687,7 +687,6 @@ void
cogl_primitive_set_first_vertex (CoglPrimitive *primitive,
int first_vertex);
#define cogl_primitive_get_n_vertices cogl_primitive_get_n_vertices_EXP
/**
* cogl_primitive_get_n_vertices:
* @primitive: A #CoglPrimitive object
@ -713,7 +712,6 @@ cogl_primitive_set_first_vertex (CoglPrimitive *primitive,
int
cogl_primitive_get_n_vertices (CoglPrimitive *primitive);
#define cogl_primitive_set_n_vertices cogl_primitive_set_n_vertices_EXP
/**
* cogl_primitive_set_n_vertices:
* @primitive: A #CoglPrimitive object
@ -759,7 +757,6 @@ cogl_primitive_set_attributes (CoglPrimitive *primitive,
CoglAttribute **attributes,
int n_attributes);
#define cogl_primitive_set_indices cogl_primitive_set_indices_EXP
/**
* cogl_primitive_set_indices:
* @primitive: A #CoglPrimitive

2
cogl/cogl-sub-texture.h
View File

@ -49,7 +49,6 @@ G_BEGIN_DECLS
#define COGL_SUB_TEXTURE(tex) ((CoglSubTexture *) tex)
typedef struct _CoglSubTexture CoglSubTexture;
#define cogl_sub_texture_new cogl_sub_texture_new_EXP
/**
* cogl_sub_texture_new:
* @context: A #CoglContext pointer
@ -105,7 +104,6 @@ cogl_sub_texture_new (CoglContext *ctx,
CoglTexture *
cogl_sub_texture_get_parent (CoglSubTexture *sub_texture);
#define cogl_is_sub_texture cogl_is_sub_texture_EXP
/**
* cogl_is_sub_texture:
* @object: a #CoglObject

3
cogl/cogl-swap-chain.h
View File

@ -32,16 +32,13 @@ G_BEGIN_DECLS
typedef struct _CoglSwapChain CoglSwapChain;
#define cogl_swap_chain_new cogl_swap_chain_new_EXP
CoglSwapChain *
cogl_swap_chain_new (void);
#define cogl_swap_chain_set_has_alpha cogl_swap_chain_set_has_alpha_EXP
void
cogl_swap_chain_set_has_alpha (CoglSwapChain *swap_chain,
CoglBool has_alpha);
#define cogl_swap_chain_set_length cogl_swap_chain_set_length_EXP
void
cogl_swap_chain_set_length (CoglSwapChain *swap_chain,
int length);

4
cogl/cogl-texture-2d.h
View File

@ -56,7 +56,6 @@ G_BEGIN_DECLS
typedef struct _CoglTexture2D CoglTexture2D;
#define COGL_TEXTURE_2D(X) ((CoglTexture2D *)X)
#define cogl_is_texture_2d cogl_is_texture_2d_EXP
/**
* cogl_is_texture_2d:
* @object: A #CoglObject
@ -70,7 +69,6 @@ typedef struct _CoglTexture2D CoglTexture2D;
CoglBool
cogl_is_texture_2d (void *object);
#define cogl_texture_2d_new_with_size cogl_texture_2d_new_with_size_EXP
/**
* cogl_texture_2d_new_with_size:
* @ctx: A #CoglContext
@ -104,7 +102,6 @@ cogl_texture_2d_new_with_size (CoglContext *ctx,
CoglPixelFormat internal_format,
GError **error);
#define cogl_texture_2d_new_from_data cogl_texture_2d_new_from_data_EXP
/**
* cogl_texture_2d_new_from_data:
* @ctx: A #CoglContext
@ -190,7 +187,6 @@ cogl_texture_2d_new_from_bitmap (CoglBitmap *bitmap,
GError **error);
#define cogl_texture_2d_new_from_foreign cogl_texture_2d_new_from_foreign_EXP
/**
* cogl_texture_2d_new_from_foreign:
* @ctx: A #CoglContext

3
cogl/cogl-texture-rectangle.h
View File

@ -63,7 +63,6 @@ G_BEGIN_DECLS
typedef struct _CoglTextureRectangle CoglTextureRectangle;
#define COGL_TEXTURE_RECTANGLE(X) ((CoglTextureRectangle *)X)
#define cogl_is_texture_rectangle cogl_is_texture_rectangle_EXP
/**
* cogl_is_texture_rectangle:
* @object: A #CoglObject
@ -77,8 +76,6 @@ typedef struct _CoglTextureRectangle CoglTextureRectangle;
CoglBool
cogl_is_texture_rectangle (void *object);
#define cogl_texture_rectangle_new_with_size \
cogl_texture_rectangle_new_with_size_EXP
/**
* cogl_texture_rectangle_new_with_size:
* @context: A #CoglContext pointer

2
cogl/cogl-texture.h
View File

@ -423,8 +423,6 @@ cogl_texture_set_region (CoglTexture *texture,
#if defined (COGL_ENABLE_EXPERIMENTAL_API)
#define cogl_texture_set_region_from_bitmap \
cogl_texture_set_region_from_bitmap_EXP
/**
* cogl_texture_set_region_from_bitmap:
* @texture a #CoglTexture pointer

5
cogl/cogl-win32-renderer.h
View File

@ -33,8 +33,6 @@
G_BEGIN_DECLS
#define cogl_win32_renderer_handle_event \
cogl_win32_renderer_handle_event_EXP
/**
* cogl_win32_renderer_handle_event:
* @message: A pointer to a win32 MSG struct
@ -66,7 +64,6 @@ cogl_win32_renderer_handle_event (CoglRenderer *renderer,
typedef CoglFilterReturn (* CoglWin32FilterFunc) (MSG *message,
void *data);
#define cogl_win32_renderer_add_filter cogl_win32_renderer_add_filter_EXP
/**
* cogl_win32_renderer_add_filter:
*
@ -79,8 +76,6 @@ cogl_win32_renderer_add_filter (CoglRenderer *renderer,
CoglWin32FilterFunc func,
void *data);
#define cogl_win32_renderer_remove_filter \
cogl_win32_renderer_remove_filter_EXP
/**
* cogl_win32_renderer_remove_filter:
*

10
cogl/cogl-xlib-renderer.h
View File

@ -36,8 +36,6 @@
G_BEGIN_DECLS
#define cogl_xlib_renderer_handle_event \
cogl_xlib_renderer_handle_event_EXP
/*
* cogl_xlib_renderer_handle_event:
* @event: pointer to an XEvent structure
@ -69,7 +67,6 @@ cogl_xlib_renderer_handle_event (CoglRenderer *renderer,
typedef CoglFilterReturn (* CoglXlibFilterFunc) (XEvent *event,
void *data);
#define cogl_xlib_renderer_add_filter cogl_xlib_renderer_add_filter_EXP
/*
* cogl_xlib_renderer_add_filter:
*
@ -82,8 +79,6 @@ cogl_xlib_renderer_add_filter (CoglRenderer *renderer,
CoglXlibFilterFunc func,
void *data);
#define cogl_xlib_renderer_remove_filter \
cogl_xlib_renderer_remove_filter_EXP
/*
* cogl_xlib_renderer_remove_filter:
*
@ -95,8 +90,6 @@ cogl_xlib_renderer_remove_filter (CoglRenderer *renderer,
CoglXlibFilterFunc func,
void *data);
#define cogl_xlib_renderer_get_foreign_display \
cogl_xlib_renderer_get_foreign_display_EXP
/*
* cogl_xlib_renderer_get_foreign_display:
*
@ -107,8 +100,6 @@ cogl_xlib_renderer_remove_filter (CoglRenderer *renderer,
Display *
cogl_xlib_renderer_get_foreign_display (CoglRenderer *renderer);
#define cogl_xlib_renderer_set_foreign_display \
cogl_xlib_renderer_set_foreign_display_EXP
/*
* cogl_xlib_renderer_set_foreign_display:
*
@ -146,7 +137,6 @@ void
cogl_xlib_renderer_set_event_retrieval_enabled (CoglRenderer *renderer,
CoglBool enable);
#define cogl_xlib_renderer_get_display cogl_xlib_renderer_get_display_EXP
Display *
cogl_xlib_renderer_get_display (CoglRenderer *renderer);

3
cogl/cogl-xlib.h
View File

@ -44,7 +44,6 @@ G_BEGIN_DECLS
*
* Stability: Unstable
*/
#define cogl_xlib_get_display cogl_xlib_get_display_EXP
Display *
cogl_xlib_get_display (void);
@ -57,7 +56,6 @@ cogl_xlib_get_display (void);
*
* Stability: Unstable
*/
#define cogl_xlib_set_display cogl_xlib_set_display_EXP
void
cogl_xlib_set_display (Display *display);
@ -78,7 +76,6 @@ cogl_xlib_set_display (Display *display);
*
* Stability: Unstable
*/
#define cogl_xlib_handle_event cogl_xlib_handle_event_EXP
CoglFilterReturn
cogl_xlib_handle_event (XEvent *xevent);

75
cogl/cogl.symbols
View File

@ -1,8 +1,3 @@
#if 0
/* note: those with the _EXP suffix are defined as */
/* the same symbols sans the _EXP suffix */
/* (this may be subject to change!) */
#endif
/* cogl2_clip_push_from_path is only for 1.10.x*/
cogl2_clip_push_from_path
@ -28,7 +23,7 @@ cogl2_path_set_fill_rule
cogl2_path_stroke
#ifdef COGL_HAS_EGL_PLATFORM_ANDROID_SUPPORT
cogl_android_set_native_window_EXP
cogl_android_set_native_window
#endif
cogl_attribute_new
@ -68,7 +63,7 @@ cogl_buffer_set_data
cogl_buffer_set_update_hint
#if 0
/* not implemented! */
cogl_buffer_set_usage_hint_EXP
cogl_buffer_set_usage_hint
#endif
cogl_buffer_target_get_type
cogl_buffer_unmap
@ -341,23 +336,23 @@ cogl_is_index_buffer
cogl_is_indices_array
#endif
cogl_is_material
cogl_is_offscreen
cogl_is_offscreen
cogl_is_path
cogl_is_pipeline
cogl_is_pixel_buffer_EXP
cogl_is_pixel_buffer
cogl_is_primitive
cogl_is_primitive_texture
cogl_is_program
cogl_is_renderer
cogl_is_shader
cogl_is_snippet
cogl_is_sub_texture_EXP
cogl_is_sub_texture
cogl_is_texture
#ifdef COGL_HAS_X11
cogl_is_texture_pixmap_x11
#endif
cogl_is_texture_rectangle_EXP
cogl_is_texture_2d_EXP
cogl_is_texture_rectangle
cogl_is_texture_2d
cogl_is_texture_3d
#ifdef COGL_HAS_EGL_PLATFORM_KMS_SUPPORT
@ -487,7 +482,7 @@ cogl_onscreen_set_swap_throttled
cogl_onscreen_show
cogl_onscreen_swap_buffers
cogl_onscreen_swap_region
cogl_onscreen_template_new_EXP
cogl_onscreen_template_new
cogl_onscreen_template_set_samples_per_pixel
cogl_onscreen_template_set_swap_throttled
@ -585,10 +580,10 @@ cogl_pipeline_set_uniform_1f
cogl_pipeline_set_uniform_1i
cogl_pipeline_set_user_program
cogl_pixel_buffer_new_EXP
cogl_pixel_buffer_new
#if 0
/* not exported in the main APIs for now */
cogl_pixel_buffer_set_region_EXP
cogl_pixel_buffer_set_region
#endif
cogl_pixel_format_get_type
@ -610,7 +605,7 @@ cogl_primitive_foreach_attribute
cogl_primitive_get_first_vertex
cogl_primitive_get_indices
cogl_primitive_get_mode
cogl_primitive_get_n_vertices_EXP
cogl_primitive_get_n_vertices
cogl_primitive_new
cogl_primitive_new_p2
cogl_primitive_new_p2c4
@ -623,9 +618,9 @@ cogl_primitive_new_p3t2c4
cogl_primitive_new_with_attributes
cogl_primitive_set_attributes
cogl_primitive_set_first_vertex
cogl_primitive_set_indices_EXP
cogl_primitive_set_indices
cogl_primitive_set_mode
cogl_primitive_set_n_vertices_EXP
cogl_primitive_set_n_vertices
cogl_primitive_texture_set_auto_mipmap
@ -765,11 +760,11 @@ cogl_snippet_set_replace
cogl_sqrti
cogl_sub_texture_get_parent
cogl_sub_texture_new_EXP
cogl_sub_texture_new
cogl_swap_chain_new_EXP
cogl_swap_chain_set_has_alpha_EXP
cogl_swap_chain_set_length_EXP
cogl_swap_chain_new
cogl_swap_chain_set_has_alpha
cogl_swap_chain_set_length
cogl_texture_error_quark
cogl_texture_flags_get_type
@ -795,19 +790,19 @@ cogl_texture_pixmap_x11_set_damage_object
cogl_texture_pixmap_x11_update_area
#endif
cogl_texture_rectangle_new_from_bitmap
cogl_texture_rectangle_new_with_size_EXP
cogl_texture_rectangle_new_with_size
#ifndef COGL_DISABLE_DEPRECATED
cogl_texture_ref
#endif
cogl_texture_set_region
cogl_texture_set_region_from_bitmap_EXP
cogl_texture_set_region_from_bitmap
#ifndef COGL_DISABLE_DEPRECATED
cogl_texture_unref
#endif
cogl_texture_2d_new_from_bitmap
cogl_texture_2d_new_from_data_EXP
cogl_texture_2d_new_from_foreign_EXP
cogl_texture_2d_new_with_size_EXP
cogl_texture_2d_new_from_data
cogl_texture_2d_new_from_foreign
cogl_texture_2d_new_with_size
cogl_texture_2d_sliced_new_with_size
cogl_texture_3d_new_from_bitmap
cogl_texture_3d_new_from_data
@ -875,22 +870,22 @@ cogl_wayland_texture_2d_new_from_buffer
#ifdef COGL_HAS_WIN32_SUPPORT
cogl_win32_onscreen_get_window
cogl_win32_onscreen_set_foreign_window
cogl_win32_renderer_add_filter_EXP
cogl_win32_renderer_handle_event_EXP
cogl_win32_renderer_remove_filter_EXP
cogl_win32_renderer_add_filter
cogl_win32_renderer_handle_event
cogl_win32_renderer_remove_filter
#endif
#ifdef COGL_HAS_XLIB
cogl_xlib_get_display_EXP
cogl_xlib_handle_event_EXP
cogl_xlib_renderer_add_filter_EXP
cogl_xlib_renderer_get_display_EXP
cogl_xlib_renderer_get_foreign_display_EXP
cogl_xlib_renderer_handle_event_EXP
cogl_xlib_renderer_remove_filter_EXP
cogl_xlib_get_display
cogl_xlib_handle_event
cogl_xlib_renderer_add_filter
cogl_xlib_renderer_get_display
cogl_xlib_renderer_get_foreign_display
cogl_xlib_renderer_handle_event
cogl_xlib_renderer_remove_filter
cogl_xlib_renderer_set_event_retrieval_enabled
cogl_xlib_renderer_set_foreign_display_EXP
cogl_xlib_set_display_EXP
cogl_xlib_renderer_set_foreign_display
cogl_xlib_set_display
#endif
#ifdef COGL_HAS_X11
@ -898,7 +893,7 @@ cogl_x11_onscreen_get_visual_xid
cogl_x11_onscreen_set_foreign_window_xid
#endif
#ifndef COGL_NO_EXPORT_UNDERSCORE
#ifndef COGL_NO_EXPORT_UNDERSCORE
/* probably these should not be exported at all, but anyways, for now... */
/* eventually, this section should disappear (or cogl, cogl-pango, clutter et al */
/* will link without the following) */