From 98af9bb2513f5c8621d296377a4b34ea590a717c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Mon, 7 May 2018 16:14:29 +0200 Subject: [PATCH] cogl: Remove notion of a "cogl" version Mutters copy of cogl isn't a separate library with its own version, so remove the old version macros. --- clutter/clutter/egl/clutter-egl-headers.h | 9 - cogl/cogl-pango/cogl-pango.h | 6 +- cogl/cogl-path/cogl-path-functions.h | 6 +- cogl/cogl/cogl-color.h | 4 +- cogl/cogl/cogl-defines.h.in | 5 - cogl/cogl/cogl-framebuffer.h | 10 +- cogl/cogl/cogl-macros.h | 209 ---------------- cogl/cogl/cogl-matrix.h | 2 +- cogl/cogl/cogl-offscreen.h | 2 +- cogl/cogl/cogl-onscreen.h | 4 +- cogl/cogl/cogl-version.h | 226 ------------------ cogl/cogl/cogl-xlib.h | 6 +- cogl/cogl/cogl.c | 2 - cogl/cogl/cogl1-context.h | 74 +++--- cogl/cogl/deprecated/cogl-auto-texture.h | 12 +- cogl/cogl/deprecated/cogl-clutter.h | 2 +- .../deprecated/cogl-framebuffer-deprecated.h | 16 +- cogl/cogl/deprecated/cogl-material-compat.h | 104 ++++---- cogl/cogl/deprecated/cogl-shader.h | 54 ++--- cogl/cogl/deprecated/cogl-vertex-buffer.h | 28 +-- cogl/configure.ac | 106 +------- cogl/tests/conform/test-conform-main.c | 2 - cogl/tests/conform/test-version.c | 49 ---- 23 files changed, 166 insertions(+), 772 deletions(-) diff --git a/clutter/clutter/egl/clutter-egl-headers.h b/clutter/clutter/egl/clutter-egl-headers.h index d7b2f3ff9..9ab3d6a54 100644 --- a/clutter/clutter/egl/clutter-egl-headers.h +++ b/clutter/clutter/egl/clutter-egl-headers.h @@ -27,15 +27,6 @@ * header. */ #include - -/* Since Cogl 1.11.2, the EGL headers are no longer included from - * cogl.h when the experimental 2.0 API is requested. Clutter requests - * this in its configure script so we need to switch the header we - * include in that case. COGL_VERSION_CHECK is also new in 1.11.2 */ -#ifdef COGL_VERSION_CHECK -#if COGL_VERSION_CHECK (1, 11, 2) #include -#endif -#endif #endif /* __CLUTTER_EGL_HEADERS_H__ */ diff --git a/cogl/cogl-pango/cogl-pango.h b/cogl/cogl-pango/cogl-pango.h index 787aaa8af..3b21d2636 100644 --- a/cogl/cogl-pango/cogl-pango.h +++ b/cogl/cogl-pango/cogl-pango.h @@ -244,7 +244,7 @@ GType cogl_pango_renderer_get_type (void) G_GNUC_CONST; * Since: 1.0 * Deprecated: 1.16: Use cogl_pango_show_layout() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_pango_show_layout) +COGL_DEPRECATED_FOR (cogl_pango_show_layout) void cogl_pango_render_layout_subpixel (PangoLayout *layout, int x, @@ -267,7 +267,7 @@ cogl_pango_render_layout_subpixel (PangoLayout *layout, * Since: 1.0 * Deprecated: 1.16: Use cogl_pango_show_layout() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_pango_show_layout) +COGL_DEPRECATED_FOR (cogl_pango_show_layout) void cogl_pango_render_layout (PangoLayout *layout, int x, @@ -287,7 +287,7 @@ cogl_pango_render_layout (PangoLayout *layout, * Since: 1.0 * Deprecated: 1.16: Use cogl_pango_show_layout() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_pango_show_layout_line) +COGL_DEPRECATED_FOR (cogl_pango_show_layout_line) void cogl_pango_render_layout_line (PangoLayoutLine *line, int x, diff --git a/cogl/cogl-path/cogl-path-functions.h b/cogl/cogl-path/cogl-path-functions.h index 489b25c29..d99605faf 100644 --- a/cogl/cogl-path/cogl-path-functions.h +++ b/cogl/cogl-path/cogl-path-functions.h @@ -462,7 +462,7 @@ cogl_path_fill (CoglPath *path); * Stability: unstable * Deprecated: 1.16: Use cogl_path_fill() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_path_fill) +COGL_DEPRECATED_FOR (cogl_path_fill) void cogl_framebuffer_fill_path (CoglFramebuffer *framebuffer, CoglPipeline *pipeline, @@ -494,7 +494,7 @@ cogl_path_stroke (CoglPath *path); * Stability: unstable * Deprecated: 1.16: Use cogl_path_stroke() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_path_stroke) +COGL_DEPRECATED_FOR (cogl_path_stroke) void cogl_framebuffer_stroke_path (CoglFramebuffer *framebuffer, CoglPipeline *pipeline, @@ -531,7 +531,7 @@ cogl_framebuffer_push_path_clip (CoglFramebuffer *framebuffer, * Stability: Unstable * Deprecated: 1.16: Use cogl_framebuffer_push_path_clip() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_framebuffer_push_path_clip) +COGL_DEPRECATED_FOR (cogl_framebuffer_push_path_clip) void cogl_clip_push_from_path (CoglPath *path); diff --git a/cogl/cogl/cogl-color.h b/cogl/cogl/cogl-color.h index 42fe52546..7406a177e 100644 --- a/cogl/cogl/cogl-color.h +++ b/cogl/cogl/cogl-color.h @@ -129,7 +129,7 @@ cogl_color_init_from_4ub (CoglColor *color, * Since: 1.0 * Deprecated: 1.4: Use cogl_color_init_from_4ub instead. */ -COGL_DEPRECATED_IN_1_4_FOR (cogl_color_init_from_4ub) +COGL_DEPRECATED_FOR (cogl_color_init_from_4ub) void cogl_color_set_from_4ub (CoglColor *color, uint8_t red, @@ -169,7 +169,7 @@ cogl_color_init_from_4f (CoglColor *color, * Since: 1.0 * Deprecated: 1.4: Use cogl_color_init_from_4f instead. */ -COGL_DEPRECATED_IN_1_4_FOR (cogl_color_init_from_4f) +COGL_DEPRECATED_FOR (cogl_color_init_from_4f) void cogl_color_set_from_4f (CoglColor *color, float red, diff --git a/cogl/cogl/cogl-defines.h.in b/cogl/cogl/cogl-defines.h.in index eb3ad9268..a438a9622 100644 --- a/cogl/cogl/cogl-defines.h.in +++ b/cogl/cogl/cogl-defines.h.in @@ -37,9 +37,4 @@ @COGL_DEFINES@ -#define COGL_VERSION_MAJOR_INTERNAL 1 -#define COGL_VERSION_MINOR_INTERNAL @COGL_1_MINOR_VERSION@ -#define COGL_VERSION_MICRO_INTERNAL @COGL_1_MICRO_VERSION@ -#define COGL_VERSION_STRING_INTERNAL "@COGL_1_VERSION@" - #endif diff --git a/cogl/cogl/cogl-framebuffer.h b/cogl/cogl/cogl-framebuffer.h index d47a78e79..2fcdaa996 100644 --- a/cogl/cogl/cogl-framebuffer.h +++ b/cogl/cogl/cogl-framebuffer.h @@ -1173,7 +1173,7 @@ cogl_framebuffer_clear4f (CoglFramebuffer *framebuffer, * Deprecated: 1.16: Use #CoglPrimitives and * cogl_primitive_draw() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_draw) +COGL_DEPRECATED_FOR (cogl_primitive_draw) void cogl_framebuffer_draw_primitive (CoglFramebuffer *framebuffer, CoglPipeline *pipeline, @@ -1211,7 +1211,7 @@ cogl_framebuffer_draw_primitive (CoglFramebuffer *framebuffer, * Deprecated: 1.16: Use #CoglPrimitives and * cogl_primitive_draw() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_draw) +COGL_DEPRECATED_FOR (cogl_primitive_draw) void cogl_framebuffer_vdraw_attributes (CoglFramebuffer *framebuffer, CoglPipeline *pipeline, @@ -1258,7 +1258,7 @@ cogl_framebuffer_vdraw_attributes (CoglFramebuffer *framebuffer, * Deprecated: 1.16: Use #CoglPrimitives and * cogl_primitive_draw() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_draw) +COGL_DEPRECATED_FOR (cogl_primitive_draw) void cogl_framebuffer_draw_attributes (CoglFramebuffer *framebuffer, CoglPipeline *pipeline, @@ -1324,7 +1324,7 @@ cogl_framebuffer_draw_attributes (CoglFramebuffer *framebuffer, * Deprecated: 1.16: Use #CoglPrimitives and * cogl_primitive_draw() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_draw) +COGL_DEPRECATED_FOR (cogl_primitive_draw) void cogl_framebuffer_vdraw_indexed_attributes (CoglFramebuffer *framebuffer, CoglPipeline *pipeline, @@ -1392,7 +1392,7 @@ cogl_framebuffer_vdraw_indexed_attributes (CoglFramebuffer *framebuffer, * Deprecated: 1.16: Use #CoglPrimitives and * cogl_primitive_draw() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_draw) +COGL_DEPRECATED_FOR (cogl_primitive_draw) void cogl_framebuffer_draw_indexed_attributes (CoglFramebuffer *framebuffer, CoglPipeline *pipeline, diff --git a/cogl/cogl/cogl-macros.h b/cogl/cogl/cogl-macros.h index 96c06591f..ff52d0aa4 100644 --- a/cogl/cogl/cogl-macros.h +++ b/cogl/cogl/cogl-macros.h @@ -75,213 +75,4 @@ #endif /* COGL_DISABLE_DEPRECATION_WARNINGS */ -/** - * COGL_VERSION_MIN_REQUIRED: - * - * A macro that should be defined by the user prior to including the - * cogl.h header. - * - * The definition should be one of the predefined Cogl version macros, - * such as: %COGL_VERSION_1_8, %COGL_VERSION_1_10, ... - * - * This macro defines the lower bound for the Cogl API to be used. - * - * If a function has been deprecated in a newer version of Cogl, it - * is possible to use this symbol to avoid the compiler warnings without - * disabling warnings for every deprecated function. - * - * Since: 1.16 - */ -#ifndef COGL_VERSION_MIN_REQUIRED -# define COGL_VERSION_MIN_REQUIRED (COGL_VERSION_CURRENT_STABLE) -#endif - -/** - * COGL_VERSION_MAX_ALLOWED: - * - * A macro that should be define by the user prior to including the - * cogl.h header. - * - * The definition should be one of the predefined Cogl version macros, - * such as: %COGL_VERSION_1_0, %COGL_VERSION_1_2, ... - * - * This macro defines the upper bound for the Cogl API to be used. - * - * If a function has been introduced in a newer version of Cogl, it - * is possible to use this symbol to get compiler warnings when trying - * to use that function. - * - * Since: 1.16 - */ -#ifndef COGL_VERSION_MAX_ALLOWED -# if COGL_VERSION_MIN_REQUIRED > COGL_VERSION_PREVIOUS_STABLE -# define COGL_VERSION_MAX_ALLOWED COGL_VERSION_MIN_REQUIRED -# else -# define COGL_VERSION_MAX_ALLOWED COGL_VERSION_CURRENT_STABLE -# endif -#endif - -/* sanity checks */ -#if COGL_VERSION_MAX_ALLOWED < COGL_VERSION_MIN_REQUIRED -# error "COGL_VERSION_MAX_ALLOWED must be >= COGL_VERSION_MIN_REQUIRED" -#endif -#if COGL_VERSION_MIN_REQUIRED < COGL_VERSION_1_0 -# error "COGL_VERSION_MIN_REQUIRED must be >= COGL_VERSION_1_0" -#endif - -/* XXX: Every new stable minor release should add a set of macros here */ -#if COGL_VERSION_MIN_REQUIRED >= COGL_VERSION_1_0 -# define COGL_DEPRECATED_IN_1_0 COGL_DEPRECATED -# define COGL_DEPRECATED_IN_1_0_FOR(f) COGL_DEPRECATED_FOR(f) -#else -# define COGL_DEPRECATED_IN_1_0 -# define COGL_DEPRECATED_IN_1_0_FOR(f) -#endif - -#if COGL_VERSION_MAX_ALLOWED < COGL_VERSION_1_0 -# define COGL_AVAILABLE_IN_1_0 COGL_UNAVAILABLE(1, 0) -#else -# define COGL_AVAILABLE_IN_1_0 -#endif - -#if COGL_VERSION_MIN_REQUIRED >= COGL_VERSION_1_2 -# define COGL_DEPRECATED_IN_1_2 COGL_DEPRECATED -# define COGL_DEPRECATED_IN_1_2_FOR(f) COGL_DEPRECATED_FOR(f) -#else -# define COGL_DEPRECATED_IN_1_2 -# define COGL_DEPRECATED_IN_1_2_FOR(f) -#endif - -#if COGL_VERSION_MAX_ALLOWED < COGL_VERSION_1_2 -# define COGL_AVAILABLE_IN_1_2 COGL_UNAVAILABLE(1, 2) -#else -# define COGL_AVAILABLE_IN_1_2 -#endif - -#if COGL_VERSION_MIN_REQUIRED >= COGL_VERSION_1_4 -# define COGL_DEPRECATED_IN_1_4 COGL_DEPRECATED -# define COGL_DEPRECATED_IN_1_4_FOR(f) COGL_DEPRECATED_FOR(f) -#else -# define COGL_DEPRECATED_IN_1_4 -# define COGL_DEPRECATED_IN_1_4_FOR(f) -#endif - -#if COGL_VERSION_MAX_ALLOWED < COGL_VERSION_1_4 -# define COGL_AVAILABLE_IN_1_4 COGL_UNAVAILABLE(1, 4) -#else -# define COGL_AVAILABLE_IN_1_4 -#endif - -#if COGL_VERSION_MIN_REQUIRED >= COGL_VERSION_1_6 -# define COGL_DEPRECATED_IN_1_6 COGL_DEPRECATED -# define COGL_DEPRECATED_IN_1_6_FOR(f) COGL_DEPRECATED_FOR(f) -#else -# define COGL_DEPRECATED_IN_1_6 -# define COGL_DEPRECATED_IN_1_6_FOR(f) -#endif - -#if COGL_VERSION_MAX_ALLOWED < COGL_VERSION_1_6 -# define COGL_AVAILABLE_IN_1_6 COGL_UNAVAILABLE(1, 6) -#else -# define COGL_AVAILABLE_IN_1_6 -#endif - -#if COGL_VERSION_MIN_REQUIRED >= COGL_VERSION_1_8 -# define COGL_DEPRECATED_IN_1_8 COGL_DEPRECATED -# define COGL_DEPRECATED_IN_1_8_FOR(f) COGL_DEPRECATED_FOR(f) -#else -# define COGL_DEPRECATED_IN_1_8 -# define COGL_DEPRECATED_IN_1_8_FOR(f) -#endif - -#if COGL_VERSION_MAX_ALLOWED < COGL_VERSION_1_8 -# define COGL_AVAILABLE_IN_1_8 COGL_UNAVAILABLE(1, 8) -#else -# define COGL_AVAILABLE_IN_1_8 -#endif - -#if COGL_VERSION_MIN_REQUIRED >= COGL_VERSION_1_10 -# define COGL_DEPRECATED_IN_1_10 COGL_DEPRECATED -# define COGL_DEPRECATED_IN_1_10_FOR(f) COGL_DEPRECATED_FOR(f) -#else -# define COGL_DEPRECATED_IN_1_10 -# define COGL_DEPRECATED_IN_1_10_FOR(f) -#endif - -#if COGL_VERSION_MAX_ALLOWED < COGL_VERSION_1_10 -# define COGL_AVAILABLE_IN_1_10 COGL_UNAVAILABLE(1, 10) -#else -# define COGL_AVAILABLE_IN_1_10 -#endif - -#if COGL_VERSION_MIN_REQUIRED >= COGL_VERSION_1_12 -# define COGL_DEPRECATED_IN_1_12 COGL_DEPRECATED -# define COGL_DEPRECATED_IN_1_12_FOR(f) COGL_DEPRECATED_FOR(f) -#else -# define COGL_DEPRECATED_IN_1_12 -# define COGL_DEPRECATED_IN_1_12_FOR(f) -#endif - -#if COGL_VERSION_MAX_ALLOWED < COGL_VERSION_1_12 -# define COGL_AVAILABLE_IN_1_12 COGL_UNAVAILABLE(1, 12) -#else -# define COGL_AVAILABLE_IN_1_12 -#endif - -#if COGL_VERSION_MIN_REQUIRED >= COGL_VERSION_1_14 -# define COGL_DEPRECATED_IN_1_14 COGL_DEPRECATED -# define COGL_DEPRECATED_IN_1_14_FOR(f) COGL_DEPRECATED_FOR(f) -#else -# define COGL_DEPRECATED_IN_1_14 -# define COGL_DEPRECATED_IN_1_14_FOR(f) -#endif - -#if COGL_VERSION_MAX_ALLOWED < COGL_VERSION_1_14 -# define COGL_AVAILABLE_IN_1_14 COGL_UNAVAILABLE(1, 14) -#else -# define COGL_AVAILABLE_IN_1_14 -#endif - -#if COGL_VERSION_MIN_REQUIRED >= COGL_VERSION_1_16 -# define COGL_DEPRECATED_IN_1_16 COGL_DEPRECATED -# define COGL_DEPRECATED_IN_1_16_FOR(f) COGL_DEPRECATED_FOR(f) -#else -# define COGL_DEPRECATED_IN_1_16 -# define COGL_DEPRECATED_IN_1_16_FOR(f) -#endif - -#if COGL_VERSION_MAX_ALLOWED < COGL_VERSION_1_16 -# define COGL_AVAILABLE_IN_1_16 COGL_UNAVAILABLE(1, 16) -#else -# define COGL_AVAILABLE_IN_1_16 -#endif - -#if COGL_VERSION_MIN_REQUIRED >= COGL_VERSION_1_18 -# define COGL_DEPRECATED_IN_1_18 COGL_DEPRECATED -# define COGL_DEPRECATED_IN_1_18_FOR(f) COGL_DEPRECATED_FOR(f) -#else -# define COGL_DEPRECATED_IN_1_18 -# define COGL_DEPRECATED_IN_1_18_FOR(f) -#endif - -#if COGL_VERSION_MAX_ALLOWED < COGL_VERSION_1_18 -# define COGL_AVAILABLE_IN_1_18 COGL_UNAVAILABLE(1, 18) -#else -# define COGL_AVAILABLE_IN_1_18 -#endif - -#if COGL_VERSION_MIN_REQUIRED >= COGL_VERSION_1_20 -# define COGL_DEPRECATED_IN_1_20 COGL_DEPRECATED -# define COGL_DEPRECATED_IN_1_20_FOR(f) COGL_DEPRECATED_FOR(f) -#else -# define COGL_DEPRECATED_IN_1_20 -# define COGL_DEPRECATED_IN_1_20_FOR(f) -#endif - -#if COGL_VERSION_MAX_ALLOWED < COGL_VERSION_1_20 -# define COGL_AVAILABLE_IN_1_20 COGL_UNAVAILABLE(1, 18) -#else -# define COGL_AVAILABLE_IN_1_20 -#endif - #endif /* __COGL_MACROS_H__ */ diff --git a/cogl/cogl/cogl-matrix.h b/cogl/cogl/cogl-matrix.h index 43adfd979..d9e008516 100644 --- a/cogl/cogl/cogl-matrix.h +++ b/cogl/cogl/cogl-matrix.h @@ -405,7 +405,7 @@ cogl_matrix_orthographic (CoglMatrix *matrix, * * Deprecated: 1.10: Use cogl_matrix_orthographic() */ -COGL_DEPRECATED_IN_1_10_FOR (cogl_matrix_orthographic) +COGL_DEPRECATED_FOR (cogl_matrix_orthographic) void cogl_matrix_ortho (CoglMatrix *matrix, float left, diff --git a/cogl/cogl/cogl-offscreen.h b/cogl/cogl/cogl-offscreen.h index 5c26370af..ad2b447ec 100644 --- a/cogl/cogl/cogl-offscreen.h +++ b/cogl/cogl/cogl-offscreen.h @@ -118,7 +118,7 @@ cogl_offscreen_new_with_texture (CoglTexture *texture); * buffer. * Deprecated: 1.16: Use cogl_offscreen_new_with_texture instead. */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_offscreen_new_with_texture) +COGL_DEPRECATED_FOR (cogl_offscreen_new_with_texture) CoglOffscreen * cogl_offscreen_new_to_texture (CoglTexture *texture); diff --git a/cogl/cogl/cogl-onscreen.h b/cogl/cogl/cogl-onscreen.h index bf36bfb51..0ed0f6a8f 100644 --- a/cogl/cogl/cogl-onscreen.h +++ b/cogl/cogl/cogl-onscreen.h @@ -564,7 +564,7 @@ typedef void (*CoglSwapBuffersNotify) (CoglFramebuffer *framebuffer, * Stability: unstable * Deprecated: 1.14: Use cogl_onscreen_add_frame_callback() instead */ -COGL_DEPRECATED_IN_1_14_FOR (cogl_onscreen_add_frame_callback) +COGL_DEPRECATED_FOR (cogl_onscreen_add_frame_callback) unsigned int cogl_onscreen_add_swap_buffers_callback (CoglOnscreen *onscreen, CoglSwapBuffersNotify callback, @@ -583,7 +583,7 @@ cogl_onscreen_add_swap_buffers_callback (CoglOnscreen *onscreen, * Deprecated: 1.14: Use cogl_onscreen_remove_frame_callback() instead */ -COGL_DEPRECATED_IN_1_14_FOR (cogl_onscreen_remove_frame_callback) +COGL_DEPRECATED_FOR (cogl_onscreen_remove_frame_callback) void cogl_onscreen_remove_swap_buffers_callback (CoglOnscreen *onscreen, unsigned int id); diff --git a/cogl/cogl/cogl-version.h b/cogl/cogl/cogl-version.h index bc82437ba..089c4998a 100644 --- a/cogl/cogl/cogl-version.h +++ b/cogl/cogl/cogl-version.h @@ -33,84 +33,6 @@ #include -/** - * SECTION:cogl-version - * @short_description: Macros for determining the version of Cogl being used - * - * Cogl offers a set of macros for checking the version of the library - * at compile time. - * - * Cogl adds version information to both API deprecations and additions; - * by definining the macros %COGL_VERSION_MIN_REQUIRED and - * %COGL_VERSION_MAX_ALLOWED, you can specify the range of Cogl versions - * whose API you want to use. Functions that were deprecated before, or - * introduced after, this range will trigger compiler warnings. For instance, - * if we define the following symbols: - * - * |[ - * COGL_VERSION_MIN_REQUIRED = COGL_VERSION_1_6 - * COGL_VERSION_MAX_ALLOWED = COGL_VERSION_1_8 - * ]| - * - * and we have the following functions annotated in the Cogl headers: - * - * |[ - * COGL_DEPRECATED_IN_1_4 void cogl_function_A (void); - * COGL_DEPRECATED_IN_1_6 void cogl_function_B (void); - * COGL_AVAILABLE_IN_1_8 void cogl_function_C (void); - * COGL_AVAILABLE_IN_1_10 void cogl_function_D (void); - * ]| - * - * then any application code using the functions above will get the output: - * - * |[ - * cogl_function_A: deprecation warning - * cogl_function_B: no warning - * cogl_function_C: no warning - * cogl_function_D: symbol not available warning - * ]| - * - * It is possible to disable the compiler warnings by defining the macro - * %COGL_DISABLE_DEPRECATION_WARNINGS before including the cogl.h - * header. - */ - -/** - * COGL_VERSION_MAJOR: - * - * The major version of the Cogl library (1, if %COGL_VERSION is 1.2.3) - * - * Since: 1.12.0 - */ -#define COGL_VERSION_MAJOR COGL_VERSION_MAJOR_INTERNAL - -/** - * COGL_VERSION_MINOR: - * - * The minor version of the Cogl library (2, if %COGL_VERSION is 1.2.3) - * - * Since: 1.12.0 - */ -#define COGL_VERSION_MINOR COGL_VERSION_MINOR_INTERNAL - -/** - * COGL_VERSION_MICRO: - * - * The micro version of the Cogl library (3, if %COGL_VERSION is 1.2.3) - * - * Since: 1.12.0 - */ -#define COGL_VERSION_MICRO COGL_VERSION_MICRO_INTERNAL - -/** - * COGL_VERSION_STRING: - * - * The full version of the Cogl library, in string form (suited for - * string concatenation) - * - * Since: 1.12.0 - */ -#define COGL_VERSION_STRING COGL_VERSION_STRING_INTERNAL /* Macros to handle compacting a 3-component version number into an * int for quick comparison. This assumes all of the components are <= @@ -119,20 +41,6 @@ #define COGL_VERSION_MAX_COMPONENT_VALUE \ ((1 << COGL_VERSION_COMPONENT_BITS) - 1) -/** - * COGL_VERSION: - * - * The Cogl version encoded into a single integer using the - * COGL_VERSION_ENCODE() macro. This can be used for quick comparisons - * with particular versions. - * - * Since: 1.12.0 - */ -#define COGL_VERSION \ - COGL_VERSION_ENCODE (COGL_VERSION_MAJOR, \ - COGL_VERSION_MINOR, \ - COGL_VERSION_MICRO) - /** * COGL_VERSION_ENCODE: * @major: The major part of a version number @@ -221,138 +129,4 @@ #define COGL_VERSION_CHECK(major, minor, micro) \ (COGL_VERSION >= COGL_VERSION_ENCODE (major, minor, micro)) -/** - * COGL_VERSION_1_0: - * - * A macro that evaluates to the 1.0 version of Cogl, in a format - * that can be used by the C pre-processor. - * - * Since: 1.16 - */ -#define COGL_VERSION_1_0 (COGL_VERSION_ENCODE (1, 0, 0)) - -/** - * COGL_VERSION_1_2: - * - * A macro that evaluates to the 1.2 version of Cogl, in a format - * that can be used by the C pre-processor. - * - * Since: 1.16 - */ -#define COGL_VERSION_1_2 (COGL_VERSION_ENCODE (1, 2, 0)) - -/** - * COGL_VERSION_1_4: - * - * A macro that evaluates to the 1.4 version of Cogl, in a format - * that can be used by the C pre-processor. - * - * Since: 1.16 - */ -#define COGL_VERSION_1_4 (COGL_VERSION_ENCODE (1, 4, 0)) - -/** - * COGL_VERSION_1_6: - * - * A macro that evaluates to the 1.6 version of Cogl, in a format - * that can be used by the C pre-processor. - * - * Since: 1.16 - */ -#define COGL_VERSION_1_6 (COGL_VERSION_ENCODE (1, 6, 0)) - -/** - * COGL_VERSION_1_8: - * - * A macro that evaluates to the 1.8 version of Cogl, in a format - * that can be used by the C pre-processor. - * - * Since: 1.16 - */ -#define COGL_VERSION_1_8 (COGL_VERSION_ENCODE (1, 8, 0)) - -/** - * COGL_VERSION_1_10: - * - * A macro that evaluates to the 1.10 version of Cogl, in a format - * that can be used by the C pre-processor. - * - * Since: 1.16 - */ -#define COGL_VERSION_1_10 (COGL_VERSION_ENCODE (1, 10, 0)) - -/** - * COGL_VERSION_1_12: - * - * A macro that evaluates to the 1.12 version of Cogl, in a format - * that can be used by the C pre-processor. - * - * Since: 1.16 - */ -#define COGL_VERSION_1_12 (COGL_VERSION_ENCODE (1, 12, 0)) - -/** - * COGL_VERSION_1_14: - * - * A macro that evaluates to the 1.14 version of Cogl, in a format - * that can be used by the C pre-processor. - * - * Since: 1.16 - */ -#define COGL_VERSION_1_14 (COGL_VERSION_ENCODE (1, 14, 0)) - -/** - * COGL_VERSION_1_16: - * - * A macro that evaluates to the 1.16 version of Cogl, in a format - * that can be used by the C pre-processor. - * - * Since: 1.16 - */ -#define COGL_VERSION_1_16 (COGL_VERSION_ENCODE (1, 16, 0)) - -/** - * COGL_VERSION_1_18: - * - * A macro that evaluates to the 1.18 version of Cogl, in a format - * that can be used by the C pre-processor. - * - * Since: 1.18 - */ -#define COGL_VERSION_1_18 (COGL_VERSION_ENCODE (1, 18, 0)) - -/** - * COGL_VERSION_1_20: - * - * A macro that evaluates to the 1.20 version of Cogl, in a format - * that can be used by the C pre-processor. - * - * Since: 1.20 - */ -#define COGL_VERSION_1_20 (COGL_VERSION_ENCODE (1, 20, 0)) - -/* evaluates to the current stable version; for development cycles, - * this means the next stable target - */ -#if (COGL_VERSION_MINOR_INTERNAL % 2) -#define COGL_VERSION_CURRENT_STABLE \ - (COGL_VERSION_ENCODE (COGL_VERSION_MAJOR_INTERNAL, \ - COGL_VERSION_MINOR_INTERNAL + 1, 0)) -#else -#define COGL_VERSION_CURRENT_STABLE \ - (COGL_VERSION_ENCODE (COGL_VERSION_MAJOR_INTERNAL, \ - COGL_VERSION_MINOR_INTERNAL, 0)) -#endif - -/* evaluates to the previous stable version */ -#if (COGL_VERSION_MINOR_INTERNAL % 2) -#define COGL_VERSION_PREVIOUS_STABLE \ - (COGL_VERSION_ENCODE (COGL_VERSION_MAJOR_INTERNAL, \ - COGL_VERSION_MINOR_INTERNAL - 1, 0)) -#else -#define COGL_VERSION_PREVIOUS_STABLE \ - (COGL_VERSION_ENCODE (COGL_VERSION_MAJOR_INTERNAL, \ - COGL_VERSION_MINOR_INTERNAL - 2, 0)) -#endif - #endif /* __COGL_VERSION_H__ */ diff --git a/cogl/cogl/cogl-xlib.h b/cogl/cogl/cogl-xlib.h index ac4a14004..65f5bc441 100644 --- a/cogl/cogl/cogl-xlib.h +++ b/cogl/cogl/cogl-xlib.h @@ -71,7 +71,7 @@ COGL_BEGIN_DECLS * Stability: Unstable * Deprecated: 1.16: Use cogl_xlib_renderer_get_display() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_xlib_renderer_get_display) +COGL_DEPRECATED_FOR (cogl_xlib_renderer_get_display) Display * cogl_xlib_get_display (void); @@ -86,7 +86,7 @@ cogl_xlib_get_display (void); * Deprecated: 1.16: Use cogl_xlib_renderer_set_foreign_display() * instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_xlib_renderer_set_foreign_display) +COGL_DEPRECATED_FOR (cogl_xlib_renderer_set_foreign_display) void cogl_xlib_set_display (Display *display); @@ -108,7 +108,7 @@ cogl_xlib_set_display (Display *display); * Stability: Unstable * Deprecated: 1.16: Use cogl_xlib_renderer_handle_event() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_xlib_renderer_handle_event) +COGL_DEPRECATED_FOR (cogl_xlib_renderer_handle_event) CoglFilterReturn cogl_xlib_handle_event (XEvent *xevent); diff --git a/cogl/cogl/cogl.c b/cogl/cogl/cogl.c index a9ca3fe95..74e313733 100644 --- a/cogl/cogl/cogl.c +++ b/cogl/cogl/cogl.c @@ -34,8 +34,6 @@ #include #include -#define COGL_VERSION_MIN_REQUIRED COGL_VERSION_1_4 - #include "cogl-i18n-private.h" #include "cogl-debug.h" #include "cogl-util.h" diff --git a/cogl/cogl/cogl1-context.h b/cogl/cogl/cogl1-context.h index 0f43c198a..01a7b2892 100644 --- a/cogl/cogl/cogl1-context.h +++ b/cogl/cogl/cogl1-context.h @@ -56,7 +56,7 @@ COGL_BEGIN_DECLS * Since: 1.0 * Deprecated: 1.16: Not replaced */ -COGL_DEPRECATED_IN_1_16 +COGL_DEPRECATED GOptionGroup * cogl_get_option_group (void); @@ -71,7 +71,7 @@ cogl_get_option_group (void); * Since: 0.8 * Deprecated: 1.10: Use cogl_foreach_feature() instead */ -COGL_DEPRECATED_IN_1_10_FOR (cogl_foreach_feature) +COGL_DEPRECATED_FOR (cogl_foreach_feature) CoglFeatureFlags cogl_get_features (void); @@ -87,7 +87,7 @@ cogl_get_features (void); * Return value: %TRUE if the features are available, %FALSE otherwise. * Deprecated: 1.10: Use cogl_has_feature() instead */ -COGL_DEPRECATED_IN_1_10_FOR (cogl_has_feature) +COGL_DEPRECATED_FOR (cogl_has_feature) CoglBool cogl_features_available (CoglFeatureFlags features); @@ -144,7 +144,7 @@ cogl_check_extension (const char *name, * Deprecated: 1.8: Use cogl_framebuffer_get_red/green/blue/alpha_bits() * instead */ -COGL_DEPRECATED_IN_1_8_FOR (cogl_framebuffer_get_red_OR_green_OR_blue_OR_alpha_bits) +COGL_DEPRECATED_FOR (cogl_framebuffer_get_red_OR_green_OR_blue_OR_alpha_bits) void cogl_get_bitmasks (int *red, int *green, @@ -168,7 +168,7 @@ cogl_get_bitmasks (int *red, * * Deprecated: 1.10: Use cogl_framebuffer_perspective() instead */ -COGL_DEPRECATED_IN_1_10_FOR (cogl_framebuffer_perspective) +COGL_DEPRECATED_FOR (cogl_framebuffer_perspective) void cogl_perspective (float fovy, float aspect, @@ -195,7 +195,7 @@ cogl_perspective (float fovy, * Since: 0.8.2 * Deprecated: 1.10: Use cogl_framebuffer_frustum() instead */ -COGL_DEPRECATED_IN_1_10_FOR (cogl_framebuffer_frustum) +COGL_DEPRECATED_FOR (cogl_framebuffer_frustum) void cogl_frustum (float left, float right, @@ -234,7 +234,7 @@ cogl_frustum (float left, * Since: 1.0 * Deprecated: 1.10: Use cogl_framebuffer_orthographic() instead */ -COGL_DEPRECATED_IN_1_10_FOR (cogl_framebuffer_orthographic) +COGL_DEPRECATED_FOR (cogl_framebuffer_orthographic) void cogl_ortho (float left, float right, @@ -253,7 +253,7 @@ cogl_ortho (float left, * Since: 0.8.2 * Deprecated: 1.8: Use cogl_framebuffer_set_viewport instead */ -COGL_DEPRECATED_IN_1_8_FOR (cogl_framebuffer_set_viewport) +COGL_DEPRECATED_FOR (cogl_framebuffer_set_viewport) void cogl_viewport (unsigned int width, unsigned int height); @@ -270,7 +270,7 @@ cogl_viewport (unsigned int width, * Since: 1.2 * Deprecated: 1.8: Use cogl_framebuffer_set_viewport() instead */ -COGL_DEPRECATED_IN_1_8_FOR (cogl_framebuffer_set_viewport) +COGL_DEPRECATED_FOR (cogl_framebuffer_set_viewport) void cogl_set_viewport (int x, int y, @@ -285,7 +285,7 @@ cogl_set_viewport (int x, * * Deprecated: 1.10: Use cogl_framebuffer_push_matrix() instead */ -COGL_DEPRECATED_IN_1_10_FOR (cogl_framebuffer_push_matrix) +COGL_DEPRECATED_FOR (cogl_framebuffer_push_matrix) void cogl_push_matrix (void); @@ -296,7 +296,7 @@ cogl_push_matrix (void); * * Deprecated: 1.10: Use cogl_framebuffer_pop_matrix() instead */ -COGL_DEPRECATED_IN_1_10_FOR (cogl_framebuffer_push_matrix) +COGL_DEPRECATED_FOR (cogl_framebuffer_push_matrix) void cogl_pop_matrix (void); @@ -311,7 +311,7 @@ cogl_pop_matrix (void); * * Deprecated: 1.10: Use cogl_framebuffer_pop_matrix() instead */ -COGL_DEPRECATED_IN_1_10_FOR (cogl_framebuffer_scale) +COGL_DEPRECATED_FOR (cogl_framebuffer_scale) void cogl_scale (float x, float y, @@ -328,7 +328,7 @@ cogl_scale (float x, * * Deprecated: 1.10: Use cogl_framebuffer_translate() instead */ -COGL_DEPRECATED_IN_1_10_FOR (cogl_framebuffer_translate) +COGL_DEPRECATED_FOR (cogl_framebuffer_translate) void cogl_translate (float x, float y, @@ -349,7 +349,7 @@ cogl_translate (float x, * * Deprecated: 1.10: Use cogl_framebuffer_rotate() instead */ -COGL_DEPRECATED_IN_1_10_FOR (cogl_framebuffer_rotate) +COGL_DEPRECATED_FOR (cogl_framebuffer_rotate) void cogl_rotate (float angle, float x, @@ -365,7 +365,7 @@ cogl_rotate (float angle, * Since: 1.4 * Deprecated: 1.10: Use cogl_framebuffer_transform() instead */ -COGL_DEPRECATED_IN_1_10_FOR (cogl_framebuffer_transform) +COGL_DEPRECATED_FOR (cogl_framebuffer_transform) void cogl_transform (const CoglMatrix *matrix); @@ -378,7 +378,7 @@ cogl_transform (const CoglMatrix *matrix); * Deprecated: 1.10: Use cogl_framebuffer_get_modelview_matrix() * instead */ -COGL_DEPRECATED_IN_1_10_FOR (cogl_framebuffer_get_modelview_matrix) +COGL_DEPRECATED_FOR (cogl_framebuffer_get_modelview_matrix) void cogl_get_modelview_matrix (CoglMatrix *matrix); @@ -391,7 +391,7 @@ cogl_get_modelview_matrix (CoglMatrix *matrix); * Deprecated: 1.10: Use cogl_framebuffer_set_modelview_matrix() * instead */ -COGL_DEPRECATED_IN_1_10_FOR (cogl_framebuffer_set_modelview_matrix) +COGL_DEPRECATED_FOR (cogl_framebuffer_set_modelview_matrix) void cogl_set_modelview_matrix (CoglMatrix *matrix); @@ -404,7 +404,7 @@ cogl_set_modelview_matrix (CoglMatrix *matrix); * Deprecated: 1.10: Use cogl_framebuffer_get_projection_matrix() * instead */ -COGL_DEPRECATED_IN_1_10_FOR (cogl_framebuffer_get_projection_matrix) +COGL_DEPRECATED_FOR (cogl_framebuffer_get_projection_matrix) void cogl_get_projection_matrix (CoglMatrix *matrix); @@ -417,7 +417,7 @@ cogl_get_projection_matrix (CoglMatrix *matrix); * Deprecated: 1.10: Use cogl_framebuffer_set_projection_matrix() * instead */ -COGL_DEPRECATED_IN_1_10_FOR (cogl_framebuffer_set_projection_matrix) +COGL_DEPRECATED_FOR (cogl_framebuffer_set_projection_matrix) void cogl_set_projection_matrix (CoglMatrix *matrix); @@ -433,7 +433,7 @@ cogl_set_projection_matrix (CoglMatrix *matrix); * Deprecated: 1.10: Use cogl_framebuffer_get_viewport4fv() * instead */ -COGL_DEPRECATED_IN_1_10_FOR (cogl_framebuffer_get_viewport4fv) +COGL_DEPRECATED_FOR (cogl_framebuffer_get_viewport4fv) void cogl_get_viewport (float v[4]); @@ -449,7 +449,7 @@ cogl_get_viewport (float v[4]); * * Deprecated: 1.16: Use cogl_pipeline_set_depth_state() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_set_depth_state) +COGL_DEPRECATED_FOR (cogl_pipeline_set_depth_state) void cogl_set_depth_test_enabled (CoglBool setting); @@ -462,7 +462,7 @@ cogl_set_depth_test_enabled (CoglBool setting); * * Deprecated: 1.16: Use cogl_pipeline_set_depth_state() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_set_depth_state) +COGL_DEPRECATED_FOR (cogl_pipeline_set_depth_state) CoglBool cogl_get_depth_test_enabled (void); @@ -478,7 +478,7 @@ cogl_get_depth_test_enabled (void); * * Deprecated: 1.16: Use cogl_pipeline_set_cull_face_mode() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_set_cull_face_mode) +COGL_DEPRECATED_FOR (cogl_pipeline_set_cull_face_mode) void cogl_set_backface_culling_enabled (CoglBool setting); @@ -492,7 +492,7 @@ cogl_set_backface_culling_enabled (CoglBool setting); * * Deprecated: 1.16: Use cogl_pipeline_get_cull_face_mode() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_get_cull_face_mode) +COGL_DEPRECATED_FOR (cogl_pipeline_get_cull_face_mode) CoglBool cogl_get_backface_culling_enabled (void); @@ -523,7 +523,7 @@ cogl_get_backface_culling_enabled (void); * * Deprecated: 1.16: Use #CoglSnippet shader api for fog */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_API) +COGL_DEPRECATED_FOR (cogl_snippet_API) void cogl_set_fog (const CoglColor *fog_color, CoglFogMode mode, @@ -539,7 +539,7 @@ cogl_set_fog (const CoglColor *fog_color, * * Deprecated: 1.16: Use #CoglSnippet shader api for fog */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_API) +COGL_DEPRECATED_FOR (cogl_snippet_API) void cogl_disable_fog (void); @@ -554,7 +554,7 @@ cogl_disable_fog (void); * * Deprecated: 1.16: Use cogl_framebuffer_clear() api instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_framebuffer_clear) +COGL_DEPRECATED_FOR (cogl_framebuffer_clear) void cogl_clear (const CoglColor *color, unsigned long buffers); @@ -573,7 +573,7 @@ cogl_clear (const CoglColor *color, * #CoglPipeline argument so this stack of * #CoglMaterials shouldn't be used. */ -COGL_DEPRECATED_IN_1_16 +COGL_DEPRECATED void cogl_set_source (void *material); @@ -596,7 +596,7 @@ cogl_set_source (void *material); * #CoglPipeline argument so this stack of * #CoglMaterials shouldn't be used. */ -COGL_DEPRECATED_IN_1_16 +COGL_DEPRECATED void * cogl_get_source (void); @@ -613,7 +613,7 @@ cogl_get_source (void); * #CoglPipeline argument so this stack of * #CoglMaterials shouldn't be used. */ -COGL_DEPRECATED_IN_1_16 +COGL_DEPRECATED void cogl_push_source (void *material); @@ -629,7 +629,7 @@ cogl_push_source (void *material); * #CoglPipeline argument so this stack of * #CoglMaterials shouldn't be used. */ -COGL_DEPRECATED_IN_1_16 +COGL_DEPRECATED void cogl_pop_source (void); @@ -653,7 +653,7 @@ cogl_pop_source (void); * #CoglPipeline argument so this stack of * #CoglMaterials shouldn't be used. */ -COGL_DEPRECATED_IN_1_16 +COGL_DEPRECATED void cogl_set_source_color (const CoglColor *color); @@ -676,7 +676,7 @@ cogl_set_source_color (const CoglColor *color); * #CoglPipeline argument so this stack of * #CoglMaterials shouldn't be used. */ -COGL_DEPRECATED_IN_1_16 +COGL_DEPRECATED void cogl_set_source_color4ub (uint8_t red, uint8_t green, @@ -703,7 +703,7 @@ cogl_set_source_color4ub (uint8_t red, * #CoglPipeline argument so this stack of * #CoglMaterials shouldn't be used. */ -COGL_DEPRECATED_IN_1_16 +COGL_DEPRECATED void cogl_set_source_color4f (float red, float green, @@ -733,7 +733,7 @@ cogl_set_source_color4f (float red, * #CoglPipeline argument so this stack of * #CoglMaterials shouldn't be used. */ -COGL_DEPRECATED_IN_1_16 +COGL_DEPRECATED void cogl_set_source_texture (CoglTexture *texture); @@ -840,7 +840,7 @@ cogl_flush (void); * Since: 1.0 * Deprecated: 1.16: Use the #CoglGLES2Context api instead */ -COGL_DEPRECATED_IN_1_16_FOR (CoglGLES2Context_API) +COGL_DEPRECATED_FOR (CoglGLES2Context_API) void cogl_begin_gl (void); @@ -853,7 +853,7 @@ cogl_begin_gl (void); * Since: 1.0 * Deprecated: 1.16: Use the #CoglGLES2Context api instead */ -COGL_DEPRECATED_IN_1_16_FOR (CoglGLES2Context_API) +COGL_DEPRECATED_FOR (CoglGLES2Context_API) void cogl_end_gl (void); diff --git a/cogl/cogl/deprecated/cogl-auto-texture.h b/cogl/cogl/deprecated/cogl-auto-texture.h index 44e868d88..1ab23aa5d 100644 --- a/cogl/cogl/deprecated/cogl-auto-texture.h +++ b/cogl/cogl/deprecated/cogl-auto-texture.h @@ -51,7 +51,7 @@ COGL_BEGIN_DECLS * Deprecated: 1.18: Use specific constructors such as * cogl_texture_2d_new_with_size() */ -COGL_DEPRECATED_IN_1_18_FOR(cogl_texture_2d_new_with_size__OR__cogl_texture_2d_sliced_new_with_size) +COGL_DEPRECATED_FOR (cogl_texture_2d_new_with_size__OR__cogl_texture_2d_sliced_new_with_size) CoglTexture * cogl_texture_new_with_size (unsigned int width, unsigned int height, @@ -81,7 +81,7 @@ cogl_texture_new_with_size (unsigned int width, * Deprecated: 1.18: Use specific constructors such as * cogl_texture_2d_new_from_file() */ -COGL_DEPRECATED_IN_1_18_FOR(cogl_texture_2d_new_from_file__OR__cogl_texture_2d_sliced_new_from_file) +COGL_DEPRECATED_FOR (cogl_texture_2d_new_from_file__OR__cogl_texture_2d_sliced_new_from_file) CoglTexture * cogl_texture_new_from_file (const char *filename, CoglTextureFlags flags, @@ -115,7 +115,7 @@ cogl_texture_new_from_file (const char *filename, * Deprecated: 1.18: Use specific constructors such as * cogl_texture_2d_new_from_data() */ -COGL_DEPRECATED_IN_1_18_FOR(cogl_texture_2d_new_from_data__OR__cogl_texture_2d_sliced_new_from_data) +COGL_DEPRECATED_FOR (cogl_texture_2d_new_from_data__OR__cogl_texture_2d_sliced_new_from_data) CoglTexture * cogl_texture_new_from_data (int width, int height, @@ -153,7 +153,7 @@ cogl_texture_new_from_data (int width, * Deprecated: 1.18: Use specific constructors such as * cogl_texture_2d_new_from_foreign() */ -COGL_DEPRECATED_IN_1_18_FOR(cogl_texture_2d_new_from_foreign) +COGL_DEPRECATED_FOR (cogl_texture_2d_new_from_foreign) CoglTexture * cogl_texture_new_from_foreign (unsigned int gl_handle, unsigned int gl_target, @@ -179,7 +179,7 @@ cogl_texture_new_from_foreign (unsigned int gl_handle, * Deprecated: 1.18: Use specific constructors such as * cogl_texture_2d_new_from_bitmap() */ -COGL_DEPRECATED_IN_1_18_FOR(cogl_texture_2d_new_from_bitmap__OR__cogl_texture_2d_sliced_new_from_bitmap) +COGL_DEPRECATED_FOR (cogl_texture_2d_new_from_bitmap__OR__cogl_texture_2d_sliced_new_from_bitmap) CoglTexture * cogl_texture_new_from_bitmap (CoglBitmap *bitmap, CoglTextureFlags flags, @@ -210,7 +210,7 @@ cogl_texture_new_from_bitmap (CoglBitmap *bitmap, * Since: 1.2 * Deprecated: 1.18: Use cogl_sub_texture_new() */ -COGL_DEPRECATED_IN_1_18_FOR(cogl_sub_texture_new) +COGL_DEPRECATED_FOR (cogl_sub_texture_new) CoglTexture * cogl_texture_new_from_sub_texture (CoglTexture *full_texture, int sub_x, diff --git a/cogl/cogl/deprecated/cogl-clutter.h b/cogl/cogl/deprecated/cogl-clutter.h index cc6c44644..1fd56ff9f 100644 --- a/cogl/cogl/deprecated/cogl-clutter.h +++ b/cogl/cogl/deprecated/cogl-clutter.h @@ -36,7 +36,7 @@ COGL_BEGIN_DECLS #define cogl_clutter_check_extension cogl_clutter_check_extension_CLUTTER -COGL_DEPRECATED_IN_1_16 +COGL_DEPRECATED CoglBool cogl_clutter_check_extension (const char *name, const char *ext); diff --git a/cogl/cogl/deprecated/cogl-framebuffer-deprecated.h b/cogl/cogl/deprecated/cogl-framebuffer-deprecated.h index 64c3413d2..452b4542a 100644 --- a/cogl/cogl/deprecated/cogl-framebuffer-deprecated.h +++ b/cogl/cogl/deprecated/cogl-framebuffer-deprecated.h @@ -49,7 +49,7 @@ COGL_BEGIN_DECLS * #CoglFramebuffer arguments so this stack of * framebuffers shouldn't be used anymore. */ -COGL_DEPRECATED_IN_1_16 +COGL_DEPRECATED void cogl_set_framebuffer (CoglFramebuffer *buffer); @@ -134,7 +134,7 @@ cogl_set_framebuffer (CoglFramebuffer *buffer); * #CoglFramebuffer arguments so this stack of * framebuffers shouldn't be used anymore. */ -COGL_DEPRECATED_IN_1_16 +COGL_DEPRECATED void cogl_push_framebuffer (CoglFramebuffer *buffer); @@ -149,7 +149,7 @@ cogl_push_framebuffer (CoglFramebuffer *buffer); * #CoglFramebuffer arguments so this stack of * framebuffers shouldn't be used anymore. */ -COGL_DEPRECATED_IN_1_16 +COGL_DEPRECATED void cogl_pop_framebuffer (void); @@ -169,7 +169,7 @@ cogl_pop_framebuffer (void); * #CoglFramebuffer arguments so this stack of * framebuffers shouldn't be used anymore. */ -COGL_DEPRECATED_IN_1_16 +COGL_DEPRECATED void cogl_set_draw_buffer (CoglBufferTarget target, CoglHandle offscreen); @@ -183,7 +183,7 @@ cogl_set_draw_buffer (CoglBufferTarget target, * #CoglFramebuffer arguments so this stack of * framebuffers shouldn't be used anymore. */ -COGL_DEPRECATED_IN_1_16 +COGL_DEPRECATED void cogl_push_draw_buffer (void); @@ -196,7 +196,7 @@ cogl_push_draw_buffer (void); * #CoglFramebuffer arguments so this stack of * framebuffers shouldn't be used anymore. */ -COGL_DEPRECATED_IN_1_16 +COGL_DEPRECATED void cogl_pop_draw_buffer (void); @@ -224,7 +224,7 @@ cogl_pop_draw_buffer (void); * * Deprecated: 1.16: Use cogl_framebuffer_read_pixels() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_framebuffer_read_pixels) +COGL_DEPRECATED_FOR (cogl_framebuffer_read_pixels) void cogl_read_pixels (int x, int y, @@ -256,7 +256,7 @@ cogl_read_pixels (int x, * Stability: unstable * Deprecated 1.18: Removed since it is misleading */ -COGL_DEPRECATED_IN_1_18 +COGL_DEPRECATED CoglPixelFormat cogl_framebuffer_get_color_format (CoglFramebuffer *framebuffer); diff --git a/cogl/cogl/deprecated/cogl-material-compat.h b/cogl/cogl/deprecated/cogl-material-compat.h index 97f3e9c6a..3b091978c 100644 --- a/cogl/cogl/deprecated/cogl-material-compat.h +++ b/cogl/cogl/deprecated/cogl-material-compat.h @@ -148,7 +148,7 @@ typedef enum { * Return value: a pointer to a new #CoglMaterial * Deprecated: 1.16: Use cogl_pipeline_new() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_new) +COGL_DEPRECATED_FOR (cogl_pipeline_new) CoglMaterial * cogl_material_new (void); @@ -170,7 +170,7 @@ cogl_material_new (void); * Since: 1.2 * Deprecated: 1.16: Use cogl_pipeline_copy() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_copy) +COGL_DEPRECATED_FOR (cogl_pipeline_copy) CoglMaterial * cogl_material_copy (CoglMaterial *source); @@ -214,7 +214,7 @@ cogl_material_unref (CoglHandle material); * %FALSE otherwise * Deprecated: 1.16: Use cogl_is_pipeline() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_is_pipeline) +COGL_DEPRECATED_FOR (cogl_is_pipeline) CoglBool cogl_is_material (CoglHandle handle); @@ -235,7 +235,7 @@ cogl_is_material (CoglHandle handle); * Since: 1.0 * Deprecated: 1.16: Use cogl_pipeline_set_color() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_set_color) +COGL_DEPRECATED_FOR (cogl_pipeline_set_color) void cogl_material_set_color (CoglMaterial *material, const CoglColor *color); @@ -255,7 +255,7 @@ cogl_material_set_color (CoglMaterial *material, * Since: 1.0 * Deprecated: 1.16: Use cogl_pipeline_set_color4ub() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_set_color4ub) +COGL_DEPRECATED_FOR (cogl_pipeline_set_color4ub) void cogl_material_set_color4ub (CoglMaterial *material, uint8_t red, @@ -278,7 +278,7 @@ cogl_material_set_color4ub (CoglMaterial *material, * Since: 1.0 * Deprecated: 1.16: Use cogl_pipeline_set_color4f() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_set_color4f) +COGL_DEPRECATED_FOR (cogl_pipeline_set_color4f) void cogl_material_set_color4f (CoglMaterial *material, float red, @@ -296,7 +296,7 @@ cogl_material_set_color4f (CoglMaterial *material, * Since: 1.0 * Deprecated: 1.16: Use cogl_pipeline_get_color() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_get_color) +COGL_DEPRECATED_FOR (cogl_pipeline_get_color) void cogl_material_get_color (CoglMaterial *material, CoglColor *color); @@ -318,7 +318,7 @@ cogl_material_get_color (CoglMaterial *material, * Since: 1.0 * Deprecated: 1.16: Use the #CoglSnippet shader api for lighting */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_) +COGL_DEPRECATED_FOR (cogl_snippet_) void cogl_material_set_ambient (CoglMaterial *material, const CoglColor *ambient); @@ -333,7 +333,7 @@ cogl_material_set_ambient (CoglMaterial *material, * Since: 1.0 * Deprecated: 1.16: Use the #CoglSnippet shader api for lighting */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_) +COGL_DEPRECATED_FOR (cogl_snippet_) void cogl_material_get_ambient (CoglMaterial *material, CoglColor *ambient); @@ -352,7 +352,7 @@ cogl_material_get_ambient (CoglMaterial *material, * Since: 1.0 * Deprecated: 1.16: Use the #CoglSnippet shader api for lighting */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_) +COGL_DEPRECATED_FOR (cogl_snippet_) void cogl_material_set_diffuse (CoglMaterial *material, const CoglColor *diffuse); @@ -367,7 +367,7 @@ cogl_material_set_diffuse (CoglMaterial *material, * Since: 1.0 * Deprecated: 1.16: Use the #CoglSnippet shader api for lighting */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_) +COGL_DEPRECATED_FOR (cogl_snippet_) void cogl_material_get_diffuse (CoglMaterial *material, CoglColor *diffuse); @@ -387,7 +387,7 @@ cogl_material_get_diffuse (CoglMaterial *material, * Since: 1.0 * Deprecated: 1.16: Use the #CoglSnippet shader api for lighting */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_) +COGL_DEPRECATED_FOR (cogl_snippet_) void cogl_material_set_ambient_and_diffuse (CoglMaterial *material, const CoglColor *color); @@ -406,7 +406,7 @@ cogl_material_set_ambient_and_diffuse (CoglMaterial *material, * Since: 1.0 * Deprecated: 1.16: Use the #CoglSnippet shader api for lighting */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_) +COGL_DEPRECATED_FOR (cogl_snippet_) void cogl_material_set_specular (CoglMaterial *material, const CoglColor *specular); @@ -421,7 +421,7 @@ cogl_material_set_specular (CoglMaterial *material, * Since: 1.0 * Deprecated: 1.16: Use the #CoglSnippet shader api for lighting */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_) +COGL_DEPRECATED_FOR (cogl_snippet_) void cogl_material_get_specular (CoglMaterial *material, CoglColor *specular); @@ -441,7 +441,7 @@ cogl_material_get_specular (CoglMaterial *material, * Since: 1.0 * Deprecated: 1.16: Use the #CoglSnippet shader api for lighting */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_) +COGL_DEPRECATED_FOR (cogl_snippet_) void cogl_material_set_shininess (CoglMaterial *material, float shininess); @@ -457,7 +457,7 @@ cogl_material_set_shininess (CoglMaterial *material, * Since: 1.0 * Deprecated: 1.16: Use the #CoglSnippet shader api for lighting */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_) +COGL_DEPRECATED_FOR (cogl_snippet_) float cogl_material_get_shininess (CoglMaterial *material); @@ -475,7 +475,7 @@ cogl_material_get_shininess (CoglMaterial *material); * Since: 1.0 * Deprecated: 1.16: Use the #CoglSnippet shader api for lighting */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_) +COGL_DEPRECATED_FOR (cogl_snippet_) void cogl_material_set_emission (CoglMaterial *material, const CoglColor *emission); @@ -490,7 +490,7 @@ cogl_material_set_emission (CoglMaterial *material, * Since: 1.0 * Deprecated: 1.16: Use the #CoglSnippet shader api for lighting */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_) +COGL_DEPRECATED_FOR (cogl_snippet_) void cogl_material_get_emission (CoglMaterial *material, CoglColor *emission); @@ -546,7 +546,7 @@ typedef enum { * Since: 1.0 * Deprecated: 1.16: Use cogl_pipeline_set_alpha_test_function() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_set_alpha_test_function) +COGL_DEPRECATED_FOR (cogl_pipeline_set_alpha_test_function) void cogl_material_set_alpha_test_function (CoglMaterial *material, CoglMaterialAlphaFunc alpha_func, @@ -637,7 +637,7 @@ cogl_material_set_alpha_test_function (CoglMaterial *material, * Since: 1.0 * Deprecated: 1.16: Use cogl_pipeline_set_blend() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_set_blend) +COGL_DEPRECATED_FOR (cogl_pipeline_set_blend) CoglBool cogl_material_set_blend (CoglMaterial *material, const char *blend_string, @@ -654,7 +654,7 @@ cogl_material_set_blend (CoglMaterial *material, * Since: 1.0 * Deprecated: 1.16: Use cogl_pipeline_set_blend_constant() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_set_blend_constant) +COGL_DEPRECATED_FOR (cogl_pipeline_set_blend_constant) void cogl_material_set_blend_constant (CoglMaterial *material, const CoglColor *constant_color); @@ -675,7 +675,7 @@ cogl_material_set_blend_constant (CoglMaterial *material, * Since: 1.4 * Deprecated: 1.16: Use cogl_pipeline_set_point_size() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_set_point_size) +COGL_DEPRECATED_FOR (cogl_pipeline_set_point_size) void cogl_material_set_point_size (CoglMaterial *material, float point_size); @@ -692,7 +692,7 @@ cogl_material_set_point_size (CoglMaterial *material, * Since: 1.4 * Deprecated: 1.16: Use cogl_pipeline_get_point_size() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_get_point_size) +COGL_DEPRECATED_FOR (cogl_pipeline_get_point_size) float cogl_material_get_point_size (CoglMaterial *material); @@ -709,7 +709,7 @@ cogl_material_get_point_size (CoglMaterial *material); * Since: 1.4 * Deprecated: 1.16: Use #CoglSnippet api instead instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_) +COGL_DEPRECATED_FOR (cogl_snippet_) CoglHandle cogl_material_get_user_program (CoglMaterial *material); @@ -760,7 +760,7 @@ cogl_material_get_user_program (CoglMaterial *material); * Since: 1.4 * Deprecated: 1.16: Use #CoglSnippet api instead instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_) +COGL_DEPRECATED_FOR (cogl_snippet_) void cogl_material_set_user_program (CoglMaterial *material, CoglHandle program); @@ -785,7 +785,7 @@ cogl_material_set_user_program (CoglMaterial *material, * Since: 1.0 * Deprecated: 1.16: Use cogl_pipeline_set_layer() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_set_layer) +COGL_DEPRECATED_FOR (cogl_pipeline_set_layer) void cogl_material_set_layer (CoglMaterial *material, int layer_index, @@ -799,7 +799,7 @@ cogl_material_set_layer (CoglMaterial *material, * This function removes a layer from your material * Deprecated: 1.16: Use cogl_pipeline_remove_layer() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_remove_layer) +COGL_DEPRECATED_FOR (cogl_pipeline_remove_layer) void cogl_material_remove_layer (CoglMaterial *material, int layer_index); @@ -898,7 +898,7 @@ cogl_material_remove_layer (CoglMaterial *material, * Since: 1.0 * Deprecated: 1.16: Use cogl_pipeline_set_layer_combine() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_set_layer_combine) +COGL_DEPRECATED_FOR (cogl_pipeline_set_layer_combine) CoglBool cogl_material_set_layer_combine (CoglMaterial *material, int layer_index, @@ -919,7 +919,7 @@ cogl_material_set_layer_combine (CoglMaterial *material, * Deprecated: 1.16: Use cogl_pipeline_set_layer_combine_constant() * instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_set_layer_combine_constant) +COGL_DEPRECATED_FOR (cogl_pipeline_set_layer_combine_constant) void cogl_material_set_layer_combine_constant (CoglMaterial *material, int layer_index, @@ -935,7 +935,7 @@ cogl_material_set_layer_combine_constant (CoglMaterial *material, * and rotate a single layer of a material used to fill your geometry. * Deprecated: 1.16: Use cogl_pipeline_set_layer_matrix() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_set_layer_matrix) +COGL_DEPRECATED_FOR (cogl_pipeline_set_layer_matrix) void cogl_material_set_layer_matrix (CoglMaterial *material, int layer_index, @@ -963,7 +963,7 @@ cogl_material_set_layer_matrix (CoglMaterial *material, * should not be modified or freed * Deprecated: 1.16: Use cogl_pipeline_get_layers() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_get_layers) +COGL_DEPRECATED_FOR (cogl_pipeline_get_layers) const GList * cogl_material_get_layers (CoglMaterial *material); @@ -978,7 +978,7 @@ cogl_material_get_layers (CoglMaterial *material); * Since: 1.0 * Deprecated: 1.16: Use cogl_pipeline_get_n_layers() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_get_n_layers) +COGL_DEPRECATED_FOR (cogl_pipeline_get_n_layers) int cogl_material_get_n_layers (CoglMaterial *material); @@ -1011,7 +1011,7 @@ typedef enum { * Return value: the type of the layer * Deprecated: 1.16: No replacement */ -COGL_DEPRECATED_IN_1_16 +COGL_DEPRECATED CoglMaterialLayerType cogl_material_layer_get_type (CoglMaterialLayer *layer); @@ -1030,7 +1030,7 @@ cogl_material_layer_get_type (CoglMaterialLayer *layer); * Return value: (transfer none): a #CoglHandle for the texture inside the layer * Deprecated: 1.16: No replacement */ -COGL_DEPRECATED_IN_1_16 +COGL_DEPRECATED CoglHandle cogl_material_layer_get_texture (CoglMaterialLayer *layer); @@ -1043,7 +1043,7 @@ cogl_material_layer_get_texture (CoglMaterialLayer *layer); * Return value: the current downscaling filter * Deprecated: 1.16: No replacement */ -COGL_DEPRECATED_IN_1_16 +COGL_DEPRECATED CoglMaterialFilter cogl_material_layer_get_min_filter (CoglMaterialLayer *layer); @@ -1056,7 +1056,7 @@ cogl_material_layer_get_min_filter (CoglMaterialLayer *layer); * Return value: the current downscaling filter * Deprecated: 1.16: No replacement */ -COGL_DEPRECATED_IN_1_16 +COGL_DEPRECATED CoglMaterialFilter cogl_material_layer_get_mag_filter (CoglMaterialLayer *layer); @@ -1071,7 +1071,7 @@ cogl_material_layer_get_mag_filter (CoglMaterialLayer *layer); * drawn at other scales than 100%. * Deprecated: 1.16: Use cogl_pipeline_set_layer_filters() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_set_layer_filters) +COGL_DEPRECATED_FOR (cogl_pipeline_set_layer_filters) void cogl_material_set_layer_filters (CoglMaterial *material, int layer_index, @@ -1101,7 +1101,7 @@ cogl_material_set_layer_filters (CoglMaterial *material, * Deprecated: 1.16: Use cogl_pipeline_set_layer_point_sprite_coords_enabled() * instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_set_layer_point_sprite_coords_enabled) +COGL_DEPRECATED_FOR (cogl_pipeline_set_layer_point_sprite_coords_enabled) CoglBool cogl_material_set_layer_point_sprite_coords_enabled (CoglMaterial *material, int layer_index, @@ -1123,7 +1123,7 @@ cogl_material_set_layer_point_sprite_coords_enabled (CoglMaterial *material, * Deprecated: 1.16: Use cogl_pipeline_get_layer_point_sprite_coords_enabled() * instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_get_layer_point_sprite_coords_enabled) +COGL_DEPRECATED_FOR (cogl_pipeline_get_layer_point_sprite_coords_enabled) CoglBool cogl_material_get_layer_point_sprite_coords_enabled (CoglMaterial *material, int layer_index); @@ -1142,7 +1142,7 @@ cogl_material_get_layer_point_sprite_coords_enabled (CoglMaterial *material, * Since: 1.6 * Deprecated: 1.16: Use cogl_pipeline_get_layer_wrap_mode_s() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_get_layer_wrap_mode_s) +COGL_DEPRECATED_FOR (cogl_pipeline_get_layer_wrap_mode_s) CoglMaterialWrapMode cogl_material_get_layer_wrap_mode_s (CoglMaterial *material, int layer_index); @@ -1158,7 +1158,7 @@ cogl_material_get_layer_wrap_mode_s (CoglMaterial *material, * Since: 1.4 * Deprecated: 1.16: Use cogl_pipeline_set_layer_wrap_mode_s() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_set_layer_wrap_mode_s) +COGL_DEPRECATED_FOR (cogl_pipeline_set_layer_wrap_mode_s) void cogl_material_set_layer_wrap_mode_s (CoglMaterial *material, int layer_index, @@ -1178,7 +1178,7 @@ cogl_material_set_layer_wrap_mode_s (CoglMaterial *material, * Since: 1.6 * Deprecated: 1.16: Use cogl_pipeline_get_layer_wrap_mode_t() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_get_layer_wrap_mode_t) +COGL_DEPRECATED_FOR (cogl_pipeline_get_layer_wrap_mode_t) CoglMaterialWrapMode cogl_material_get_layer_wrap_mode_t (CoglMaterial *material, int layer_index); @@ -1195,7 +1195,7 @@ cogl_material_get_layer_wrap_mode_t (CoglMaterial *material, * Since: 1.4 * Deprecated: 1.16: Use cogl_pipeline_set_layer_wrap_mode_t() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_set_layer_wrap_mode_t) +COGL_DEPRECATED_FOR (cogl_pipeline_set_layer_wrap_mode_t) void cogl_material_set_layer_wrap_mode_t (CoglMaterial *material, int layer_index, @@ -1215,7 +1215,7 @@ cogl_material_set_layer_wrap_mode_t (CoglMaterial *material, * Since: 1.6 * Deprecated: 1.16: Use cogl_pipeline_get_layer_wrap_mode_p() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_get_layer_wrap_mode_p) +COGL_DEPRECATED_FOR (cogl_pipeline_get_layer_wrap_mode_p) CoglMaterialWrapMode cogl_material_get_layer_wrap_mode_p (CoglMaterial *material, int layer_index); @@ -1232,7 +1232,7 @@ cogl_material_get_layer_wrap_mode_p (CoglMaterial *material, * Since: 1.4 * Deprecated: 1.16: Use cogl_pipeline_set_layer_wrap_mode_p() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_set_layer_wrap_mode_p) +COGL_DEPRECATED_FOR (cogl_pipeline_set_layer_wrap_mode_p) void cogl_material_set_layer_wrap_mode_p (CoglMaterial *material, int layer_index, @@ -1253,7 +1253,7 @@ cogl_material_set_layer_wrap_mode_p (CoglMaterial *material, * Since: 1.4 * Deprecated: 1.16: Use cogl_pipeline_set_layer_wrap_mode() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_set_layer_wrap_mode) +COGL_DEPRECATED_FOR (cogl_pipeline_set_layer_wrap_mode) void cogl_material_set_layer_wrap_mode (CoglMaterial *material, int layer_index, @@ -1270,7 +1270,7 @@ cogl_material_set_layer_wrap_mode (CoglMaterial *material, * Since: 1.4 * Deprecated: 1.16: Use cogl_pipeline_layer_get_wrap_mode_s() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_layer_get_wrap_mode_s) +COGL_DEPRECATED_FOR (cogl_pipeline_layer_get_wrap_mode_s) CoglMaterialWrapMode cogl_material_layer_get_wrap_mode_s (CoglMaterialLayer *layer); @@ -1286,7 +1286,7 @@ cogl_material_layer_get_wrap_mode_s (CoglMaterialLayer *layer); * Deprecated: 1.16: Use cogl_pipeline_layer_get_wrap_mode_t() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_layer_get_wrap_mode_t) +COGL_DEPRECATED_FOR (cogl_pipeline_layer_get_wrap_mode_t) CoglMaterialWrapMode cogl_material_layer_get_wrap_mode_t (CoglMaterialLayer *layer); @@ -1302,7 +1302,7 @@ cogl_material_layer_get_wrap_mode_t (CoglMaterialLayer *layer); * Since: 1.4 * Deprecated: 1.16: Use cogl_pipeline_layer_get_wrap_mode_p() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_layer_get_wrap_mode_p) +COGL_DEPRECATED_FOR (cogl_pipeline_layer_get_wrap_mode_p) CoglMaterialWrapMode cogl_material_layer_get_wrap_mode_p (CoglMaterialLayer *layer); @@ -1327,7 +1327,7 @@ cogl_material_layer_get_wrap_mode_p (CoglMaterialLayer *layer); * Stability: Unstable * Deprecated: 1.16: Use cogl_pipeline_set_depth_state() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_set_depth_state) +COGL_DEPRECATED_FOR (cogl_pipeline_set_depth_state) CoglBool cogl_material_set_depth_state (CoglMaterial *material, const CoglDepthState *state, @@ -1345,7 +1345,7 @@ cogl_material_set_depth_state (CoglMaterial *material, * Stability: Unstable * Deprecated: 1.16: Use cogl_pipeline_get_depth_state() instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_get_depth_state) +COGL_DEPRECATED_FOR (cogl_pipeline_get_depth_state) void cogl_material_get_depth_state (CoglMaterial *material, CoglDepthState *state_out); @@ -1380,7 +1380,7 @@ typedef CoglBool (*CoglMaterialLayerCallback) (CoglMaterial *material, * Stability: Unstable * Deprecated: 1.16: No replacement */ -COGL_DEPRECATED_IN_1_16 +COGL_DEPRECATED void cogl_material_foreach_layer (CoglMaterial *material, CoglMaterialLayerCallback callback, diff --git a/cogl/cogl/deprecated/cogl-shader.h b/cogl/cogl/deprecated/cogl-shader.h index d4b22e757..1c7ac97d4 100644 --- a/cogl/cogl/deprecated/cogl-shader.h +++ b/cogl/cogl/deprecated/cogl-shader.h @@ -249,7 +249,7 @@ typedef enum { * Returns: a new shader handle. * Deprecated: 1.16: Use #CoglSnippet api */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_) +COGL_DEPRECATED_FOR (cogl_snippet_) CoglHandle cogl_create_shader (CoglShaderType shader_type); @@ -262,7 +262,7 @@ cogl_create_shader (CoglShaderType shader_type); * Returns: @handle * Deprecated: 1.16: Use #CoglSnippet api */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_) +COGL_DEPRECATED_FOR (cogl_snippet_) CoglHandle cogl_shader_ref (CoglHandle handle); @@ -275,7 +275,7 @@ cogl_shader_ref (CoglHandle handle); * * Deprecated: 1.16: Use #CoglSnippet api */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_) +COGL_DEPRECATED_FOR (cogl_snippet_) void cogl_shader_unref (CoglHandle handle); @@ -289,7 +289,7 @@ cogl_shader_unref (CoglHandle handle); * %FALSE otherwise * Deprecated: 1.16: Use #CoglSnippet api */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_) +COGL_DEPRECATED_FOR (cogl_snippet_) CoglBool cogl_is_shader (CoglHandle handle); @@ -306,7 +306,7 @@ cogl_is_shader (CoglHandle handle); * for a description of the recommended format for the shader code. * Deprecated: 1.16: Use #CoglSnippet api */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_) +COGL_DEPRECATED_FOR (cogl_snippet_) void cogl_shader_source (CoglHandle shader, const char *source); @@ -321,7 +321,7 @@ cogl_shader_source (CoglHandle shader, * compiled when it is linked. * Deprecated: 1.16: Use #CoglSnippet api */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_) +COGL_DEPRECATED_FOR (cogl_snippet_) void cogl_shader_compile (CoglHandle handle); @@ -338,7 +338,7 @@ cogl_shader_compile (CoglHandle handle); * g_free() to free it * Deprecated: 1.16: Use #CoglSnippet api */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_) +COGL_DEPRECATED_FOR (cogl_snippet_) char * cogl_shader_get_info_log (CoglHandle handle); @@ -352,7 +352,7 @@ cogl_shader_get_info_log (CoglHandle handle); * or %COGL_SHADER_TYPE_FRAGMENT if the shader is a frament processor * Deprecated: 1.16: Use #CoglSnippet api */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_) +COGL_DEPRECATED_FOR (cogl_snippet_) CoglShaderType cogl_shader_get_type (CoglHandle handle); @@ -365,7 +365,7 @@ cogl_shader_get_type (CoglHandle handle); * Return value: %TRUE if the shader object has sucessfully be compiled * Deprecated: 1.16: Use #CoglSnippet api */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_) +COGL_DEPRECATED_FOR (cogl_snippet_) CoglBool cogl_shader_is_compiled (CoglHandle handle); @@ -378,7 +378,7 @@ cogl_shader_is_compiled (CoglHandle handle); * Returns: a new cogl program. * Deprecated: 1.16: Use #CoglSnippet api */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_) +COGL_DEPRECATED_FOR (cogl_snippet_) CoglHandle cogl_create_program (void); @@ -392,7 +392,7 @@ cogl_create_program (void); * * Returns: @handle */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_) +COGL_DEPRECATED_FOR (cogl_snippet_) CoglHandle cogl_program_ref (CoglHandle handle); @@ -405,7 +405,7 @@ cogl_program_ref (CoglHandle handle); * * Deprecated: 1.0: Please use cogl_object_unref() instead. */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_) +COGL_DEPRECATED_FOR (cogl_snippet_) void cogl_program_unref (CoglHandle handle); @@ -420,7 +420,7 @@ cogl_program_unref (CoglHandle handle); * * Deprecated: 1.16: Use #CoglSnippet api */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_) +COGL_DEPRECATED_FOR (cogl_snippet_) CoglBool cogl_is_program (CoglHandle handle); @@ -436,7 +436,7 @@ cogl_is_program (CoglHandle handle); * * Deprecated: 1.16: Use #CoglSnippet api */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_) +COGL_DEPRECATED_FOR (cogl_snippet_) void cogl_program_attach_shader (CoglHandle program_handle, CoglHandle shader_handle); @@ -451,7 +451,7 @@ cogl_program_attach_shader (CoglHandle program_handle, * * Deprecated: 1.16: Use #CoglSnippet api */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_) +COGL_DEPRECATED_FOR (cogl_snippet_) void cogl_program_link (CoglHandle handle); @@ -470,7 +470,7 @@ cogl_program_link (CoglHandle handle); * * Deprecated: 1.16: Use #CoglSnippet api */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_) +COGL_DEPRECATED_FOR (cogl_snippet_) void cogl_program_use (CoglHandle handle); @@ -488,7 +488,7 @@ cogl_program_use (CoglHandle handle); * program is in use. * Deprecated: 1.16: Use #CoglSnippet api instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_) +COGL_DEPRECATED_FOR (cogl_snippet_) int cogl_program_get_uniform_location (CoglHandle handle, const char *uniform_name); @@ -506,7 +506,7 @@ cogl_program_get_uniform_location (CoglHandle handle, * Since: 1.4 * Deprecated: 1.16: Use #CoglSnippet api instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_) +COGL_DEPRECATED_FOR (cogl_snippet_) void cogl_program_set_uniform_1f (CoglHandle program, int uniform_location, @@ -525,7 +525,7 @@ cogl_program_set_uniform_1f (CoglHandle program, * Since: 1.4 * Deprecated: 1.16: Use #CoglSnippet api instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_) +COGL_DEPRECATED_FOR (cogl_snippet_) void cogl_program_set_uniform_1i (CoglHandle program, int uniform_location, @@ -548,7 +548,7 @@ cogl_program_set_uniform_1i (CoglHandle program, * Since: 1.4 * Deprecated: 1.16: Use #CoglSnippet api instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_) +COGL_DEPRECATED_FOR (cogl_snippet_) void cogl_program_set_uniform_float (CoglHandle program, int uniform_location, @@ -573,7 +573,7 @@ cogl_program_set_uniform_float (CoglHandle program, * Since: 1.4 * Deprecated: 1.16: Use #CoglSnippet api instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_) +COGL_DEPRECATED_FOR (cogl_snippet_) void cogl_program_set_uniform_int (CoglHandle program, int uniform_location, @@ -599,7 +599,7 @@ cogl_program_set_uniform_int (CoglHandle program, * Since: 1.4 * Deprecated: 1.16: Use #CoglSnippet api instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_) +COGL_DEPRECATED_FOR (cogl_snippet_) void cogl_program_set_uniform_matrix (CoglHandle program, int uniform_location, @@ -618,7 +618,7 @@ cogl_program_set_uniform_matrix (CoglHandle program, * * Deprecated: 1.16: Use #CoglSnippet api */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_) +COGL_DEPRECATED_FOR (cogl_snippet_) void cogl_program_uniform_1f (int uniform_no, float value); @@ -633,7 +633,7 @@ cogl_program_uniform_1f (int uniform_no, * * Deprecated: 1.16: Use #CoglSnippet api */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_) +COGL_DEPRECATED_FOR (cogl_snippet_) void cogl_program_uniform_1i (int uniform_no, int value); @@ -650,7 +650,7 @@ cogl_program_uniform_1i (int uniform_no, * * Deprecated: 1.16: Use #CoglSnippet api */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_) +COGL_DEPRECATED_FOR (cogl_snippet_) void cogl_program_uniform_float (int uniform_no, int size, @@ -669,7 +669,7 @@ cogl_program_uniform_float (int uniform_no, * * Deprecated: 1.16: Use #CoglSnippet api */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_) +COGL_DEPRECATED_FOR (cogl_snippet_) void cogl_program_uniform_int (int uniform_no, int size, @@ -690,7 +690,7 @@ cogl_program_uniform_int (int uniform_no, * * Deprecated: 1.16: Use #CoglSnippet api */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_) +COGL_DEPRECATED_FOR (cogl_snippet_) void cogl_program_uniform_matrix (int uniform_no, int size, diff --git a/cogl/cogl/deprecated/cogl-vertex-buffer.h b/cogl/cogl/deprecated/cogl-vertex-buffer.h index 8b780224e..955a13bc2 100644 --- a/cogl/cogl/deprecated/cogl-vertex-buffer.h +++ b/cogl/cogl/deprecated/cogl-vertex-buffer.h @@ -92,7 +92,7 @@ COGL_BEGIN_DECLS * Return value: a new #CoglHandle * Deprecated: 1.16: Use the #CoglPrimitive api instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_API) +COGL_DEPRECATED_FOR (cogl_primitive_API) CoglHandle cogl_vertex_buffer_new (unsigned int n_vertices); @@ -105,7 +105,7 @@ cogl_vertex_buffer_new (unsigned int n_vertices); * Return value: the number of vertices * Deprecated: 1.16: Use the #CoglPrimitive api instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_API) +COGL_DEPRECATED_FOR (cogl_primitive_API) unsigned int cogl_vertex_buffer_get_n_vertices (CoglHandle handle); @@ -174,7 +174,7 @@ cogl_vertex_buffer_get_n_vertices (CoglHandle handle); * * Deprecated: 1.16: Use the #CoglPrimitive api instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_API) +COGL_DEPRECATED_FOR (cogl_primitive_API) void cogl_vertex_buffer_add (CoglHandle handle, const char *attribute_name, @@ -195,7 +195,7 @@ cogl_vertex_buffer_add (CoglHandle handle, * * Deprecated: 1.16: Use the #CoglPrimitive api instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_API) +COGL_DEPRECATED_FOR (cogl_primitive_API) void cogl_vertex_buffer_delete (CoglHandle handle, const char *attribute_name); @@ -214,7 +214,7 @@ cogl_vertex_buffer_delete (CoglHandle handle, * * Deprecated: 1.16: Use the #CoglPrimitive api instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_API) +COGL_DEPRECATED_FOR (cogl_primitive_API) void cogl_vertex_buffer_submit (CoglHandle handle); @@ -234,7 +234,7 @@ cogl_vertex_buffer_submit (CoglHandle handle); * * Deprecated: 1.16: Use the #CoglPrimitive api instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_API) +COGL_DEPRECATED_FOR (cogl_primitive_API) void cogl_vertex_buffer_disable (CoglHandle handle, const char *attribute_name); @@ -254,7 +254,7 @@ cogl_vertex_buffer_disable (CoglHandle handle, * * Deprecated: 1.16: Use the #CoglPrimitive api instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_API) +COGL_DEPRECATED_FOR (cogl_primitive_API) void cogl_vertex_buffer_enable (CoglHandle handle, const char *attribute_name); @@ -275,7 +275,7 @@ cogl_vertex_buffer_enable (CoglHandle handle, * * Deprecated: 1.16: Use the #CoglPrimitive api instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_API) +COGL_DEPRECATED_FOR (cogl_primitive_API) void cogl_vertex_buffer_draw (CoglHandle handle, CoglVerticesMode mode, @@ -300,7 +300,7 @@ cogl_vertex_buffer_draw (CoglHandle handle, * * Deprecated: 1.16: Use the #CoglPrimitive api instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_API) +COGL_DEPRECATED_FOR (cogl_primitive_API) CoglHandle cogl_vertex_buffer_indices_new (CoglIndicesType indices_type, const void *indices_array, @@ -316,7 +316,7 @@ cogl_vertex_buffer_indices_new (CoglIndicesType indices_type, * * Deprecated: 1.16: Use the #CoglPrimitive api instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_API) +COGL_DEPRECATED_FOR (cogl_primitive_API) CoglIndicesType cogl_vertex_buffer_indices_get_type (CoglHandle indices); @@ -341,7 +341,7 @@ cogl_vertex_buffer_indices_get_type (CoglHandle indices); * drawing. * Deprecated: 1.16: Use the #CoglPrimitive api instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_API) +COGL_DEPRECATED_FOR (cogl_primitive_API) void cogl_vertex_buffer_draw_elements (CoglHandle handle, CoglVerticesMode mode, @@ -410,7 +410,7 @@ cogl_vertex_buffer_unref (CoglHandle handle); * * Deprecated: 1.16: Use the #CoglPrimitive api instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_API) +COGL_DEPRECATED_FOR (cogl_primitive_API) CoglHandle cogl_vertex_buffer_indices_get_for_quads (unsigned int n_indices); @@ -426,7 +426,7 @@ cogl_vertex_buffer_indices_get_for_quads (unsigned int n_indices); * Since: 1.0 * Deprecated: 1.16: Use the #CoglPrimitive api instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_API) +COGL_DEPRECATED_FOR (cogl_primitive_API) CoglBool cogl_is_vertex_buffer (CoglHandle handle); @@ -443,7 +443,7 @@ cogl_is_vertex_buffer (CoglHandle handle); * Since: 1.4 * Deprecated: 1.16: Use the #CoglPrimitive api instead */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_API) +COGL_DEPRECATED_FOR (cogl_primitive_API) CoglBool cogl_is_vertex_buffer_indices (CoglHandle handle); COGL_END_DECLS diff --git a/cogl/configure.ac b/cogl/configure.ac index e38fde9a7..99fcc5737 100644 --- a/cogl/configure.ac +++ b/cogl/configure.ac @@ -1,81 +1,6 @@ AC_PREREQ(2.59) -dnl ================================================================ -dnl XXX: If you are making a release then you need to check these -dnl sections: -dnl » API versions (Only the 1.x version needs to change) -dnl (the pretty numbers that the users see) -dnl -dnl » Interface version details for libtool -dnl (the shared library versioning information) -dnl -dnl » Source code release status -dnl (mark the source code as being part of a "release" or from "git") -dnl ================================================================ - -dnl ================================================================ -dnl API versions (i.e. the pretty numbers that users see) -dnl ================================================================ -m4_define([cogl_major_version], [2]) -m4_define([cogl_minor_version], [0]) -m4_define([cogl_micro_version], [0]) -m4_define([cogl_version], - [cogl_major_version.cogl_minor_version.cogl_micro_version]) - -dnl Since the core Cogl library has to also maintain support for the -dnl Cogl 1.x API for Clutter then we track the 1.x version separately. -m4_define([cogl_1_minor_version], [22]) -m4_define([cogl_1_micro_version], [1]) -m4_define([cogl_1_version], [1.cogl_1_minor_version.cogl_1_micro_version]) - -dnl ================================================================ -dnl Interface version details for libtool -dnl ================================================================ -# Note: we don't automatically deduce the libtool version info from -# the pretty version number that users sees. This is because we want -# to update the pretty version number before making a release since it -# can affect the name of our pkg-config file and the naming or -# location of other installed files which we want to be able to verify -# as correct well before making a release. -# -# For reference on how the various numbers should be updated at -# release time these rules are adapted from the libtool info pages: -# -# 1. Update the version information only immediately before a public -# release. -# -# 2. If the library source code has changed at all since the last -# update, then increment REVISION (`C:R:A' becomes `C:r+1:A'). -# -# 3. If any interfaces have been added, removed, or changed since the -# last update, increment CURRENT, and set REVISION to 0. -# -# 4. If any interfaces have been added since the last public release, -# then increment AGE. -# -# 5. If any interfaces have been removed since the last public release, -# then set AGE to 0. -m4_define([cogl_lt_current], 24) -m4_define([cogl_lt_revision], 1) -m4_define([cogl_lt_age], 4) -# We do also tell libtool the pretty version: -m4_define([cogl_lt_release], [cogl_version]) - - -dnl ================================================================ -dnl Source code release status -dnl ================================================================ -# Finally we explicitly track when we are building development source -# from Git vs building source corresponding to a release. As with the -# libtool version info we don't automatically derive this from the -# pretty version number because we want to test the results of -# updating the version number in advance of a release. -# -# Possible status values are: git, snapshot or release -# -m4_define([cogl_release_status], [git]) - -AC_INIT(cogl, [cogl_1_version]) +AC_INIT(cogl, [0.1]) AC_CONFIG_SRCDIR(cogl/cogl.h) AC_CONFIG_AUX_DIR([build]) AC_CONFIG_MACRO_DIR([build/autotools]) @@ -128,35 +53,6 @@ AM_SILENT_RULES([yes]) AH_BOTTOM([#include "config-custom.h"]) -dnl ================================================================ -dnl Export the API versioning -dnl ================================================================ -AC_SUBST([COGL_MAJOR_VERSION],[cogl_major_version]) -AC_SUBST([COGL_MINOR_VERSION],[cogl_minor_version]) -AC_SUBST([COGL_MICRO_VERSION],[cogl_micro_version]) -AC_SUBST([COGL_VERSION],[cogl_version]) -AC_SUBST([COGL_API_VERSION],[cogl_major_version.0]) -AC_SUBST([COGL_API_VERSION_AM],[$COGL_MAJOR_VERSION\_0]) - -AC_SUBST([COGL_1_MINOR_VERSION],[cogl_1_minor_version]) -AC_SUBST([COGL_1_MICRO_VERSION],[cogl_1_micro_version]) -AC_SUBST([COGL_1_VERSION],[cogl_1_version]) - - -dnl ================================================================ -dnl Export the libtool versioning -dnl ================================================================ -AC_SUBST([COGL_LT_CURRENT], [cogl_lt_current]) -AC_SUBST([COGL_LT_REVISION], [cogl_lt_revision]) -AC_SUBST([COGL_LT_AGE], [cogl_lt_age]) -AC_SUBST([COGL_LT_RELEASE], [cogl_lt_release]) - - -dnl ================================================================ -dnl Export the source code release status -dnl ================================================================ -AC_SUBST([COGL_RELEASE_STATUS], [cogl_release_status]) - dnl ================================================================ dnl Compiler stuff. dnl ================================================================ diff --git a/cogl/tests/conform/test-conform-main.c b/cogl/tests/conform/test-conform-main.c index a21d912bf..526d41056 100644 --- a/cogl/tests/conform/test-conform-main.c +++ b/cogl/tests/conform/test-conform-main.c @@ -119,8 +119,6 @@ main (int argc, char **argv) TEST_REQUIREMENT_GLSL, 0); - ADD_TEST (test_version, 0, 0); - ADD_TEST (test_alpha_test, 0, 0); ADD_TEST (test_map_buffer_range, TEST_REQUIREMENT_MAP_WRITE, 0); diff --git a/cogl/tests/conform/test-version.c b/cogl/tests/conform/test-version.c index c316de203..54398b472 100644 --- a/cogl/tests/conform/test-version.c +++ b/cogl/tests/conform/test-version.c @@ -12,13 +12,6 @@ #include #undef __COGL_H_INSIDE__ -_COGL_STATIC_ASSERT (COGL_VERSION_ENCODE (COGL_VERSION_MAJOR, - COGL_VERSION_MINOR, - COGL_VERSION_MICRO) == - COGL_VERSION, - "The pre-encoded Cogl version does not match the version " - "encoding macro"); - _COGL_STATIC_ASSERT (COGL_VERSION_GET_MAJOR (COGL_VERSION_ENCODE (100, 200, 300)) == @@ -37,45 +30,3 @@ _COGL_STATIC_ASSERT (COGL_VERSION_GET_MICRO (COGL_VERSION_ENCODE (100, 300, "Getting the micro component out of a encoded version " "does not work"); - -_COGL_STATIC_ASSERT (COGL_VERSION_CHECK (COGL_VERSION_MAJOR, - COGL_VERSION_MINOR, - COGL_VERSION_MICRO), - "Checking the Cogl version against the current version " - "does not pass"); -_COGL_STATIC_ASSERT (!COGL_VERSION_CHECK (COGL_VERSION_MAJOR, - COGL_VERSION_MINOR, - COGL_VERSION_MICRO + 1), - "Checking the Cogl version against a later micro version " - "should not pass"); -_COGL_STATIC_ASSERT (!COGL_VERSION_CHECK (COGL_VERSION_MAJOR, - COGL_VERSION_MINOR + 1, - COGL_VERSION_MICRO), - "Checking the Cogl version against a later minor version " - "should not pass"); -_COGL_STATIC_ASSERT (!COGL_VERSION_CHECK (COGL_VERSION_MAJOR + 1, - COGL_VERSION_MINOR, - COGL_VERSION_MICRO), - "Checking the Cogl version against a later major version " - "should not pass"); - -_COGL_STATIC_ASSERT (COGL_VERSION_CHECK (COGL_VERSION_MAJOR - 1, - COGL_VERSION_MINOR, - COGL_VERSION_MICRO), - "Checking the Cogl version against a older major version " - "should pass"); - -void -test_version (void) -{ - const char *version = g_strdup_printf ("version = %i.%i.%i", - COGL_VERSION_MAJOR, - COGL_VERSION_MINOR, - COGL_VERSION_MICRO); - - g_assert_cmpstr (version, ==, "version = " COGL_VERSION_STRING); - - if (cogl_test_verbose ()) - g_print ("OK\n"); -} -