clutter 2.0.2-x86-mingw32 → 2.0.3-x86-mingw32

data/vendor/local/include/cogl/cogl/cogl-material-compat.h

@@ -32,6 +32,7 @@
 #include <cogl/cogl-matrix.h>
 #include <cogl/cogl-depth-state.h>
 #include <cogl/cogl-error.h>
+#include <cogl/cogl-macros.h>
 
 G_BEGIN_DECLS
 
@@ -134,7 +135,9 @@ typedef enum {
  * Allocates and initializes a blank white material
  *
  * 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);
 
@@ -154,12 +157,12 @@ cogl_material_new (void);
  * Returns: a pointer to the newly allocated #CoglMaterial
  *
  * 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);
 
-#ifndef COGL_DISABLE_DEPRECATED
-
 /**
  * cogl_material_ref:
  * @material: a #CoglMaterial object.
@@ -172,8 +175,9 @@ cogl_material_copy (CoglMaterial *source);
  *
  * Deprecated: 1.2: Use cogl_object_ref() instead
  */
+COGL_DEPRECATED
 CoglHandle
-cogl_material_ref (CoglHandle material) G_GNUC_DEPRECATED;
+cogl_material_ref (CoglHandle material);
 
 /**
  * cogl_material_unref:
@@ -185,10 +189,9 @@ cogl_material_ref (CoglHandle material) G_GNUC_DEPRECATED;
  *
  * Deprecated: 1.2: Use cogl_object_unref() instead
  */
+COGL_DEPRECATED
 void
-cogl_material_unref (CoglHandle material) G_GNUC_DEPRECATED;
-
-#endif /* COGL_DISABLE_DEPRECATED */
+cogl_material_unref (CoglHandle material);
 
 /**
  * cogl_is_material:
@@ -198,7 +201,9 @@ cogl_material_unref (CoglHandle material) G_GNUC_DEPRECATED;
  *
  * Return value: %TRUE if the handle references a #CoglMaterial,
  *   %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);
 
@@ -217,7 +222,9 @@ cogl_is_material (CoglHandle handle);
  * The default value is (1.0, 1.0, 1.0, 1.0)
  *
  * 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);
@@ -235,7 +242,9 @@ cogl_material_set_color (CoglMaterial    *material,
  * The default value is (0xff, 0xff, 0xff, 0xff)
  *
  * 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,
@@ -256,7 +265,9 @@ cogl_material_set_color4ub (CoglMaterial *material,
  * The default value is (1.0, 1.0, 1.0, 1.0)
  *
  * 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,
@@ -272,7 +283,9 @@ cogl_material_set_color4f (CoglMaterial *material,
  * Retrieves the current material color.
  *
  * 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);
@@ -292,7 +305,9 @@ cogl_material_get_color (CoglMaterial *material,
  * The default value is (0.2, 0.2, 0.2, 1.0)
  *
  * 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);
@@ -305,7 +320,9 @@ cogl_material_set_ambient (CoglMaterial    *material,
  * Retrieves the current ambient color for @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);
@@ -322,7 +339,9 @@ cogl_material_get_ambient (CoglMaterial *material,
  * The default value is (0.8, 0.8, 0.8, 1.0)
  *
  * 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);
@@ -335,7 +354,9 @@ cogl_material_set_diffuse (CoglMaterial    *material,
  * Retrieves the current diffuse color for @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);
@@ -353,7 +374,9 @@ cogl_material_get_diffuse (CoglMaterial *material,
  * The default diffuse color is (0.8, 0.8, 0.8, 1.0)
  *
  * 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);
@@ -370,7 +393,9 @@ cogl_material_set_ambient_and_diffuse (CoglMaterial    *material,
  * The default value is (0.0, 0.0, 0.0, 1.0)
  *
  * 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);
@@ -383,7 +408,9 @@ cogl_material_set_specular (CoglMaterial    *material,
  * Retrieves the materials current specular color.
  *
  * 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);
@@ -401,7 +428,9 @@ cogl_material_get_specular (CoglMaterial *material,
  * The default value is 0.0
  *
  * 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);
@@ -415,7 +444,9 @@ cogl_material_set_shininess (CoglMaterial *material,
  * Return value: The materials current shininess value
  *
  * 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);
 
@@ -431,7 +462,9 @@ cogl_material_get_shininess (CoglMaterial *material);
  * The default value is (0.0, 0.0, 0.0, 1.0)
  *
  * 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);
@@ -444,7 +477,9 @@ cogl_material_set_emission (CoglMaterial    *material,
  * Retrieves the materials current emission color.
  *
  * 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);
@@ -498,7 +533,9 @@ typedef enum {
  * The default is %COGL_MATERIAL_ALPHA_FUNC_ALWAYS
  *
  * 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,
@@ -587,7 +624,9 @@ cogl_material_set_alpha_test_function (CoglMaterial         *material,
  *   present).
  *
  * 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,
@@ -602,7 +641,9 @@ cogl_material_set_blend (CoglMaterial *material,
  * blending will depend on the constant set with this function.
  *
  * 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);
@@ -621,7 +662,9 @@ cogl_material_set_blend_constant (CoglMaterial *material,
  * transformations. The default point size is 1.0.
  *
  * 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);
@@ -636,7 +679,9 @@ cogl_material_set_point_size (CoglMaterial *material,
  * Return value: the point size of the 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);
 
@@ -651,7 +696,9 @@ cogl_material_get_point_size (CoglMaterial *material);
  *   or %COGL_INVALID_HANDLE.
  *
  * 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);
 
@@ -700,7 +747,9 @@ cogl_material_get_user_program (CoglMaterial *material);
  * using the cogl_program or cogl_shader API.
  *
  * 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);
@@ -723,7 +772,9 @@ cogl_material_set_user_program (CoglMaterial *material,
  * as purely GLSL based layers.</note>
  *
  * 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,
@@ -735,7 +786,9 @@ cogl_material_set_layer (CoglMaterial *material,
  * @layer_index: Specifies the layer you want to remove
  *
  * 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);
@@ -832,7 +885,9 @@ cogl_material_remove_layer (CoglMaterial *material,
  *   or hardware. On failure, %FALSE is returned and @error is set
  *
  * 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,
@@ -850,7 +905,10 @@ cogl_material_set_layer_combine (CoglMaterial *material,
  * description then you can use this function to define its value.
  *
  * Since: 1.0
+ * 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,
@@ -864,7 +922,9 @@ cogl_material_set_layer_combine_constant (CoglMaterial    *material,
  *
  * This function lets you set a matrix that can be used to e.g. translate
  * 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,
@@ -890,7 +950,9 @@ cogl_material_set_layer_matrix (CoglMaterial     *material,
  *    list of #CoglMaterialLayer<!-- -->'s that can be passed to the
  *    cogl_material_layer_* functions. The list is owned by Cogl and it
  *    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);
 
@@ -903,7 +965,9 @@ cogl_material_get_layers (CoglMaterial *material);
  * Return value: the number of layers
  *
  * 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);
 
@@ -934,7 +998,9 @@ typedef enum {
  * first.
  *
  * 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);
 
@@ -951,7 +1017,9 @@ cogl_material_layer_get_type (CoglMaterialLayer *layer);
  * type %COGL_MATERIAL_LAYER_TYPE_TEXTURE before calling this function.</note>
  *
  * 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);
 
@@ -962,7 +1030,9 @@ cogl_material_layer_get_texture (CoglMaterialLayer *layer);
  * Queries the currently set downscaling filter for a material 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);
 
@@ -973,7 +1043,9 @@ cogl_material_layer_get_min_filter (CoglMaterialLayer *layer);
  * Queries the currently set downscaling filter for a material later
  *
  * 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);
 
@@ -986,7 +1058,9 @@ cogl_material_layer_get_mag_filter (CoglMaterialLayer *layer);
  *
  * Changes the decimation and interpolation filters used when a texture is
  * 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,
@@ -1013,7 +1087,10 @@ cogl_material_set_layer_filters (CoglMaterial      *material,
  *
  * Return value: %TRUE if the function succeeds, %FALSE otherwise.
  * Since: 1.4
+ * 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,
@@ -1032,7 +1109,10 @@ cogl_material_set_layer_point_sprite_coords_enabled (CoglMaterial *material,
  * point sprite coordinates.
  *
  * Since: 1.4
+ * 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);
@@ -1049,7 +1129,9 @@ cogl_material_get_layer_point_sprite_coords_enabled (CoglMaterial *material,
  * this layer.
  *
  * 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);
@@ -1063,7 +1145,9 @@ cogl_material_get_layer_wrap_mode_s (CoglMaterial *material,
  * Sets the wrap mode for the 's' coordinate of texture lookups on this layer.
  *
  * 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,
@@ -1081,7 +1165,9 @@ cogl_material_set_layer_wrap_mode_s (CoglMaterial        *material,
  * this layer.
  *
  * 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);
@@ -1096,7 +1182,9 @@ cogl_material_get_layer_wrap_mode_t (CoglMaterial *material,
  * Sets the wrap mode for the 't' coordinate of texture lookups on this layer.
  *
  * 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,
@@ -1114,7 +1202,9 @@ cogl_material_set_layer_wrap_mode_t (CoglMaterial        *material,
  * this layer.
  *
  * 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);
@@ -1129,7 +1219,9 @@ cogl_material_get_layer_wrap_mode_p (CoglMaterial *material,
  * this layer. 'p' is the third coordinate.
  *
  * 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,
@@ -1148,7 +1240,9 @@ cogl_material_set_layer_wrap_mode_p (CoglMaterial        *material,
  * cogl_material_set_layer_wrap_mode_p() separately.
  *
  * 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,
@@ -1163,7 +1257,9 @@ cogl_material_set_layer_wrap_mode (CoglMaterial        *material,
  * Return value: the wrap mode value for the s coordinate.
  *
  * 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);
 
@@ -1176,7 +1272,10 @@ cogl_material_layer_get_wrap_mode_s (CoglMaterialLayer *layer);
  * Return value: the wrap mode value for the t coordinate.
  *
  * 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);
 
@@ -1190,7 +1289,9 @@ cogl_material_layer_get_wrap_mode_t (CoglMaterialLayer *layer);
  * Return value: the wrap mode value for the p coordinate.
  *
  * 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);
 
@@ -1215,7 +1316,9 @@ cogl_material_layer_get_wrap_mode_p (CoglMaterialLayer *layer);
  *
  * Since: 1.8
  * 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,
@@ -1231,7 +1334,9 @@ cogl_material_set_depth_state (CoglMaterial *material,
  *
  * Since: 2.0
  * 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);
@@ -1247,6 +1352,7 @@ cogl_material_get_depth_state (CoglMaterial *material,
  *
  * Since: 1.4
  * Stability: Unstable
+ * Deprecated: 1.16
  */
 typedef CoglBool (*CoglMaterialLayerCallback) (CoglMaterial *material,
                                                int layer_index,
@@ -1263,7 +1369,9 @@ typedef CoglBool (*CoglMaterialLayerCallback) (CoglMaterial *material,
  *
  * Since: 1.4
  * Stability: Unstable
+ * Deprecated: 1.16: No replacement
  */
+COGL_DEPRECATED_IN_1_16
 void
 cogl_material_foreach_layer (CoglMaterial *material,
                              CoglMaterialLayerCallback callback,