[cogl/cogl-1.16] Fix the placement of deprecation macros
- From: Robert Bragg <rbragg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/cogl-1.16] Fix the placement of deprecation macros
- Date: Tue, 20 Aug 2013 00:20:56 +0000 (UTC)
commit aa878ddca6a0c1ef99367b5dcae00ce51b4e4b2b
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Wed Jul 24 17:44:56 2013 +0800
Fix the placement of deprecation macros
The deprecation macros, which expand to __declspec (deprecated) on Visual
Studio, is expected to be before the return type of the function which
is annotated by them, and having the deprecation macros there is also
accepted by GCC as well.
This will fix the builds of all applications/libraries using Cogl under
Visual Studio,
Reviewed-by: Robert Bragg <robert linux intel com>
cogl-pango/cogl-pango.h | 12 +-
cogl-path/cogl1-path-functions.h | 8 +-
cogl-path/cogl2-path-functions.h | 12 +-
cogl/cogl-clutter.h | 8 +-
cogl/cogl-color.h | 8 +-
cogl/cogl-material-compat.h | 214 +++++++++++++++++++-------------------
cogl/cogl-matrix.h | 4 +-
cogl/cogl-offscreen.h | 6 +-
cogl/cogl-onscreen.h | 9 +-
cogl/cogl-shader.h | 109 ++++++++++----------
cogl/cogl-texture.h | 9 +-
cogl/cogl-version.h | 8 +-
cogl/cogl-vertex-buffer.h | 65 ++++++------
cogl/cogl-xlib.h | 12 +-
cogl/cogl1-context.h | 195 +++++++++++++++++++---------------
15 files changed, 354 insertions(+), 325 deletions(-)
---
diff --git a/cogl-pango/cogl-pango.h b/cogl-pango/cogl-pango.h
index 66f0bb5..c4959bc 100644
--- a/cogl-pango/cogl-pango.h
+++ b/cogl-pango/cogl-pango.h
@@ -224,13 +224,13 @@ 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)
void
cogl_pango_render_layout_subpixel (PangoLayout *layout,
int x,
int y,
const CoglColor *color,
- int flags)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_pango_show_layout);
+ int flags);
/**
* cogl_pango_render_layout:
@@ -247,13 +247,13 @@ 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)
void
cogl_pango_render_layout (PangoLayout *layout,
int x,
int y,
const CoglColor *color,
- int flags)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_pango_show_layout);
+ int flags);
/**
* cogl_pango_render_layout_line:
@@ -267,12 +267,12 @@ 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)
void
cogl_pango_render_layout_line (PangoLayoutLine *line,
int x,
int y,
- const CoglColor *color)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_pango_show_layout_line);
+ const CoglColor *color);
COGL_END_DECLS
diff --git a/cogl-path/cogl1-path-functions.h b/cogl-path/cogl1-path-functions.h
index e3ea865..ca0c670 100644
--- a/cogl-path/cogl1-path-functions.h
+++ b/cogl-path/cogl1-path-functions.h
@@ -435,9 +435,9 @@ cogl_path_copy (CoglPath *path);
* Since: 1.0
* Deprecated: 1.16: Use cogl_framebuffer_push_path_clip() instead
*/
+COGL_DEPRECATED_IN_1_16_FOR (cogl_framebuffer_push_path_clip)
void
-cogl_clip_push_from_path_preserve (void)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_framebuffer_push_path_clip);
+cogl_clip_push_from_path_preserve (void);
/**
* cogl_clip_push_from_path:
@@ -450,9 +450,9 @@ cogl_clip_push_from_path_preserve (void)
* Since: 1.0
* Deprecated: 1.16: Use cogl_framebuffer_push_path_clip() instead
*/
+COGL_DEPRECATED_IN_1_16_FOR (cogl_framebuffer_push_path_clip)
void
-cogl_clip_push_from_path (void)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_framebuffer_push_path_clip);
+cogl_clip_push_from_path (void);
COGL_END_DECLS
diff --git a/cogl-path/cogl2-path-functions.h b/cogl-path/cogl2-path-functions.h
index 9632ecd..e2b01c8 100644
--- a/cogl-path/cogl2-path-functions.h
+++ b/cogl-path/cogl2-path-functions.h
@@ -444,11 +444,11 @@ cogl_path_fill (CoglPath *path);
* Stability: unstable
* Deprecated: 1.16: Use cogl_path_fill() instead
*/
+COGL_DEPRECATED_IN_1_16_FOR (cogl_path_fill)
void
cogl_framebuffer_fill_path (CoglFramebuffer *framebuffer,
CoglPipeline *pipeline,
- CoglPath *path)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_path_fill);
+ CoglPath *path);
#define cogl_path_stroke cogl2_path_stroke
/**
@@ -476,11 +476,11 @@ cogl_path_stroke (CoglPath *path);
* Stability: unstable
* Deprecated: 1.16: Use cogl_path_stroke() instead
*/
+COGL_DEPRECATED_IN_1_16_FOR (cogl_path_stroke)
void
cogl_framebuffer_stroke_path (CoglFramebuffer *framebuffer,
CoglPipeline *pipeline,
- CoglPath *path)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_path_stroke);
+ CoglPath *path);
/**
* cogl_framebuffer_push_path_clip:
@@ -513,9 +513,9 @@ 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)
void
-cogl_clip_push_from_path (CoglPath *path)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_framebuffer_push_path_clip);
+cogl_clip_push_from_path (CoglPath *path);
COGL_END_DECLS
diff --git a/cogl/cogl-clutter.h b/cogl/cogl-clutter.h
index fac25d9..22b84f3 100644
--- a/cogl/cogl-clutter.h
+++ b/cogl/cogl-clutter.h
@@ -31,14 +31,14 @@
COGL_BEGIN_DECLS
#define cogl_clutter_check_extension cogl_clutter_check_extension_CLUTTER
+COGL_DEPRECATED_IN_1_16
CoglBool
-cogl_clutter_check_extension (const char *name, const char *ext)
- COGL_DEPRECATED_IN_1_16;
+cogl_clutter_check_extension (const char *name, const char *ext);
#define cogl_clutter_winsys_has_feature cogl_clutter_winsys_has_feature_CLUTTER
+COGL_DEPRECATED_FOR (cogl_has_feature)
CoglBool
-cogl_clutter_winsys_has_feature (CoglWinsysFeature feature)
- COGL_DEPRECATED_FOR (cogl_has_feature);
+cogl_clutter_winsys_has_feature (CoglWinsysFeature feature);
#define cogl_onscreen_clutter_backend_set_size cogl_onscreen_clutter_backend_set_size_CLUTTER
void
diff --git a/cogl/cogl-color.h b/cogl/cogl-color.h
index 713f567..c271ec7 100644
--- a/cogl/cogl-color.h
+++ b/cogl/cogl-color.h
@@ -113,13 +113,13 @@ 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)
void
cogl_color_set_from_4ub (CoglColor *color,
uint8_t red,
uint8_t green,
uint8_t blue,
- uint8_t alpha)
- COGL_DEPRECATED_IN_1_4_FOR (cogl_color_init_from_4ub);
+ uint8_t alpha);
/**
* cogl_color_init_from_4f:
@@ -153,13 +153,13 @@ 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)
void
cogl_color_set_from_4f (CoglColor *color,
float red,
float green,
float blue,
- float alpha)
- COGL_DEPRECATED_IN_1_4_FOR (cogl_color_init_from_4f);
+ float alpha);
/**
* cogl_color_init_from_4fv:
diff --git a/cogl/cogl-material-compat.h b/cogl/cogl-material-compat.h
index 99d3b37..8d2551c 100644
--- a/cogl/cogl-material-compat.h
+++ b/cogl/cogl-material-compat.h
@@ -137,8 +137,9 @@ 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)
CoglMaterial *
-cogl_material_new (void) COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_new);
+cogl_material_new (void);
/**
* cogl_material_copy:
@@ -158,9 +159,9 @@ cogl_material_new (void) COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_new);
* Since: 1.2
* Deprecated: 1.16: Use cogl_pipeline_copy() instead
*/
+COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_copy)
CoglMaterial *
-cogl_material_copy (CoglMaterial *source)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_copy);
+cogl_material_copy (CoglMaterial *source);
/**
* cogl_material_ref:
@@ -174,8 +175,9 @@ cogl_material_copy (CoglMaterial *source)
*
* Deprecated: 1.2: Use cogl_object_ref() instead
*/
+COGL_DEPRECATED
CoglHandle
-cogl_material_ref (CoglHandle material) COGL_DEPRECATED;
+cogl_material_ref (CoglHandle material);
/**
* cogl_material_unref:
@@ -187,8 +189,9 @@ cogl_material_ref (CoglHandle material) COGL_DEPRECATED;
*
* Deprecated: 1.2: Use cogl_object_unref() instead
*/
+COGL_DEPRECATED
void
-cogl_material_unref (CoglHandle material) COGL_DEPRECATED;
+cogl_material_unref (CoglHandle material);
/**
* cogl_is_material:
@@ -200,9 +203,9 @@ cogl_material_unref (CoglHandle material) COGL_DEPRECATED;
* %FALSE otherwise
* Deprecated: 1.16: Use cogl_is_pipeline() instead
*/
+COGL_DEPRECATED_IN_1_16_FOR (cogl_is_pipeline)
CoglBool
-cogl_is_material (CoglHandle handle)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_is_pipeline);
+cogl_is_material (CoglHandle handle);
/**
* cogl_material_set_color:
@@ -221,10 +224,10 @@ 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)
void
cogl_material_set_color (CoglMaterial *material,
- const CoglColor *color)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_set_color);
+ const CoglColor *color);
/**
* cogl_material_set_color4ub:
@@ -241,13 +244,13 @@ 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)
void
cogl_material_set_color4ub (CoglMaterial *material,
uint8_t red,
uint8_t green,
uint8_t blue,
- uint8_t alpha)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_set_color4ub);
+ uint8_t alpha);
/**
* cogl_material_set_color4f:
@@ -264,13 +267,13 @@ 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)
void
cogl_material_set_color4f (CoglMaterial *material,
float red,
float green,
float blue,
- float alpha)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_set_color4f);
+ float alpha);
/**
* cogl_material_get_color:
@@ -282,10 +285,10 @@ 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)
void
cogl_material_get_color (CoglMaterial *material,
- CoglColor *color)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_get_color);
+ CoglColor *color);
/**
* cogl_material_set_ambient:
@@ -304,10 +307,10 @@ 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_)
void
cogl_material_set_ambient (CoglMaterial *material,
- const CoglColor *ambient)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_);
+ const CoglColor *ambient);
/**
* cogl_material_get_ambient:
@@ -319,10 +322,10 @@ 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_)
void
cogl_material_get_ambient (CoglMaterial *material,
- CoglColor *ambient)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_);
+ CoglColor *ambient);
/**
* cogl_material_set_diffuse:
@@ -338,10 +341,10 @@ 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_)
void
cogl_material_set_diffuse (CoglMaterial *material,
- const CoglColor *diffuse)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_);
+ const CoglColor *diffuse);
/**
* cogl_material_get_diffuse:
@@ -353,10 +356,10 @@ 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_)
void
cogl_material_get_diffuse (CoglMaterial *material,
- CoglColor *diffuse)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_);
+ CoglColor *diffuse);
/**
* cogl_material_set_ambient_and_diffuse:
@@ -373,10 +376,10 @@ 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_)
void
cogl_material_set_ambient_and_diffuse (CoglMaterial *material,
- const CoglColor *color)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_);
+ const CoglColor *color);
/**
* cogl_material_set_specular:
@@ -392,10 +395,10 @@ 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_)
void
cogl_material_set_specular (CoglMaterial *material,
- const CoglColor *specular)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_);
+ const CoglColor *specular);
/**
* cogl_material_get_specular:
@@ -407,10 +410,10 @@ 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_)
void
cogl_material_get_specular (CoglMaterial *material,
- CoglColor *specular)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_);
+ CoglColor *specular);
/**
* cogl_material_set_shininess:
@@ -427,10 +430,10 @@ 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_)
void
cogl_material_set_shininess (CoglMaterial *material,
- float shininess)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_);
+ float shininess);
/**
* cogl_material_get_shininess:
@@ -443,9 +446,9 @@ 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_)
float
-cogl_material_get_shininess (CoglMaterial *material)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_);
+cogl_material_get_shininess (CoglMaterial *material);
/**
* cogl_material_set_emission:
@@ -461,10 +464,10 @@ 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_)
void
cogl_material_set_emission (CoglMaterial *material,
- const CoglColor *emission)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_);
+ const CoglColor *emission);
/**
* cogl_material_get_emission:
@@ -476,10 +479,10 @@ 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_)
void
cogl_material_get_emission (CoglMaterial *material,
- CoglColor *emission)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_);
+ CoglColor *emission);
/**
* CoglMaterialAlphaFunc:
@@ -532,11 +535,11 @@ 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)
void
cogl_material_set_alpha_test_function (CoglMaterial *material,
CoglMaterialAlphaFunc alpha_func,
- float alpha_reference)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_set_alpha_test_function);
+ float alpha_reference);
/**
* cogl_material_set_blend:
@@ -623,11 +626,11 @@ 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)
CoglBool
cogl_material_set_blend (CoglMaterial *material,
const char *blend_string,
- CoglError **error)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_set_blend);
+ CoglError **error);
/**
* cogl_material_set_blend_constant:
@@ -640,10 +643,10 @@ 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)
void
cogl_material_set_blend_constant (CoglMaterial *material,
- const CoglColor *constant_color)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_set_blend_constant);
+ const CoglColor *constant_color);
/**
* cogl_material_set_point_size:
@@ -661,10 +664,10 @@ 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)
void
cogl_material_set_point_size (CoglMaterial *material,
- float point_size)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_set_point_size);
+ float point_size);
/**
* cogl_material_get_point_size:
@@ -678,9 +681,9 @@ 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)
float
-cogl_material_get_point_size (CoglMaterial *material)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_get_point_size);
+cogl_material_get_point_size (CoglMaterial *material);
/**
* cogl_material_get_user_program:
@@ -695,9 +698,9 @@ 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_)
CoglHandle
-cogl_material_get_user_program (CoglMaterial *material)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_);
+cogl_material_get_user_program (CoglMaterial *material);
/**
* cogl_material_set_user_program:
@@ -746,10 +749,10 @@ 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_)
void
cogl_material_set_user_program (CoglMaterial *material,
- CoglHandle program)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_);
+ CoglHandle program);
/**
* cogl_material_set_layer:
@@ -771,11 +774,11 @@ 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)
void
cogl_material_set_layer (CoglMaterial *material,
int layer_index,
- CoglHandle texture)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_set_layer);
+ CoglHandle texture);
/**
* cogl_material_remove_layer:
@@ -785,10 +788,10 @@ 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)
void
cogl_material_remove_layer (CoglMaterial *material,
- int layer_index)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_remove_layer);
+ int layer_index);
/**
@@ -884,12 +887,12 @@ 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)
CoglBool
cogl_material_set_layer_combine (CoglMaterial *material,
int layer_index,
const char *blend_string,
- CoglError **error)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_set_layer_combine);
+ CoglError **error);
/**
* cogl_material_set_layer_combine_constant:
@@ -905,11 +908,11 @@ 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)
void
cogl_material_set_layer_combine_constant (CoglMaterial *material,
int layer_index,
- const CoglColor *constant)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_set_layer_combine_constant);
+ const CoglColor *constant);
/**
* cogl_material_set_layer_matrix:
@@ -921,11 +924,11 @@ 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)
void
cogl_material_set_layer_matrix (CoglMaterial *material,
int layer_index,
- const CoglMatrix *matrix)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_set_layer_matrix);
+ const CoglMatrix *matrix);
/**
* cogl_material_get_layers:
@@ -949,9 +952,9 @@ 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)
const GList *
-cogl_material_get_layers (CoglMaterial *material)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_get_layers);
+cogl_material_get_layers (CoglMaterial *material);
/**
* cogl_material_get_n_layers:
@@ -964,9 +967,9 @@ 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)
int
-cogl_material_get_n_layers (CoglMaterial *material)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_get_n_layers);
+cogl_material_get_n_layers (CoglMaterial *material);
/**
* CoglMaterialLayerType:
@@ -997,9 +1000,9 @@ typedef enum {
* Return value: the type of the layer
* Deprecated: 1.16: No replacement
*/
+COGL_DEPRECATED_IN_1_16
CoglMaterialLayerType
-cogl_material_layer_get_type (CoglMaterialLayer *layer)
- COGL_DEPRECATED_IN_1_16;
+cogl_material_layer_get_type (CoglMaterialLayer *layer);
/**
* cogl_material_layer_get_texture:
@@ -1016,9 +1019,9 @@ 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
CoglHandle
-cogl_material_layer_get_texture (CoglMaterialLayer *layer)
- COGL_DEPRECATED_IN_1_16;
+cogl_material_layer_get_texture (CoglMaterialLayer *layer);
/**
* cogl_material_layer_get_min_filter:
@@ -1029,9 +1032,9 @@ cogl_material_layer_get_texture (CoglMaterialLayer *layer)
* Return value: the current downscaling filter
* Deprecated: 1.16: No replacement
*/
+COGL_DEPRECATED_IN_1_16
CoglMaterialFilter
-cogl_material_layer_get_min_filter (CoglMaterialLayer *layer)
- COGL_DEPRECATED_IN_1_16;
+cogl_material_layer_get_min_filter (CoglMaterialLayer *layer);
/**
* cogl_material_layer_get_mag_filter:
@@ -1042,9 +1045,9 @@ cogl_material_layer_get_min_filter (CoglMaterialLayer *layer)
* Return value: the current downscaling filter
* Deprecated: 1.16: No replacement
*/
+COGL_DEPRECATED_IN_1_16
CoglMaterialFilter
-cogl_material_layer_get_mag_filter (CoglMaterialLayer *layer)
- COGL_DEPRECATED_IN_1_16;
+cogl_material_layer_get_mag_filter (CoglMaterialLayer *layer);
/**
* cogl_material_set_layer_filters:
@@ -1057,12 +1060,12 @@ 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)
void
cogl_material_set_layer_filters (CoglMaterial *material,
int layer_index,
CoglMaterialFilter min_filter,
- CoglMaterialFilter mag_filter)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_set_layer_filters);
+ CoglMaterialFilter mag_filter);
/**
* cogl_material_set_layer_point_sprite_coords_enabled:
@@ -1087,12 +1090,12 @@ 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)
CoglBool
cogl_material_set_layer_point_sprite_coords_enabled (CoglMaterial *material,
int layer_index,
CoglBool enable,
- CoglError **error)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_set_layer_point_sprite_coords_enabled);
+ CoglError **error);
/**
* cogl_material_get_layer_point_sprite_coords_enabled:
@@ -1109,10 +1112,10 @@ 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)
CoglBool
cogl_material_get_layer_point_sprite_coords_enabled (CoglMaterial *material,
- int layer_index)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_get_layer_point_sprite_coords_enabled);
+ int layer_index);
/**
* cogl_material_get_layer_wrap_mode_s:
@@ -1128,10 +1131,10 @@ 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)
CoglMaterialWrapMode
cogl_material_get_layer_wrap_mode_s (CoglMaterial *material,
- int layer_index)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_get_layer_wrap_mode_s);
+ int layer_index);
/**
* cogl_material_set_layer_wrap_mode_s:
@@ -1144,11 +1147,11 @@ 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)
void
cogl_material_set_layer_wrap_mode_s (CoglMaterial *material,
int layer_index,
- CoglMaterialWrapMode mode)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_set_layer_wrap_mode_s);
+ CoglMaterialWrapMode mode);
/**
* cogl_material_get_layer_wrap_mode_t:
@@ -1164,10 +1167,10 @@ 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)
CoglMaterialWrapMode
cogl_material_get_layer_wrap_mode_t (CoglMaterial *material,
- int layer_index)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_get_layer_wrap_mode_t);
+ int layer_index);
/**
@@ -1181,11 +1184,11 @@ 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)
void
cogl_material_set_layer_wrap_mode_t (CoglMaterial *material,
int layer_index,
- CoglMaterialWrapMode mode)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_set_layer_wrap_mode_t);
+ CoglMaterialWrapMode mode);
/**
* cogl_material_get_layer_wrap_mode_p:
@@ -1201,10 +1204,10 @@ 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)
CoglMaterialWrapMode
cogl_material_get_layer_wrap_mode_p (CoglMaterial *material,
- int layer_index)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_get_layer_wrap_mode_p);
+ int layer_index);
/**
* cogl_material_set_layer_wrap_mode_p:
@@ -1218,11 +1221,11 @@ 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)
void
cogl_material_set_layer_wrap_mode_p (CoglMaterial *material,
int layer_index,
- CoglMaterialWrapMode mode)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_set_layer_wrap_mode_p);
+ CoglMaterialWrapMode mode);
/**
* cogl_material_set_layer_wrap_mode:
@@ -1239,11 +1242,11 @@ 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)
void
cogl_material_set_layer_wrap_mode (CoglMaterial *material,
int layer_index,
- CoglMaterialWrapMode mode)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_set_layer_wrap_mode);
+ CoglMaterialWrapMode mode);
/**
* cogl_material_layer_get_wrap_mode_s:
@@ -1256,9 +1259,9 @@ 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)
CoglMaterialWrapMode
-cogl_material_layer_get_wrap_mode_s (CoglMaterialLayer *layer)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_layer_get_wrap_mode_s);
+cogl_material_layer_get_wrap_mode_s (CoglMaterialLayer *layer);
/**
* cogl_material_layer_get_wrap_mode_t:
@@ -1271,9 +1274,10 @@ cogl_material_layer_get_wrap_mode_s (CoglMaterialLayer *layer)
* Since: 1.4
* 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)
CoglMaterialWrapMode
-cogl_material_layer_get_wrap_mode_t (CoglMaterialLayer *layer)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_layer_get_wrap_mode_t);
+cogl_material_layer_get_wrap_mode_t (CoglMaterialLayer *layer);
/**
* cogl_material_layer_get_wrap_mode_p:
@@ -1287,9 +1291,9 @@ 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)
CoglMaterialWrapMode
-cogl_material_layer_get_wrap_mode_p (CoglMaterialLayer *layer)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_layer_get_wrap_mode_p);
+cogl_material_layer_get_wrap_mode_p (CoglMaterialLayer *layer);
#ifdef COGL_ENABLE_EXPERIMENTAL_API
@@ -1314,11 +1318,11 @@ 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)
CoglBool
cogl_material_set_depth_state (CoglMaterial *material,
const CoglDepthState *state,
- CoglError **error)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_set_depth_state);
+ CoglError **error);
/**
* cogl_material_get_depth_state:
@@ -1332,10 +1336,10 @@ 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)
void
cogl_material_get_depth_state (CoglMaterial *material,
- CoglDepthState *state_out)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_get_depth_state);
+ CoglDepthState *state_out);
/**
* CoglMaterialLayerCallback:
@@ -1367,11 +1371,11 @@ typedef CoglBool (*CoglMaterialLayerCallback) (CoglMaterial *material,
* Stability: Unstable
* Deprecated: 1.16: No replacement
*/
+COGL_DEPRECATED_IN_1_16
void
cogl_material_foreach_layer (CoglMaterial *material,
CoglMaterialLayerCallback callback,
- void *user_data)
- COGL_DEPRECATED_IN_1_16;
+ void *user_data);
#endif /* COGL_ENABLE_EXPERIMENTAL_API */
diff --git a/cogl/cogl-matrix.h b/cogl/cogl-matrix.h
index 09fb009..0270618 100644
--- a/cogl/cogl-matrix.h
+++ b/cogl/cogl-matrix.h
@@ -404,6 +404,7 @@ cogl_matrix_orthographic (CoglMatrix *matrix,
*
* Deprecated: 1.10: Use cogl_matrix_orthographic()
*/
+COGL_DEPRECATED_IN_1_10_FOR (cogl_matrix_orthographic)
void
cogl_matrix_ortho (CoglMatrix *matrix,
float left,
@@ -411,8 +412,7 @@ cogl_matrix_ortho (CoglMatrix *matrix,
float bottom,
float top,
float near,
- float far)
- COGL_DEPRECATED_IN_1_10_FOR (cogl_matrix_orthographic);
+ float far);
#ifdef COGL_ENABLE_EXPERIMENTAL_API
/**
diff --git a/cogl/cogl-offscreen.h b/cogl/cogl-offscreen.h
index 4449ad6..bfbe3c8 100644
--- a/cogl/cogl-offscreen.h
+++ b/cogl/cogl-offscreen.h
@@ -130,8 +130,9 @@ cogl_is_offscreen (void *object);
*
* Deprecated: 1.2: cogl_object_ref() should be used in new code.
*/
+COGL_DEPRECATED_FOR (cogl_object_ref)
void *
-cogl_offscreen_ref (void *offscreen) COGL_DEPRECATED_FOR (cogl_object_ref);
+cogl_offscreen_ref (void *offscreen);
/**
* cogl_offscreen_unref:
@@ -142,8 +143,9 @@ cogl_offscreen_ref (void *offscreen) COGL_DEPRECATED_FOR (cogl_object_ref);
*
* Deprecated: 1.2: cogl_object_unref() should be used in new code.
*/
+COGL_DEPRECATED_FOR (cogl_object_unref)
void
-cogl_offscreen_unref (void *offscreen) COGL_DEPRECATED_FOR (cogl_object_unref);
+cogl_offscreen_unref (void *offscreen);
COGL_END_DECLS
diff --git a/cogl/cogl-onscreen.h b/cogl/cogl-onscreen.h
index 168d60c..0221829 100644
--- a/cogl/cogl-onscreen.h
+++ b/cogl/cogl-onscreen.h
@@ -637,11 +637,11 @@ 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)
unsigned int
cogl_onscreen_add_swap_buffers_callback (CoglOnscreen *onscreen,
CoglSwapBuffersNotify callback,
- void *user_data)
- COGL_DEPRECATED_IN_1_14_FOR (cogl_onscreen_add_frame_callback);
+ void *user_data);
/**
* cogl_onscreen_remove_swap_buffers_callback:
@@ -655,10 +655,11 @@ cogl_onscreen_add_swap_buffers_callback (CoglOnscreen *onscreen,
* Stability: unstable
* Deprecated: 1.14: Use cogl_onscreen_remove_frame_callback() instead
*/
+
+COGL_DEPRECATED_IN_1_14_FOR (cogl_onscreen_remove_frame_callback)
void
cogl_onscreen_remove_swap_buffers_callback (CoglOnscreen *onscreen,
- unsigned int id)
- COGL_DEPRECATED_IN_1_14_FOR (cogl_onscreen_remove_frame_callback);
+ unsigned int id);
/**
* cogl_onscreen_set_resizable:
diff --git a/cogl/cogl-shader.h b/cogl/cogl-shader.h
index d49f697..e77ac74 100644
--- a/cogl/cogl-shader.h
+++ b/cogl/cogl-shader.h
@@ -242,9 +242,9 @@ typedef enum {
* Returns: a new shader handle.
* Deprecated: 1.16: Use #CoglSnippet api
*/
+COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_)
CoglHandle
-cogl_create_shader (CoglShaderType shader_type)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_);
+cogl_create_shader (CoglShaderType shader_type);
/**
* cogl_shader_ref:
@@ -255,9 +255,9 @@ cogl_create_shader (CoglShaderType shader_type)
* Returns: @handle
* Deprecated: 1.16: Use #CoglSnippet api
*/
+COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_)
CoglHandle
-cogl_shader_ref (CoglHandle handle)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_);
+cogl_shader_ref (CoglHandle handle);
/**
* cogl_shader_unref:
@@ -268,9 +268,9 @@ cogl_shader_ref (CoglHandle handle)
*
* Deprecated: 1.16: Use #CoglSnippet api
*/
+COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_)
void
-cogl_shader_unref (CoglHandle handle)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_);
+cogl_shader_unref (CoglHandle handle);
/**
* cogl_is_shader:
@@ -282,9 +282,9 @@ cogl_shader_unref (CoglHandle handle)
* %FALSE otherwise
* Deprecated: 1.16: Use #CoglSnippet api
*/
+COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_)
CoglBool
-cogl_is_shader (CoglHandle handle)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_);
+cogl_is_shader (CoglHandle handle);
/**
* cogl_shader_source:
@@ -299,10 +299,10 @@ 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_)
void
cogl_shader_source (CoglHandle shader,
- const char *source)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_);
+ const char *source);
/**
* cogl_shader_compile:
@@ -314,9 +314,9 @@ cogl_shader_source (CoglHandle shader,
* compiled when it is linked.
* Deprecated: 1.16: Use #CoglSnippet api
*/
+COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_)
void
-cogl_shader_compile (CoglHandle handle)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_);
+cogl_shader_compile (CoglHandle handle);
/**
* cogl_shader_get_info_log:
@@ -331,9 +331,9 @@ cogl_shader_compile (CoglHandle handle)
* g_free() to free it
* Deprecated: 1.16: Use #CoglSnippet api
*/
+COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_)
char *
-cogl_shader_get_info_log (CoglHandle handle)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_);
+cogl_shader_get_info_log (CoglHandle handle);
/**
* cogl_shader_get_type:
@@ -345,9 +345,9 @@ 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_)
CoglShaderType
-cogl_shader_get_type (CoglHandle handle)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_);
+cogl_shader_get_type (CoglHandle handle);
/**
* cogl_shader_is_compiled:
@@ -358,9 +358,9 @@ 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_)
CoglBool
-cogl_shader_is_compiled (CoglHandle handle)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_);
+cogl_shader_is_compiled (CoglHandle handle);
/**
* cogl_create_program:
@@ -371,9 +371,9 @@ 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_)
CoglHandle
-cogl_create_program (void)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_);
+cogl_create_program (void);
/**
* cogl_program_ref:
@@ -386,9 +386,9 @@ cogl_create_program (void)
* Returns: @handle
* Deprecated: 1.16: Use #CoglSnippet api
*/
+COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_)
CoglHandle
-cogl_program_ref (CoglHandle handle)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_);
+cogl_program_ref (CoglHandle handle);
/**
* cogl_program_unref:
@@ -399,10 +399,9 @@ cogl_program_ref (CoglHandle handle)
*
* Deprecated: 1.16: Use #CoglSnippet api
*/
+COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_)
void
-cogl_program_unref (CoglHandle handle)
- COGL_DEPRECATED_IN_1_4_FOR (cogl_object_unref)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_);
+cogl_program_unref (CoglHandle handle);
/**
* cogl_is_program:
@@ -415,9 +414,9 @@ cogl_program_unref (CoglHandle handle)
*
* Deprecated: 1.16: Use #CoglSnippet api
*/
+COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_)
CoglBool
-cogl_is_program (CoglHandle handle)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_);
+cogl_is_program (CoglHandle handle);
/**
* cogl_program_attach_shader:
@@ -431,10 +430,10 @@ cogl_is_program (CoglHandle handle)
*
* Deprecated: 1.16: Use #CoglSnippet api
*/
+COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_)
void
cogl_program_attach_shader (CoglHandle program_handle,
- CoglHandle shader_handle)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_);
+ CoglHandle shader_handle);
/**
* cogl_program_link:
@@ -446,9 +445,9 @@ cogl_program_attach_shader (CoglHandle program_handle,
*
* Deprecated: 1.16: Use #CoglSnippet api
*/
+COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_)
void
-cogl_program_link (CoglHandle handle)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_);
+cogl_program_link (CoglHandle handle);
/**
* cogl_program_use:
@@ -465,9 +464,9 @@ cogl_program_link (CoglHandle handle)
*
* Deprecated: 1.16: Use #CoglSnippet api
*/
+COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_)
void
-cogl_program_use (CoglHandle handle)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_);
+cogl_program_use (CoglHandle handle);
/**
* cogl_program_get_uniform_location:
@@ -483,10 +482,10 @@ cogl_program_use (CoglHandle handle)
* program is in use.
* Deprecated: 1.16: Use #CoglSnippet api instead
*/
+COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_)
int
cogl_program_get_uniform_location (CoglHandle handle,
- const char *uniform_name)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_);
+ const char *uniform_name);
/**
* cogl_program_set_uniform_1f:
@@ -501,11 +500,11 @@ 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_)
void
cogl_program_set_uniform_1f (CoglHandle program,
int uniform_location,
- float value)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_);
+ float value);
/**
* cogl_program_set_uniform_1i:
@@ -520,11 +519,11 @@ 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_)
void
cogl_program_set_uniform_1i (CoglHandle program,
int uniform_location,
- int value)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_);
+ int value);
/**
* cogl_program_set_uniform_float:
@@ -543,13 +542,13 @@ 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_)
void
cogl_program_set_uniform_float (CoglHandle program,
int uniform_location,
int n_components,
int count,
- const float *value)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_);
+ const float *value);
/**
* cogl_program_set_uniform_int:
@@ -568,13 +567,13 @@ 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_)
void
cogl_program_set_uniform_int (CoglHandle program,
int uniform_location,
int n_components,
int count,
- const int *value)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_);
+ const int *value);
/**
* cogl_program_set_uniform_matrix:
@@ -594,14 +593,14 @@ 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_)
void
cogl_program_set_uniform_matrix (CoglHandle program,
int uniform_location,
int dimensions,
int count,
CoglBool transpose,
- const float *value)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_);
+ const float *value);
/**
* cogl_program_uniform_1f:
@@ -613,10 +612,10 @@ cogl_program_set_uniform_matrix (CoglHandle program,
*
* Deprecated: 1.16: Use #CoglSnippet api
*/
+COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_)
void
cogl_program_uniform_1f (int uniform_no,
- float value)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_);
+ float value);
/**
* cogl_program_uniform_1i:
@@ -628,10 +627,10 @@ cogl_program_uniform_1f (int uniform_no,
*
* Deprecated: 1.16: Use #CoglSnippet api
*/
+COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_)
void
cogl_program_uniform_1i (int uniform_no,
- int value)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_);
+ int value);
/**
* cogl_program_uniform_float:
@@ -645,12 +644,12 @@ cogl_program_uniform_1i (int uniform_no,
*
* Deprecated: 1.16: Use #CoglSnippet api
*/
+COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_)
void
cogl_program_uniform_float (int uniform_no,
int size,
int count,
- const float *value)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_);
+ const float *value);
/**
* cogl_program_uniform_int:
@@ -664,12 +663,12 @@ cogl_program_uniform_float (int uniform_no,
*
* Deprecated: 1.16: Use #CoglSnippet api
*/
+COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_)
void
cogl_program_uniform_int (int uniform_no,
int size,
int count,
- const int *value)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_);
+ const int *value);
/**
* cogl_program_uniform_matrix:
@@ -685,13 +684,13 @@ cogl_program_uniform_int (int uniform_no,
*
* Deprecated: 1.16: Use #CoglSnippet api
*/
+COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_)
void
cogl_program_uniform_matrix (int uniform_no,
int size,
int count,
CoglBool transpose,
- const float *value)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_);
+ const float *value);
COGL_END_DECLS
diff --git a/cogl/cogl-texture.h b/cogl/cogl-texture.h
index 6fbc6f6..6f304ab 100644
--- a/cogl/cogl-texture.h
+++ b/cogl/cogl-texture.h
@@ -314,8 +314,9 @@ cogl_texture_get_format (CoglTexture *texture);
* also no known need for API either. It was just
* a mistake that it was ever published.
*/
+COGL_DEPRECATED_IN_1_10
unsigned int
-cogl_texture_get_rowstride (CoglTexture *texture) COGL_DEPRECATED_IN_1_10;
+cogl_texture_get_rowstride (CoglTexture *texture);
/**
* cogl_texture_get_max_waste:
@@ -566,8 +567,9 @@ cogl_texture_new_from_sub_texture (CoglTexture *full_texture,
*
* Return value: the @texture pointer.
*/
+COGL_DEPRECATED_FOR (cogl_object_ref)
void *
-cogl_texture_ref (void *texture) COGL_DEPRECATED_FOR (cogl_object_ref);
+cogl_texture_ref (void *texture);
/**
* cogl_texture_unref:
@@ -577,8 +579,9 @@ cogl_texture_ref (void *texture) COGL_DEPRECATED_FOR (cogl_object_ref);
*
* Deprecated: 1.2: Use cogl_object_unref() instead
*/
+COGL_DEPRECATED_FOR (cogl_object_unref)
void
-cogl_texture_unref (void *texture) COGL_DEPRECATED_FOR (cogl_object_unref);
+cogl_texture_unref (void *texture);
/**
* cogl_texture_allocate:
diff --git a/cogl/cogl-version.h b/cogl/cogl-version.h
index 967788e..c2cce4b 100644
--- a/cogl/cogl-version.h
+++ b/cogl/cogl-version.h
@@ -49,10 +49,10 @@
* and we have the following functions annotated in the Cogl headers:
*
* |[
- * void cogl_function_A (void) COGL_DEPRECATED_IN_1_4;
- * void cogl_function_B (void) COGL_DEPRECATED_IN_1_6;
- * void cogl_function_C (void) COGL_AVAILABLE_IN_1_8;
- * void cogl_function_D (void) COGL_AVAILABLE_IN_1_10;
+ * 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:
diff --git a/cogl/cogl-vertex-buffer.h b/cogl/cogl-vertex-buffer.h
index 300e94f..bd28836 100644
--- a/cogl/cogl-vertex-buffer.h
+++ b/cogl/cogl-vertex-buffer.h
@@ -85,9 +85,9 @@ 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)
CoglHandle
-cogl_vertex_buffer_new (unsigned int n_vertices)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_API);
+cogl_vertex_buffer_new (unsigned int n_vertices);
/**
* cogl_vertex_buffer_get_n_vertices:
@@ -98,9 +98,9 @@ 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)
unsigned int
-cogl_vertex_buffer_get_n_vertices (CoglHandle handle)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_API);
+cogl_vertex_buffer_get_n_vertices (CoglHandle handle);
/**
* cogl_vertex_buffer_add:
@@ -167,6 +167,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)
void
cogl_vertex_buffer_add (CoglHandle handle,
const char *attribute_name,
@@ -174,8 +175,7 @@ cogl_vertex_buffer_add (CoglHandle handle,
CoglAttributeType type,
CoglBool normalized,
uint16_t stride,
- const void *pointer)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_API);
+ const void *pointer);
/**
* cogl_vertex_buffer_delete:
@@ -188,10 +188,10 @@ cogl_vertex_buffer_add (CoglHandle handle,
*
* Deprecated: 1.16: Use the #CoglPrimitive api instead
*/
+COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_API)
void
cogl_vertex_buffer_delete (CoglHandle handle,
- const char *attribute_name)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_API);
+ const char *attribute_name);
/**
* cogl_vertex_buffer_submit:
@@ -207,9 +207,9 @@ cogl_vertex_buffer_delete (CoglHandle handle,
*
* Deprecated: 1.16: Use the #CoglPrimitive api instead
*/
+COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_API)
void
-cogl_vertex_buffer_submit (CoglHandle handle)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_API);
+cogl_vertex_buffer_submit (CoglHandle handle);
/**
* cogl_vertex_buffer_disable:
@@ -227,10 +227,10 @@ cogl_vertex_buffer_submit (CoglHandle handle)
*
* Deprecated: 1.16: Use the #CoglPrimitive api instead
*/
+COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_API)
void
cogl_vertex_buffer_disable (CoglHandle handle,
- const char *attribute_name)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_API);
+ const char *attribute_name);
/**
* cogl_vertex_buffer_enable:
@@ -247,10 +247,10 @@ cogl_vertex_buffer_disable (CoglHandle handle,
*
* Deprecated: 1.16: Use the #CoglPrimitive api instead
*/
+COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_API)
void
cogl_vertex_buffer_enable (CoglHandle handle,
- const char *attribute_name)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_API);
+ const char *attribute_name);
/**
* cogl_vertex_buffer_draw:
@@ -268,12 +268,12 @@ cogl_vertex_buffer_enable (CoglHandle handle,
*
* Deprecated: 1.16: Use the #CoglPrimitive api instead
*/
+COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_API)
void
cogl_vertex_buffer_draw (CoglHandle handle,
CoglVerticesMode mode,
int first,
- int count)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_API);
+ int count);
/**
* cogl_vertex_buffer_indices_new:
@@ -293,11 +293,11 @@ cogl_vertex_buffer_draw (CoglHandle handle,
*
* Deprecated: 1.16: Use the #CoglPrimitive api instead
*/
+COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_API)
CoglHandle
cogl_vertex_buffer_indices_new (CoglIndicesType indices_type,
const void *indices_array,
- int indices_len)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_API);
+ int indices_len);
/**
* cogl_vertex_buffer_indices_get_type:
@@ -309,9 +309,9 @@ 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)
CoglIndicesType
-cogl_vertex_buffer_indices_get_type (CoglHandle indices)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_API);
+cogl_vertex_buffer_indices_get_type (CoglHandle indices);
/**
* cogl_vertex_buffer_draw_elements:
@@ -334,6 +334,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)
void
cogl_vertex_buffer_draw_elements (CoglHandle handle,
CoglVerticesMode mode,
@@ -341,8 +342,7 @@ cogl_vertex_buffer_draw_elements (CoglHandle handle,
int min_index,
int max_index,
int indices_offset,
- int count)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_API);
+ int count);
/**
* cogl_vertex_buffer_ref:
@@ -354,9 +354,9 @@ cogl_vertex_buffer_draw_elements (CoglHandle handle,
*
* Deprecated: 1.2: Use cogl_object_ref() instead
*/
+COGL_DEPRECATED_FOR (cogl_object_ref)
CoglHandle
-cogl_vertex_buffer_ref (CoglHandle handle)
- COGL_DEPRECATED_FOR (cogl_object_ref);
+cogl_vertex_buffer_ref (CoglHandle handle);
/**
* cogl_vertex_buffer_unref:
@@ -366,9 +366,9 @@ cogl_vertex_buffer_ref (CoglHandle handle)
*
* Deprecated: 1.2: Use cogl_object_unref() instead
*/
+COGL_DEPRECATED_FOR (cogl_object_unref)
void
-cogl_vertex_buffer_unref (CoglHandle handle)
- COGL_DEPRECATED_FOR (cogl_object_unref);
+cogl_vertex_buffer_unref (CoglHandle handle);
/**
* cogl_vertex_buffer_indices_get_for_quads:
@@ -403,9 +403,9 @@ cogl_vertex_buffer_unref (CoglHandle handle)
*
* Deprecated: 1.16: Use the #CoglPrimitive api instead
*/
+COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_API)
CoglHandle
-cogl_vertex_buffer_indices_get_for_quads (unsigned int n_indices)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_API);
+cogl_vertex_buffer_indices_get_for_quads (unsigned int n_indices);
/**
* cogl_is_vertex_buffer:
@@ -419,9 +419,9 @@ 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)
CoglBool
-cogl_is_vertex_buffer (CoglHandle handle)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_API);
+cogl_is_vertex_buffer (CoglHandle handle);
/**
* cogl_is_vertex_buffer_indices:
@@ -436,10 +436,9 @@ 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)
CoglBool
-cogl_is_vertex_buffer_indices (CoglHandle handle)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_API);
-
+cogl_is_vertex_buffer_indices (CoglHandle handle);
COGL_END_DECLS
#endif /* __COGL_VERTEX_BUFFER_H__ */
diff --git a/cogl/cogl-xlib.h b/cogl/cogl-xlib.h
index c84bd23..a2175a8 100644
--- a/cogl/cogl-xlib.h
+++ b/cogl/cogl-xlib.h
@@ -46,9 +46,9 @@ 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)
Display *
-cogl_xlib_get_display (void)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_xlib_renderer_get_display);
+cogl_xlib_get_display (void);
/*
* cogl_xlib_set_display:
@@ -61,9 +61,9 @@ 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)
void
-cogl_xlib_set_display (Display *display)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_xlib_renderer_set_foreign_display);
+cogl_xlib_set_display (Display *display);
/*
* cogl_xlib_handle_event:
@@ -83,9 +83,9 @@ 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)
CoglFilterReturn
-cogl_xlib_handle_event (XEvent *xevent)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_xlib_renderer_handle_event);
+cogl_xlib_handle_event (XEvent *xevent);
COGL_END_DECLS
diff --git a/cogl/cogl1-context.h b/cogl/cogl1-context.h
index 2fafae0..6b82c1b 100644
--- a/cogl/cogl1-context.h
+++ b/cogl/cogl1-context.h
@@ -50,8 +50,9 @@ COGL_BEGIN_DECLS
* Since: 1.0
* Deprecated: 1.16: Not replaced
*/
+COGL_DEPRECATED_IN_1_16
GOptionGroup *
-cogl_get_option_group (void) COGL_DEPRECATED_IN_1_16;
+cogl_get_option_group (void);
/* Misc */
/**
@@ -64,9 +65,9 @@ cogl_get_option_group (void) COGL_DEPRECATED_IN_1_16;
* Since: 0.8
* Deprecated: 1.10: Use cogl_foreach_feature() instead
*/
+COGL_DEPRECATED_IN_1_10_FOR (cogl_foreach_feature)
CoglFeatureFlags
-cogl_get_features (void)
- COGL_DEPRECATED_IN_1_10_FOR (cogl_foreach_feature);
+cogl_get_features (void);
/**
* cogl_features_available:
@@ -80,9 +81,9 @@ 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)
CoglBool
-cogl_features_available (CoglFeatureFlags features)
- COGL_DEPRECATED_IN_1_10_FOR (cogl_has_feature);
+cogl_features_available (CoglFeatureFlags features);
/**
* cogl_get_proc_address:
@@ -118,9 +119,10 @@ cogl_get_proc_address (const char *name);
* CoglBool retval = (strstr (ext, name) != NULL) ? TRUE : FALSE;
* ]|
*/
+COGL_DEPRECATED
CoglBool
cogl_check_extension (const char *name,
- const char *ext) COGL_DEPRECATED;
+ const char *ext);
/**
* cogl_get_bitmasks:
@@ -136,12 +138,12 @@ 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)
void
cogl_get_bitmasks (int *red,
int *green,
int *blue,
- int *alpha)
- COGL_DEPRECATED_IN_1_8_FOR (cogl_framebuffer_get_red_OR_green_OR_blue_OR_alpha_bits);
+ int *alpha);
/**
* cogl_perspective:
@@ -160,12 +162,12 @@ cogl_get_bitmasks (int *red,
*
* Deprecated: 1.10: Use cogl_framebuffer_perspective() instead
*/
+COGL_DEPRECATED_IN_1_10_FOR (cogl_framebuffer_perspective)
void
cogl_perspective (float fovy,
float aspect,
float z_near,
- float z_far)
- COGL_DEPRECATED_IN_1_10_FOR (cogl_framebuffer_perspective);
+ float z_far);
/**
* cogl_frustum:
@@ -187,14 +189,14 @@ 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)
void
cogl_frustum (float left,
float right,
float bottom,
float top,
float z_near,
- float z_far)
- COGL_DEPRECATED_IN_1_10_FOR (cogl_framebuffer_frustum);
+ float z_far);
/**
* cogl_ortho:
@@ -226,14 +228,14 @@ cogl_frustum (float left,
* Since: 1.0
* Deprecated: 1.10: Use cogl_framebuffer_orthographic() instead
*/
+COGL_DEPRECATED_IN_1_10_FOR (cogl_framebuffer_orthographic)
void
cogl_ortho (float left,
float right,
float bottom,
float top,
float near,
- float far)
- COGL_DEPRECATED_IN_1_10_FOR (cogl_framebuffer_orthographic);
+ float far);
/**
* cogl_viewport:
@@ -245,10 +247,10 @@ 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)
void
cogl_viewport (unsigned int width,
- unsigned int height)
- COGL_DEPRECATED_IN_1_8_FOR (cogl_framebuffer_set_viewport);
+ unsigned int height);
/**
* cogl_set_viewport:
@@ -262,12 +264,12 @@ 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)
void
cogl_set_viewport (int x,
int y,
int width,
- int height)
- COGL_DEPRECATED_IN_1_8_FOR (cogl_framebuffer_set_viewport);
+ int height);
/**
* cogl_push_matrix:
@@ -277,9 +279,9 @@ cogl_set_viewport (int x,
*
* Deprecated: 1.10: Use cogl_framebuffer_push_matrix() instead
*/
+COGL_DEPRECATED_IN_1_10_FOR (cogl_framebuffer_push_matrix)
void
-cogl_push_matrix (void)
- COGL_DEPRECATED_IN_1_10_FOR (cogl_framebuffer_push_matrix);
+cogl_push_matrix (void);
/**
* cogl_pop_matrix:
@@ -288,9 +290,9 @@ cogl_push_matrix (void)
*
* Deprecated: 1.10: Use cogl_framebuffer_pop_matrix() instead
*/
+COGL_DEPRECATED_IN_1_10_FOR (cogl_framebuffer_push_matrix)
void
-cogl_pop_matrix (void)
- COGL_DEPRECATED_IN_1_10_FOR (cogl_framebuffer_push_matrix);
+cogl_pop_matrix (void);
/**
* cogl_scale:
@@ -303,11 +305,11 @@ cogl_pop_matrix (void)
*
* Deprecated: 1.10: Use cogl_framebuffer_pop_matrix() instead
*/
+COGL_DEPRECATED_IN_1_10_FOR (cogl_framebuffer_scale)
void
cogl_scale (float x,
float y,
- float z)
- COGL_DEPRECATED_IN_1_10_FOR (cogl_framebuffer_scale);
+ float z);
/**
* cogl_translate:
@@ -320,11 +322,11 @@ cogl_scale (float x,
*
* Deprecated: 1.10: Use cogl_framebuffer_translate() instead
*/
+COGL_DEPRECATED_IN_1_10_FOR (cogl_framebuffer_translate)
void
cogl_translate (float x,
float y,
- float z)
- COGL_DEPRECATED_IN_1_10_FOR (cogl_framebuffer_translate);
+ float z);
/**
* cogl_rotate:
@@ -341,12 +343,12 @@ cogl_translate (float x,
*
* Deprecated: 1.10: Use cogl_framebuffer_rotate() instead
*/
+COGL_DEPRECATED_IN_1_10_FOR (cogl_framebuffer_rotate)
void
cogl_rotate (float angle,
float x,
float y,
- float z)
- COGL_DEPRECATED_IN_1_10_FOR (cogl_framebuffer_rotate);
+ float z);
/**
* cogl_transform:
@@ -357,9 +359,9 @@ cogl_rotate (float angle,
* Since: 1.4
* Deprecated: 1.10: Use cogl_framebuffer_transform() instead
*/
+COGL_DEPRECATED_IN_1_10_FOR (cogl_framebuffer_transform)
void
-cogl_transform (const CoglMatrix *matrix)
- COGL_DEPRECATED_IN_1_10_FOR (cogl_framebuffer_transform);
+cogl_transform (const CoglMatrix *matrix);
/**
* cogl_get_modelview_matrix:
@@ -370,9 +372,9 @@ 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)
void
-cogl_get_modelview_matrix (CoglMatrix *matrix)
- COGL_DEPRECATED_IN_1_10_FOR (cogl_framebuffer_get_modelview_matrix);
+cogl_get_modelview_matrix (CoglMatrix *matrix);
/**
* cogl_set_modelview_matrix:
@@ -383,9 +385,9 @@ 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)
void
-cogl_set_modelview_matrix (CoglMatrix *matrix)
- COGL_DEPRECATED_IN_1_10_FOR (cogl_framebuffer_set_modelview_matrix);
+cogl_set_modelview_matrix (CoglMatrix *matrix);
/**
* cogl_get_projection_matrix:
@@ -396,9 +398,9 @@ 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)
void
-cogl_get_projection_matrix (CoglMatrix *matrix)
- COGL_DEPRECATED_IN_1_10_FOR (cogl_framebuffer_get_projection_matrix);
+cogl_get_projection_matrix (CoglMatrix *matrix);
/**
* cogl_set_projection_matrix:
@@ -409,9 +411,9 @@ 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)
void
-cogl_set_projection_matrix (CoglMatrix *matrix)
- COGL_DEPRECATED_IN_1_10_FOR (cogl_framebuffer_set_projection_matrix);
+cogl_set_projection_matrix (CoglMatrix *matrix);
/**
* cogl_get_viewport:
@@ -425,9 +427,9 @@ 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)
void
-cogl_get_viewport (float v[4])
- COGL_DEPRECATED_IN_1_10_FOR (cogl_framebuffer_get_viewport4fv);
+cogl_get_viewport (float v[4]);
/**
* cogl_set_depth_test_enabled:
@@ -441,9 +443,9 @@ 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)
void
-cogl_set_depth_test_enabled (CoglBool setting)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_set_depth_state);
+cogl_set_depth_test_enabled (CoglBool setting);
/**
* cogl_get_depth_test_enabled:
@@ -454,9 +456,9 @@ 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)
CoglBool
-cogl_get_depth_test_enabled (void)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_set_depth_state);
+cogl_get_depth_test_enabled (void);
/**
* cogl_set_backface_culling_enabled:
@@ -470,9 +472,9 @@ 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)
void
-cogl_set_backface_culling_enabled (CoglBool setting)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_set_cull_face_mode);
+cogl_set_backface_culling_enabled (CoglBool setting);
/**
* cogl_get_backface_culling_enabled:
@@ -484,9 +486,9 @@ 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)
CoglBool
-cogl_get_backface_culling_enabled (void)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_get_cull_face_mode);
+cogl_get_backface_culling_enabled (void);
/**
* cogl_set_fog:
@@ -515,13 +517,13 @@ cogl_get_backface_culling_enabled (void)
*
* Deprecated: 1.16: Use #CoglSnippet shader api for fog
*/
+COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_API)
void
cogl_set_fog (const CoglColor *fog_color,
CoglFogMode mode,
float density,
float z_near,
- float z_far)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_API);
+ float z_far);
/**
* cogl_disable_fog:
@@ -531,9 +533,9 @@ 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)
void
-cogl_disable_fog (void)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_snippet_API);
+cogl_disable_fog (void);
/**
* cogl_clear:
@@ -546,10 +548,10 @@ cogl_disable_fog (void)
*
* Deprecated: 1.16: Use cogl_framebuffer_clear() api instead
*/
+COGL_DEPRECATED_IN_1_16_FOR (cogl_framebuffer_clear)
void
cogl_clear (const CoglColor *color,
- unsigned long buffers)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_framebuffer_clear);
+ unsigned long buffers);
/**
* cogl_set_source:
@@ -565,8 +567,9 @@ cogl_clear (const CoglColor *color,
* #CoglPipeline argument so this stack of
* #CoglMaterial<!-- -->s shouldn't be used.
*/
+COGL_DEPRECATED_IN_1_16
void
-cogl_set_source (void *material) COGL_DEPRECATED_IN_1_16;
+cogl_set_source (void *material);
/**
* cogl_get_source:
@@ -587,8 +590,9 @@ cogl_set_source (void *material) COGL_DEPRECATED_IN_1_16;
* #CoglPipeline argument so this stack of
* #CoglMaterial<!-- -->s shouldn't be used.
*/
+COGL_DEPRECATED_IN_1_16
void *
-cogl_get_source (void) COGL_DEPRECATED_IN_1_16;
+cogl_get_source (void);
/**
* cogl_push_source:
@@ -603,8 +607,9 @@ cogl_get_source (void) COGL_DEPRECATED_IN_1_16;
* #CoglPipeline argument so this stack of
* #CoglMaterial<!-- -->s shouldn't be used.
*/
+COGL_DEPRECATED_IN_1_16
void
-cogl_push_source (void *material) COGL_DEPRECATED_IN_1_16;
+cogl_push_source (void *material);
/**
* cogl_pop_source:
@@ -618,8 +623,9 @@ cogl_push_source (void *material) COGL_DEPRECATED_IN_1_16;
* #CoglPipeline argument so this stack of
* #CoglMaterial<!-- -->s shouldn't be used.
*/
+COGL_DEPRECATED_IN_1_16
void
-cogl_pop_source (void) COGL_DEPRECATED_IN_1_16;
+cogl_pop_source (void);
/**
* cogl_set_source_color:
@@ -641,8 +647,9 @@ cogl_pop_source (void) COGL_DEPRECATED_IN_1_16;
* #CoglPipeline argument so this stack of
* #CoglMaterial<!-- -->s shouldn't be used.
*/
+COGL_DEPRECATED_IN_1_16
void
-cogl_set_source_color (const CoglColor *color) COGL_DEPRECATED_IN_1_16;
+cogl_set_source_color (const CoglColor *color);
/**
* cogl_set_source_color4ub:
@@ -663,11 +670,12 @@ cogl_set_source_color (const CoglColor *color) COGL_DEPRECATED_IN_1_16;
* #CoglPipeline argument so this stack of
* #CoglMaterial<!-- -->s shouldn't be used.
*/
+COGL_DEPRECATED_IN_1_16
void
cogl_set_source_color4ub (uint8_t red,
uint8_t green,
uint8_t blue,
- uint8_t alpha) COGL_DEPRECATED_IN_1_16;
+ uint8_t alpha);
/**
* cogl_set_source_color4f:
@@ -689,11 +697,12 @@ cogl_set_source_color4ub (uint8_t red,
* #CoglPipeline argument so this stack of
* #CoglMaterial<!-- -->s shouldn't be used.
*/
+COGL_DEPRECATED_IN_1_16
void
cogl_set_source_color4f (float red,
float green,
float blue,
- float alpha) COGL_DEPRECATED_IN_1_16;
+ float alpha);
/**
* cogl_set_source_texture:
@@ -718,8 +727,9 @@ cogl_set_source_color4f (float red,
* #CoglPipeline argument so this stack of
* #CoglMaterial<!-- -->s shouldn't be used.
*/
+COGL_DEPRECATED_IN_1_16
void
-cogl_set_source_texture (CoglTexture *texture) COGL_DEPRECATED_IN_1_16;
+cogl_set_source_texture (CoglTexture *texture);
/**
@@ -749,12 +759,12 @@ cogl_set_source_texture (CoglTexture *texture) COGL_DEPRECATED_IN_1_16;
*
* Deprecated: 1.16: Use cogl_framebuffer_push_scissor_clip() instead
*/
+COGL_DEPRECATED_IN_1_16_FOR (cogl_framebuffer_push_scissor_clip)
void
cogl_clip_push_window_rect (float x_offset,
float y_offset,
float width,
- float height)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_framebuffer_push_scissor_clip);
+ float height);
/**
* cogl_clip_push_window_rectangle:
@@ -775,12 +785,12 @@ cogl_clip_push_window_rect (float x_offset,
* Since: 1.2
* Deprecated: 1.16: Use cogl_framebuffer_push_scissor_clip() instead
*/
+COGL_DEPRECATED_IN_1_16_FOR (cogl_framebuffer_push_scissor_clip)
void
cogl_clip_push_window_rectangle (int x_offset,
int y_offset,
int width,
- int height)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_framebuffer_push_scissor_clip);
+ int height);
/**
* cogl_clip_push:
@@ -804,12 +814,12 @@ cogl_clip_push_window_rectangle (int x_offset,
* extending up, it's awkward to use. Please use
* cogl_framebuffer_push_rectangle_clip()
*/
+COGL_DEPRECATED_IN_1_16_FOR (cogl_framebuffer_push_rectangle_clip)
void
cogl_clip_push (float x_offset,
float y_offset,
float width,
- float height)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_framebuffer_push_rectangle_clip);
+ float height);
/**
* cogl_clip_push_rectangle:
@@ -831,12 +841,12 @@ cogl_clip_push (float x_offset,
* Deprecated: 1.16: Use cogl_framebuffer_push_rectangle_clip()
* instead
*/
+COGL_DEPRECATED_IN_1_16_FOR (cogl_framebuffer_push_rectangle_clip)
void
cogl_clip_push_rectangle (float x0,
float y0,
float x1,
- float y1)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_framebuffer_push_rectangle_clip);
+ float y1);
/**
* cogl_clip_push_primitive:
@@ -870,13 +880,13 @@ cogl_clip_push_rectangle (float x0,
* Deprecated: 1.16: Use cogl_framebuffer_push_primitive_clip()
* instead
*/
+COGL_DEPRECATED_IN_1_16_FOR (cogl_framebuffer_push_primitive_clip)
void
cogl_clip_push_primitive (CoglPrimitive *primitive,
float bounds_x1,
float bounds_y1,
float bounds_x2,
- float bounds_y2)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_framebuffer_push_primitive_clip);
+ float bounds_y2);
/**
* cogl_clip_pop:
@@ -886,9 +896,9 @@ cogl_clip_push_primitive (CoglPrimitive *primitive,
*
* Deprecated: 1.16: Use cogl_framebuffer_pop_clip() instead
*/
+COGL_DEPRECATED_IN_1_16_FOR (cogl_framebuffer_pop_clip)
void
-cogl_clip_pop (void)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_framebuffer_pop_clip);
+cogl_clip_pop (void);
/**
* cogl_clip_ensure:
@@ -902,8 +912,9 @@ cogl_clip_pop (void)
*
* Since: 1.0
*/
+COGL_DEPRECATED
void
-cogl_clip_ensure (void) COGL_DEPRECATED;
+cogl_clip_ensure (void);
/**
* cogl_clip_stack_save:
@@ -922,8 +933,9 @@ cogl_clip_ensure (void) COGL_DEPRECATED;
*
* Since: 0.8.2
*/
+COGL_DEPRECATED
void
-cogl_clip_stack_save (void) COGL_DEPRECATED;
+cogl_clip_stack_save (void);
/**
* cogl_clip_stack_restore:
@@ -939,8 +951,9 @@ cogl_clip_stack_save (void) COGL_DEPRECATED;
*
* Since: 0.8.2
*/
+COGL_DEPRECATED
void
-cogl_clip_stack_restore (void) COGL_DEPRECATED;
+cogl_clip_stack_restore (void);
/**
* cogl_set_framebuffer:
@@ -955,8 +968,9 @@ cogl_clip_stack_restore (void) COGL_DEPRECATED;
* #CoglFramebuffer arguments so this stack of
* framebuffers shouldn't be used anymore.
*/
+COGL_DEPRECATED_IN_1_16
void
-cogl_set_framebuffer (CoglFramebuffer *buffer) COGL_DEPRECATED_IN_1_16;
+cogl_set_framebuffer (CoglFramebuffer *buffer);
/**
* cogl_push_framebuffer:
@@ -1039,8 +1053,9 @@ cogl_set_framebuffer (CoglFramebuffer *buffer) COGL_DEPRECATED_IN_1_16;
* #CoglFramebuffer arguments so this stack of
* framebuffers shouldn't be used anymore.
*/
+COGL_DEPRECATED_IN_1_16
void
-cogl_push_framebuffer (CoglFramebuffer *buffer) COGL_DEPRECATED_IN_1_16;
+cogl_push_framebuffer (CoglFramebuffer *buffer);
/**
* cogl_pop_framebuffer:
@@ -1053,8 +1068,9 @@ cogl_push_framebuffer (CoglFramebuffer *buffer) COGL_DEPRECATED_IN_1_16;
* #CoglFramebuffer arguments so this stack of
* framebuffers shouldn't be used anymore.
*/
+COGL_DEPRECATED_IN_1_16
void
-cogl_pop_framebuffer (void) COGL_DEPRECATED_IN_1_16;
+cogl_pop_framebuffer (void);
/**
* cogl_set_draw_buffer:
@@ -1072,9 +1088,10 @@ cogl_pop_framebuffer (void) COGL_DEPRECATED_IN_1_16;
* #CoglFramebuffer arguments so this stack of
* framebuffers shouldn't be used anymore.
*/
+COGL_DEPRECATED_IN_1_16
void
cogl_set_draw_buffer (CoglBufferTarget target,
- CoglHandle offscreen) COGL_DEPRECATED_IN_1_16;
+ CoglHandle offscreen);
/**
* cogl_push_draw_buffer:
@@ -1085,8 +1102,9 @@ cogl_set_draw_buffer (CoglBufferTarget target,
* #CoglFramebuffer arguments so this stack of
* framebuffers shouldn't be used anymore.
*/
+COGL_DEPRECATED_IN_1_16
void
-cogl_push_draw_buffer (void) COGL_DEPRECATED_IN_1_16;
+cogl_push_draw_buffer (void);
/**
* cogl_pop_draw_buffer:
@@ -1097,8 +1115,9 @@ cogl_push_draw_buffer (void) COGL_DEPRECATED_IN_1_16;
* #CoglFramebuffer arguments so this stack of
* framebuffers shouldn't be used anymore.
*/
+COGL_DEPRECATED_IN_1_16
void
-cogl_pop_draw_buffer (void) COGL_DEPRECATED_IN_1_16;
+cogl_pop_draw_buffer (void);
/**
* cogl_read_pixels:
@@ -1124,6 +1143,7 @@ cogl_pop_draw_buffer (void) COGL_DEPRECATED_IN_1_16;
*
* Deprecated: 1.16: Use cogl_framebuffer_read_pixels() instead
*/
+COGL_DEPRECATED_IN_1_16_FOR (cogl_framebuffer_read_pixels)
void
cogl_read_pixels (int x,
int y,
@@ -1131,8 +1151,7 @@ cogl_read_pixels (int x,
int height,
CoglReadPixelsFlags source,
CoglPixelFormat format,
- uint8_t *pixels)
- COGL_DEPRECATED_IN_1_16_FOR (cogl_framebuffer_read_pixels);
+ uint8_t *pixels);
/**
* cogl_flush:
@@ -1237,8 +1256,9 @@ cogl_flush (void);
* Since: 1.0
* Deprecated: 1.16: Use the #CoglGLES2Context api instead
*/
+COGL_DEPRECATED_IN_1_16_FOR (CoglGLES2Context_API)
void
-cogl_begin_gl (void) COGL_DEPRECATED_IN_1_16_FOR (CoglGLES2Context_API);
+cogl_begin_gl (void);
/**
* cogl_end_gl:
@@ -1249,8 +1269,9 @@ cogl_begin_gl (void) COGL_DEPRECATED_IN_1_16_FOR (CoglGLES2Context_API);
* Since: 1.0
* Deprecated: 1.16: Use the #CoglGLES2Context api instead
*/
+COGL_DEPRECATED_IN_1_16_FOR (CoglGLES2Context_API)
void
-cogl_end_gl (void) COGL_DEPRECATED_IN_1_16_FOR (CoglGLES2Context_API);
+cogl_end_gl (void);
COGL_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
