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

data/vendor/local/include/cogl/cogl/cogl1-context.h

@@ -34,6 +34,7 @@
 #include <cogl/cogl-types.h>
 #include <cogl/cogl-texture.h>
 #include <cogl/cogl-framebuffer.h>
+#include <cogl/cogl-macros.h>
 
 COGL_BEGIN_DECLS
 
@@ -47,7 +48,9 @@ COGL_BEGIN_DECLS
  * Return value: a #GOptionGroup
  *
  * Since: 1.0
+ * Deprecated: 1.16: Not replaced
  */
+COGL_DEPRECATED_IN_1_16
 GOptionGroup *
 cogl_get_option_group (void);
 
@@ -60,7 +63,9 @@ cogl_get_option_group (void);
  * Return value: A logical OR of all the supported COGL features.
  *
  * 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);
 
@@ -74,7 +79,9 @@ cogl_get_features (void);
  * are available.
  *
  * 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);
 
@@ -96,8 +103,6 @@ cogl_features_available (CoglFeatureFlags features);
 CoglFuncPtr
 cogl_get_proc_address (const char *name);
 
-#ifndef COGL_DISABLE_DEPRECATED
-
 /**
  * cogl_check_extension:
  * @name: extension to check for
@@ -114,11 +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) G_GNUC_DEPRECATED;
-
-#endif /* COGL_DISABLE_DEPRECATED */
+                      const char *ext);
 
 /**
  * cogl_get_bitmasks:
@@ -130,7 +134,11 @@ cogl_check_extension (const char *name,
  * Gets the number of bitplanes used for each of the color components
  * in the color buffer. Pass %NULL for any of the arguments if the
  * value is not required.
+ *
+ * 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,
@@ -151,7 +159,10 @@ cogl_get_bitmasks (int *red,
  * ratio since that will reduce the effectiveness of depth testing
  * since there wont be enough precision to identify the depth of
  * objects near to each other.</note>
+ *
+ * Deprecated: 1.10: Use cogl_framebuffer_perspective() instead
  */
+COGL_DEPRECATED_IN_1_10_FOR (cogl_framebuffer_perspective)
 void
 cogl_perspective (float fovy,
                   float aspect,
@@ -176,7 +187,9 @@ cogl_perspective (float fovy,
  * all cross through the origin and 2 near and far clip planes.
  *
  * 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,
@@ -213,7 +226,9 @@ cogl_frustum (float left,
  * left, right bottom and top arguments.</note>
  *
  * 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,
@@ -222,8 +237,6 @@ cogl_ortho (float left,
             float near,
             float far);
 
-#ifndef COGL_DISABLE_DEPRECATED
-
 /**
  * cogl_viewport:
  * @width: Width of the viewport
@@ -232,14 +245,12 @@ cogl_ortho (float left,
  * Replace the current viewport with the given values.
  *
  * Since: 0.8.2
- *
- * Deprecated: 1.2: Use cogl_set_viewport() instead
+ * 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) G_GNUC_DEPRECATED;
-
-#endif /* COGL_DISABLE_DEPRECATED */
+	       unsigned int height);
 
 /**
  * cogl_set_viewport:
@@ -251,7 +262,9 @@ cogl_viewport (unsigned int width,
  * Replaces the current viewport with the given values.
  *
  * 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,
@@ -263,7 +276,10 @@ cogl_set_viewport (int x,
  *
  * Stores the current model-view matrix on the matrix stack. The matrix
  * can later be restored with cogl_pop_matrix().
+ *
+ * Deprecated: 1.10: Use cogl_framebuffer_push_matrix() instead
  */
+COGL_DEPRECATED_IN_1_10_FOR (cogl_framebuffer_push_matrix)
 void
 cogl_push_matrix (void);
 
@@ -271,7 +287,10 @@ cogl_push_matrix (void);
  * cogl_pop_matrix:
  *
  * Restores the current model-view matrix from the matrix stack.
+ *
+ * Deprecated: 1.10: Use cogl_framebuffer_pop_matrix() instead
  */
+COGL_DEPRECATED_IN_1_10_FOR (cogl_framebuffer_push_matrix)
 void
 cogl_pop_matrix (void);
 
@@ -283,7 +302,10 @@ cogl_pop_matrix (void);
  *
  * Multiplies the current model-view matrix by one that scales the x,
  * y and z axes by the given values.
+ *
+ * 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,
@@ -297,7 +319,10 @@ cogl_scale (float x,
  *
  * Multiplies the current model-view matrix by one that translates the
  * model along all three axes according to the given values.
+ *
+ * Deprecated: 1.10: Use cogl_framebuffer_translate() instead
  */
+COGL_DEPRECATED_IN_1_10_FOR (cogl_framebuffer_translate)
 void
 cogl_translate (float x,
                 float y,
@@ -315,7 +340,10 @@ cogl_translate (float x,
  * follows the right-hand thumb rule so for example rotating by 10
  * degrees about the vertex (0, 0, 1) causes a small counter-clockwise
  * rotation.
+ *
+ * Deprecated: 1.10: Use cogl_framebuffer_rotate() instead
  */
+COGL_DEPRECATED_IN_1_10_FOR (cogl_framebuffer_rotate)
 void
 cogl_rotate (float angle,
              float x,
@@ -329,7 +357,9 @@ cogl_rotate (float angle,
  * Multiplies the current model-view matrix by the given matrix.
  *
  * 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);
 
@@ -338,7 +368,11 @@ cogl_transform (const CoglMatrix *matrix);
  * @matrix: (out): return location for the model-view matrix
  *
  * Stores the current model-view matrix in @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);
 
@@ -347,7 +381,11 @@ cogl_get_modelview_matrix (CoglMatrix *matrix);
  * @matrix: the new model-view matrix
  *
  * Loads @matrix as the new model-view 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);
 
@@ -356,7 +394,11 @@ cogl_set_modelview_matrix (CoglMatrix *matrix);
  * @matrix: (out): return location for the projection matrix
  *
  * Stores the current projection matrix in @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);
 
@@ -365,7 +407,11 @@ cogl_get_projection_matrix (CoglMatrix *matrix);
  * @matrix: the new projection matrix
  *
  * Loads matrix as the new projection 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);
 
@@ -377,7 +423,11 @@ cogl_set_projection_matrix (CoglMatrix *matrix);
  * Stores the current viewport in @v. @v[0] and @v[1] get the x and y
  * position of the viewport and @v[2] and @v[3] get the width and
  * height.
+ *
+ * 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]);
 
@@ -391,9 +441,9 @@ cogl_get_viewport (float v[4]);
  * clutter_actor_lower(), otherwise it will also take into account the
  * actor's depth. Depth testing is disabled by default.
  *
- * Deprecated: 1.4: Use cogl_material_set_depth_test_enabled()
- * instead.
+ * 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);
 
@@ -404,9 +454,9 @@ cogl_set_depth_test_enabled (CoglBool setting);
  *
  * Return value: %TRUE if depth testing is enabled, and %FALSE otherwise
  *
- * Deprecated: 1.4: Use cogl_material_get_depth_test_enabled()
- * instead.
+ * 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);
 
@@ -419,7 +469,10 @@ cogl_get_depth_test_enabled (void);
  * textures or fully closed cubes without enabling depth testing. This
  * only affects calls to the cogl_rectangle* family of functions and
  * cogl_vertex_buffer_draw*. Backface culling is disabled by default.
+ *
+ * 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);
 
@@ -430,7 +483,10 @@ cogl_set_backface_culling_enabled (CoglBool setting);
  * cogl_set_backface_culling_enabled()
  *
  * Return value: %TRUE if backface culling is enabled, and %FALSE otherwise
+ *
+ * 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);
 
@@ -458,7 +514,10 @@ cogl_get_backface_culling_enabled (void);
  * and use cogl_material_set_color() you can only use fogging with fully
  * opaque primitives. This might improve in the future when we can depend
  * on fragment shaders.</note>
+ *
+ * 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,
@@ -471,7 +530,10 @@ cogl_set_fog (const CoglColor *fog_color,
  *
  * This function disables fogging, so primitives drawn afterwards will not be
  * blended with any previously set 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);
 
@@ -483,7 +545,10 @@ cogl_disable_fog (void);
  *
  * Clears all the auxiliary buffers identified in the @buffers mask, and if
  * that includes the color buffer then the specified @color is used.
+ *
+ * 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);
@@ -498,7 +563,11 @@ cogl_clear (const CoglColor *color,
  * cogl_rectangle() or vertices drawn using cogl_vertex_buffer_draw().
  *
  * Since: 1.0
+ * Deprecated: 1.16: Latest drawing apis all take an explicit
+ *                   #CoglPipeline argument so this stack of
+ *                   #CoglMaterial<!-- -->s shouldn't be used.
  */
+COGL_DEPRECATED_IN_1_16
 void
 cogl_set_source (void *material);
 
@@ -517,7 +586,11 @@ cogl_set_source (void *material);
  * Return value: The current source material.
  *
  * Since: 1.6
+ * Deprecated: 1.16: Latest drawing apis all take an explicit
+ *                   #CoglPipeline argument so this stack of
+ *                   #CoglMaterial<!-- -->s shouldn't be used.
  */
+COGL_DEPRECATED_IN_1_16
 void *
 cogl_get_source (void);
 
@@ -530,7 +603,11 @@ cogl_get_source (void);
  * process later primitives as defined by cogl_set_source().
  *
  * Since: 1.6
+ * Deprecated: 1.16: Latest drawing apis all take an explicit
+ *                   #CoglPipeline argument so this stack of
+ *                   #CoglMaterial<!-- -->s shouldn't be used.
  */
+COGL_DEPRECATED_IN_1_16
 void
 cogl_push_source (void *material);
 
@@ -542,7 +619,11 @@ cogl_push_source (void *material);
  * later primitives as defined by cogl_set_source().
  *
  * Since: 1.6
+ * Deprecated: 1.16: Latest drawing apis all take an explicit
+ *                   #CoglPipeline argument so this stack of
+ *                   #CoglMaterial<!-- -->s shouldn't be used.
  */
+COGL_DEPRECATED_IN_1_16
 void
 cogl_pop_source (void);
 
@@ -562,7 +643,11 @@ cogl_pop_source (void);
  * if you already have the color components.
  *
  * Since: 1.0
+ * Deprecated: 1.16: Latest drawing apis all take an explicit
+ *                   #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);
 
@@ -581,7 +666,11 @@ cogl_set_source_color (const CoglColor *color);
  * between 0 and 255.
  *
  * Since: 1.0
+ * Deprecated: 1.16: Latest drawing apis all take an explicit
+ *                   #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,
@@ -604,7 +693,11 @@ cogl_set_source_color4ub (uint8_t red,
  * range, they will be clamped.
  *
  * Since: 1.0
+ * Deprecated: 1.16: Latest drawing apis all take an explicit
+ *                   #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,
@@ -630,7 +723,11 @@ cogl_set_source_color4f (float red,
  * </programlisting>
  *
  * Since: 1.0
+ * Deprecated: 1.16: Latest drawing apis all take an explicit
+ *                   #CoglPipeline argument so this stack of
+ *                   #CoglMaterial<!-- -->s shouldn't be used.
  */
+COGL_DEPRECATED_IN_1_16
 void
 cogl_set_source_texture (CoglTexture *texture);
 
@@ -644,8 +741,6 @@ cogl_set_source_texture (CoglTexture *texture);
  * intersected with the previous region.
  */
 
-#ifndef COGL_DISABLE_DEPRECATED
-
 /**
  * cogl_clip_push_window_rect:
  * @x_offset: left edge of the clip rectangle in window coordinates
@@ -662,15 +757,14 @@ cogl_set_source_texture (CoglTexture *texture);
  * The rectangle is intersected with the current clip region. To undo
  * the effect of this function, call cogl_clip_pop().
  *
- * Deprecated: 1.2: Use cogl_clip_push_window_rectangle() instead
+ * 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) G_GNUC_DEPRECATED;
-
-#endif /* COGL_DISABLE_DEPRECATED */
+                            float height);
 
 /**
  * cogl_clip_push_window_rectangle:
@@ -689,15 +783,15 @@ cogl_clip_push_window_rect (float x_offset,
  * the effect of this function, call cogl_clip_pop().
  *
  * 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);
 
-#ifndef COGL_DISABLE_DEPRECATED
-
 /**
  * cogl_clip_push:
  * @x_offset: left edge of the clip rectangle
@@ -714,19 +808,18 @@ cogl_clip_push_window_rectangle (int x_offset,
  * The rectangle is intersected with the current clip region. To undo
  * the effect of this function, call cogl_clip_pop().
  *
- * Deprecated: 1.2: The x, y, width, height arguments are inconsistent
+ * Deprecated: 1.16: The x, y, width, height arguments are inconsistent
  *   with other API that specify rectangles in model space, and when used
  *   with a coordinate space that puts the origin at the center and y+
- *   extending up, it's awkward to use. Please use cogl_clip_push_rectangle()
- *   instead
+ *   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) G_GNUC_DEPRECATED;
-
-#endif /* COGL_DISABLE_DEPRECATED */
+                float height);
 
 /**
  * cogl_clip_push_rectangle:
@@ -745,27 +838,16 @@ cogl_clip_push (float x_offset,
  * the effect of this function, call cogl_clip_pop().
  *
  * Since: 1.2
+ * 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_clip_push_from_path_preserve:
- *
- * Sets a new clipping area using the current path. The current path
- * is then cleared. The clipping area is intersected with the previous
- * clipping area. To restore the previous clipping area, call
- * cogl_clip_pop().
- *
- * Since: 1.0
- */
-void
-cogl_clip_push_from_path_preserve (void);
-
-#ifdef COGL_ENABLE_EXPERIMENTAL_2_0_API
 /**
  * cogl_clip_push_primitive:
  * @primitive: A #CoglPrimitive describing a flat 2D shape
@@ -773,11 +855,9 @@ cogl_clip_push_from_path_preserve (void);
  *             bounds
  * @bounds_y1: y coordinate for the top-left corner of the primitives
  *             bounds
- * @bounds_x2: x coordinate for the top-left corner of the primitives
+ * @bounds_x2: x coordinate for the bottom-right corner of the primitives
  *             bounds
- * @bounds_y2: x coordinate for the bottom-right corner of the
- *             primitives bounds.
- * @bounds_x1: y coordinate for the bottom-right corner of the
+ * @bounds_y2: y coordinate for the bottom-right corner of the
  *             primitives bounds.
  *
  * Sets a new clipping area using a 2D shaped described with a
@@ -795,26 +875,29 @@ cogl_clip_push_from_path_preserve (void);
  *
  * Since: 1.10
  * Stability: unstable
+ * 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);
-#endif
 
 /**
  * cogl_clip_pop:
  *
  * Reverts the clipping region to the state before the last call to
  * cogl_clip_push().
+ *
+ * Deprecated: 1.16: Use cogl_framebuffer_pop_clip() instead
  */
+COGL_DEPRECATED_IN_1_16_FOR (cogl_framebuffer_pop_clip)
 void
 cogl_clip_pop (void);
 
-#ifndef COGL_DISABLE_DEPRECATED
-
 /**
  * cogl_clip_ensure:
  *
@@ -827,8 +910,9 @@ cogl_clip_pop (void);
  *
  * Since: 1.0
  */
+COGL_DEPRECATED
 void
-cogl_clip_ensure (void) G_GNUC_DEPRECATED;
+cogl_clip_ensure (void);
 
 /**
  * cogl_clip_stack_save:
@@ -847,8 +931,9 @@ cogl_clip_ensure (void) G_GNUC_DEPRECATED;
  *
  * Since: 0.8.2
  */
+COGL_DEPRECATED
 void
-cogl_clip_stack_save (void) G_GNUC_DEPRECATED;
+cogl_clip_stack_save (void);
 
 /**
  * cogl_clip_stack_restore:
@@ -864,10 +949,9 @@ cogl_clip_stack_save (void) G_GNUC_DEPRECATED;
  *
  * Since: 0.8.2
  */
+COGL_DEPRECATED
 void
-cogl_clip_stack_restore (void) G_GNUC_DEPRECATED;
-
-#endif /* COGL_DISABLE_DEPRECATED */
+cogl_clip_stack_restore (void);
 
 /**
  * cogl_set_framebuffer:
@@ -878,7 +962,11 @@ cogl_clip_stack_restore (void) G_GNUC_DEPRECATED;
  * or in the future it may be an onscreen framebuffers too.
  *
  * Since: 1.2
+ * Deprecated: 1.16: The latest drawing apis take explicit
+ *                   #CoglFramebuffer arguments so this stack of
+ *                   framebuffers shouldn't be used anymore.
  */
+COGL_DEPRECATED_IN_1_16
 void
 cogl_set_framebuffer (CoglFramebuffer *buffer);
 
@@ -959,7 +1047,11 @@ cogl_set_framebuffer (CoglFramebuffer *buffer);
  * The previous framebuffer can be restored by calling cogl_pop_framebuffer()
  *
  * Since: 1.2
+ * Deprecated: 1.16: The latest drawing apis take explicit
+ *                   #CoglFramebuffer arguments so this stack of
+ *                   framebuffers shouldn't be used anymore.
  */
+COGL_DEPRECATED_IN_1_16
 void
 cogl_push_framebuffer (CoglFramebuffer *buffer);
 
@@ -970,12 +1062,14 @@ cogl_push_framebuffer (CoglFramebuffer *buffer);
  * All subsequent drawing will be redirected to this framebuffer.
  *
  * Since: 1.2
+ * Deprecated: 1.16: The latest drawing apis take explicit
+ *                   #CoglFramebuffer arguments so this stack of
+ *                   framebuffers shouldn't be used anymore.
  */
+COGL_DEPRECATED_IN_1_16
 void
 cogl_pop_framebuffer (void);
 
-#ifndef COGL_DISABLE_DEPRECATED
-
 /**
  * cogl_set_draw_buffer:
  * @target: A #CoglBufferTarget that specifies what kind of framebuffer you
@@ -988,34 +1082,40 @@ cogl_pop_framebuffer (void);
  * cogl_offscreen_new_to_texture () or you can revert to your original
  * on screen window buffer.
  *
- * Deprecated: 1.2: The target argument was redundant since we could look at
- *    the type of CoglHandle given instead.
+ * Deprecated: 1.16: The latest drawing apis take explicit
+ *                   #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) G_GNUC_DEPRECATED;
+                      CoglHandle offscreen);
 
 /**
  * cogl_push_draw_buffer:
  *
  * Save cogl_set_draw_buffer() state.
  *
- * Deprecated: 1.2: The draw buffer API was replaced with a framebuffer API
+ * Deprecated: 1.16: The latest drawing apis take explicit
+ *                   #CoglFramebuffer arguments so this stack of
+ *                   framebuffers shouldn't be used anymore.
  */
+COGL_DEPRECATED_IN_1_16
 void
-cogl_push_draw_buffer (void) COGL_GNUC_DEPRECATED;
+cogl_push_draw_buffer (void);
 
 /**
  * cogl_pop_draw_buffer:
  *
  * Restore cogl_set_draw_buffer() state.
  *
- * Deprecated: 1.2: The draw buffer API was replaced with a framebuffer API
+ * Deprecated: 1.16: The latest drawing apis take explicit
+ *                   #CoglFramebuffer arguments so this stack of
+ *                   framebuffers shouldn't be used anymore.
  */
+COGL_DEPRECATED_IN_1_16
 void
-cogl_pop_draw_buffer (void) COGL_GNUC_DEPRECATED;
-
-#endif /* COGL_DISABLE_DEPRECATED */
+cogl_pop_draw_buffer (void);
 
 /**
  * cogl_read_pixels:
@@ -1038,7 +1138,10 @@ cogl_pop_draw_buffer (void) COGL_GNUC_DEPRECATED;
  * read the pixel values without any conversion you should either
  * specify a format that doesn't use an alpha channel or use one of
  * the formats ending in PRE.
+ *
+ * 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,
@@ -1149,7 +1252,9 @@ cogl_flush (void);
  * OpenGL.
  *
  * Since: 1.0
+ * Deprecated: 1.16: Use the #CoglGLES2Context api instead
  */
+COGL_DEPRECATED_IN_1_16_FOR (CoglGLES2Context_API)
 void
 cogl_begin_gl (void);
 
@@ -1160,7 +1265,9 @@ cogl_begin_gl (void);
  * code using raw OpenGL. Please refer to cogl_begin_gl() for full details.
  *
  * Since: 1.0
+ * Deprecated: 1.16: Use the #CoglGLES2Context api instead
  */
+COGL_DEPRECATED_IN_1_16_FOR (CoglGLES2Context_API)
 void
 cogl_end_gl (void);