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

data/vendor/local/include/cogl/cogl/cogl-frame-info.h

@@ -116,8 +116,8 @@ float cogl_frame_info_get_refresh_rate (CoglFrameInfo *info);
  *
  * Gets the #CoglOutput that the swapped frame was presented to.
  *
- * Return value: The #CoglOutput that the frame was presented to, or
- *               %NULL if this could not be determined.
+ * Return value: (transfer none): The #CoglOutput that the frame was
+ *        presented to, or %NULL if this could not be determined.
  * Since: 1.14
  * Stability: unstable
  */

data/vendor/local/include/cogl/cogl/cogl-framebuffer.h

@@ -32,11 +32,10 @@
 #include <windows.h>
 #endif /* COGL_HAS_WIN32_SUPPORT */
 
-#ifdef COGL_ENABLE_EXPERIMENTAL_2_0_API
-#include <cogl/cogl2-path.h>
-#else
-#include <cogl/cogl-path.h>
-#endif
+/* We forward declare the CoglFramebuffer type here to avoid some circular
+ * dependency issues with the following headers.
+ */
+typedef struct _CoglFramebuffer CoglFramebuffer;
 
 #include <cogl/cogl-pipeline.h>
 #include <cogl/cogl-indices.h>
@@ -71,7 +70,7 @@ COGL_BEGIN_DECLS
  *
  * If you want to create a new framebuffer then you should start by
  * looking at the #CoglOnscreen and #CoglOffscreen constructor
- * functions, such as cogl_offscreen_new_to_texture() or
+ * functions, such as cogl_offscreen_new_with_texture() or
  * cogl_onscreen_new(). The #CoglFramebuffer interface deals with
  * all aspects that are common between those two types of framebuffer.
  *
@@ -87,8 +86,6 @@ COGL_BEGIN_DECLS
  * configuration.
  */
 
-typedef struct _CoglFramebuffer CoglFramebuffer;
-
 #ifdef COGL_ENABLE_EXPERIMENTAL_API
 
 #define COGL_FRAMEBUFFER(X) ((CoglFramebuffer *)(X))
@@ -595,23 +592,6 @@ cogl_framebuffer_push_rectangle_clip (CoglFramebuffer *framebuffer,
                                       float x_2,
                                       float y_2);
 
-/**
- * cogl_framebuffer_push_path_clip:
- * @framebuffer: A #CoglFramebuffer pointer
- * @path: The path to clip with.
- *
- * Sets a new clipping area using the silhouette of the specified,
- * filled @path.  The clipping area is intersected with the previous
- * clipping area. To restore the previous clipping area, call
- * cogl_framebuffer_pop_clip().
- *
- * Since: 1.0
- * Stability: unstable
- */
-void
-cogl_framebuffer_push_path_clip (CoglFramebuffer *framebuffer,
-                                 CoglPath *path);
-
 /**
  * cogl_framebuffer_push_primitive_clip:
  * @framebuffer: A #CoglFramebuffer pointer
@@ -815,7 +795,7 @@ cogl_framebuffer_set_color_mask (CoglFramebuffer *framebuffer,
  *
  * Queries the common #CoglPixelFormat of all color buffers attached
  * to this framebuffer. For an offscreen framebuffer created with
- * cogl_offscreen_new_to_texture() this will correspond to the format
+ * cogl_offscreen_new_with_texture() this will correspond to the format
  * of the texture.
  *
  * Since: 1.8
@@ -1035,8 +1015,8 @@ cogl_framebuffer_resolve_samples_region (CoglFramebuffer *framebuffer,
  * instantiated within. This is the #CoglContext that was passed to
  * cogl_onscreen_new() for example.
  *
- * Return value: The #CoglContext that the given @framebuffer was
- *               instantiated within.
+ * Return value: (transfer none): The #CoglContext that the given
+ *               @framebuffer was instantiated within.
  * Since: 1.8
  * Stability: unstable
  */
@@ -1111,7 +1091,10 @@ cogl_framebuffer_clear4f (CoglFramebuffer *framebuffer,
  *
  * Stability: unstable
  * Since: 1.10
+ * Deprecated: 1.16: Use #CoglPrimitive<!-- -->s and
+ *                   cogl_primitive_draw() instead
  */
+COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_draw)
 void
 cogl_framebuffer_draw_primitive (CoglFramebuffer *framebuffer,
                                  CoglPipeline *pipeline,
@@ -1146,7 +1129,10 @@ cogl_framebuffer_draw_primitive (CoglFramebuffer *framebuffer,
  *
  * Stability: unstable
  * Since: 1.10
+ * Deprecated: 1.16: Use #CoglPrimitive<!-- -->s and
+ *                   cogl_primitive_draw() instead
  */
+COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_draw)
 void
 cogl_framebuffer_vdraw_attributes (CoglFramebuffer *framebuffer,
                                    CoglPipeline *pipeline,
@@ -1190,7 +1176,10 @@ cogl_framebuffer_vdraw_attributes (CoglFramebuffer *framebuffer,
  *
  * Stability: unstable
  * Since: 1.10
+ * Deprecated: 1.16: Use #CoglPrimitive<!-- -->s and
+ *                   cogl_primitive_draw() instead
  */
+COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_draw)
 void
 cogl_framebuffer_draw_attributes (CoglFramebuffer *framebuffer,
                                   CoglPipeline *pipeline,
@@ -1253,7 +1242,10 @@ cogl_framebuffer_draw_attributes (CoglFramebuffer *framebuffer,
  *
  * Stability: unstable
  * Since: 1.10
+ * Deprecated: 1.16: Use #CoglPrimitive<!-- -->s and
+ *                   cogl_primitive_draw() instead
  */
+COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_draw)
 void
 cogl_framebuffer_vdraw_indexed_attributes (CoglFramebuffer *framebuffer,
                                            CoglPipeline *pipeline,
@@ -1318,7 +1310,10 @@ cogl_framebuffer_vdraw_indexed_attributes (CoglFramebuffer *framebuffer,
  *
  * Stability: unstable
  * Since: 1.10
+ * Deprecated: 1.16: Use #CoglPrimitive<!-- -->s and
+ *                   cogl_primitive_draw() instead
  */
+COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_draw)
 void
 cogl_framebuffer_draw_indexed_attributes (CoglFramebuffer *framebuffer,
                                           CoglPipeline *pipeline,
@@ -1387,11 +1382,9 @@ cogl_framebuffer_draw_rectangle (CoglFramebuffer *framebuffer,
  * This is a high level drawing api that can handle any kind of
  * #CoglMetaTexture texture such as #CoglTexture2DSliced textures
  * which may internally be comprised of multiple low-level textures.
- * This is unlike low-level drawing apis such as
- * cogl_framebuffer_draw_primitive() or
- * cogl_framebuffer_draw_attributes() which only support low level
- * texture types that are directly supported by GPUs such as
- * #CoglTexture2D.
+ * This is unlike low-level drawing apis such as cogl_primitive_draw()
+ * which only support low level texture types that are directly
+ * supported by GPUs such as #CoglTexture2D.
  *
  * <note>The given texture coordinates will only be used for the first
  * texture layer of the pipeline and if your pipeline has more than
@@ -1454,10 +1447,8 @@ cogl_framebuffer_draw_textured_rectangle (CoglFramebuffer *framebuffer,
  * #CoglMetaTexture texture for the first layer such as
  * #CoglTexture2DSliced textures which may internally be comprised of
  * multiple low-level textures.  This is unlike low-level drawing apis
- * such as cogl_framebuffer_draw_primitive() or
- * cogl_framebuffer_draw_attributes() which only support low level
- * texture types that are directly supported by GPUs such as
- * #CoglTexture2D.
+ * such as cogl_primitive_draw() which only support low level texture
+ * types that are directly supported by GPUs such as #CoglTexture2D.
  *
  * <note>This api can not currently handle multiple high-level meta
  * texture layers. The first layer may be a high level meta texture
@@ -1562,11 +1553,9 @@ cogl_framebuffer_draw_rectangles (CoglFramebuffer *framebuffer,
  * This is a high level drawing api that can handle any kind of
  * #CoglMetaTexture texture such as #CoglTexture2DSliced textures
  * which may internally be comprised of multiple low-level textures.
- * This is unlike low-level drawing apis such as
- * cogl_framebuffer_draw_primitive() or
- * cogl_framebuffer_draw_attributes() which only support low level
- * texture types that are directly supported by GPUs such as
- * #CoglTexture2D.
+ * This is unlike low-level drawing apis such as cogl_primitive_draw()
+ * which only support low level texture types that are directly
+ * supported by GPUs such as #CoglTexture2D.
  *
  * The top left corner of the first rectangle is positioned at
  * (coordinates[0], coordinates[1]) and the bottom right corner is
@@ -1602,47 +1591,6 @@ cogl_framebuffer_draw_textured_rectangles (CoglFramebuffer *framebuffer,
                                            const float *coordinates,
                                            unsigned int n_rectangles);
 
-/**
- * cogl_framebuffer_fill_path:
- * @framebuffer: A #CoglFramebuffer
- * @pipeline: A #CoglPipeline to render with
- * @path: The #CoglPath to fill
- *
- * Fills the interior of the path using the fragment operations
- * defined by the pipeline.
- *
- * The interior of the shape is determined using the fill rule of the
- * path. See %CoglPathFillRule for details.
- *
- * <note>The result of referencing sliced textures in your current
- * pipeline when filling a path are undefined. You should pass
- * the %COGL_TEXTURE_NO_SLICING flag when loading any texture you will
- * use while filling a path.</note>
- *
- * Since: 2.0
- */
-void
-cogl_framebuffer_fill_path (CoglFramebuffer *framebuffer,
-                            CoglPipeline *pipeline,
-                            CoglPath *path);
-
-/**
- * cogl_framebuffer_stroke_path:
- * @framebuffer: A #CoglFramebuffer
- * @pipeline: A #CoglPipeline to render with
- * @path: The #CoglPath to stroke
- *
- * Strokes the edge of the path using the fragment operations defined
- * by the pipeline. The stroke line will have a width of 1 pixel
- * regardless of the current transformation matrix.
- *
- * Since: 2.0
- */
-void
-cogl_framebuffer_stroke_path (CoglFramebuffer *framebuffer,
-                              CoglPipeline *pipeline,
-                              CoglPath *path);
-
 /* XXX: Should we take an n_buffers + buffer id array instead of using
  * the CoglBufferBits type which doesn't seem future proof? */
 /**
@@ -1783,7 +1731,7 @@ cogl_framebuffer_read_pixels (CoglFramebuffer *framebuffer,
  * Gets the current #CoglFramebuffer as set using
  * cogl_push_framebuffer()
  *
- * Return value: The current #CoglFramebuffer
+ * Return value: (transfer none): The current #CoglFramebuffer
  * Stability: unstable
  * Since: 1.8
  */

data/vendor/local/include/cogl/cogl/cogl-glib-source.h

@@ -40,11 +40,21 @@ G_BEGIN_DECLS
  *
  * Creates a #GSource which handles Cogl's internal system event
  * processing. This can be used as a convenience instead of
- * cogl_poll_get_info() and cogl_poll_dispatch() in applications that
- * are already using the GLib main loop. After this is called the
- * #GSource should be attached to the main loop using
+ * cogl_poll_renderer_get_info() and cogl_poll_renderer_dispatch() in
+ * applications that are already using the GLib main loop. After this
+ * is called the #GSource should be attached to the main loop using
  * g_source_attach().
  *
+ * Applications that manually connect to a #CoglRenderer before they
+ * create a #CoglContext should instead use
+ * cogl_glib_renderer_source_new() so that events may be dispatched
+ * before a context has been created. In that case you don't need to
+ * use this api in addition later, it is simply enough to use
+ * cogl_glib_renderer_source_new() instead.
+ *
+ * <note>This api is actually just a thin convenience wrapper around
+ * cogl_glib_renderer_source_new()</note>
+ *
  * Return value: a new #GSource
  *
  * Stability: unstable
@@ -54,6 +64,27 @@ GSource *
 cogl_glib_source_new (CoglContext *context,
                       int priority);
 
+/**
+ * cogl_glib_renderer_source_new:
+ * @renderer: A #CoglRenderer
+ * @priority: The priority of the #GSource
+ *
+ * Creates a #GSource which handles Cogl's internal system event
+ * processing. This can be used as a convenience instead of
+ * cogl_poll_renderer_get_info() and cogl_poll_renderer_dispatch() in
+ * applications that are already using the GLib main loop. After this
+ * is called the #GSource should be attached to the main loop using
+ * g_source_attach().
+ *
+ * Return value: a new #GSource
+ *
+ * Stability: unstable
+ * Since: 1.16
+ */
+GSource *
+cogl_glib_renderer_source_new (CoglRenderer *renderer,
+                               int priority);
+
 G_END_DECLS
 
 #endif /* __COGL_GSOURCE_H__ */

data/vendor/local/include/cogl/cogl/cogl-index-buffer.h

@@ -57,6 +57,8 @@ typedef struct _CoglIndexBuffer	      CoglIndexBuffer;
  * cogl_buffer_set_data() or by mapping it into the application's
  * address space using cogl_buffer_map().
  *
+ * Return value: (transfer full): A newly allocated #CoglIndexBuffer
+ *
  * Since: 1.4
  * Stability: Unstable
  */

data/vendor/local/include/cogl/cogl/cogl-macros.h

@@ -0,0 +1,253 @@
+/*
+ * Cogl.
+ *
+ * An OpenGL based 'interactive canvas' library.
+ *
+ * Copyright (C) 2012 Intel Corporation
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
+#error "Only <cogl/cogl.h> can be included directly."
+#endif
+
+#ifndef __COGL_MACROS_H__
+#define __COGL_MACROS_H__
+
+#include <cogl/cogl-version.h>
+
+/* These macros are used to mark deprecated functions, and thus have
+ * to be exposed in a public header.
+ *
+ * They are only intended for internal use and should not be used by
+ * other projects.
+ */
+#if defined(COGL_DISABLE_DEPRECATION_WARNINGS) || defined(COGL_COMPILATION)
+
+#define COGL_DEPRECATED
+#define COGL_DEPRECATED_FOR(f)
+#define COGL_UNAVAILABLE(maj,min)
+
+#else /* COGL_DISABLE_DEPRECATION_WARNINGS */
+
+#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
+#define COGL_DEPRECATED __attribute__((__deprecated__))
+#elif defined(_MSC_VER) && (_MSC_VER >= 1300)
+#define COGL_DEPRECATED __declspec(deprecated)
+#else
+#define COGL_DEPRECATED
+#endif
+
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
+#define COGL_DEPRECATED_FOR(f) __attribute__((__deprecated__("Use '" #f "' instead")))
+#elif defined(_MSC_FULL_VER) && (_MSC_FULL_VER > 140050320)
+#define COGL_DEPRECATED_FOR(f) __declspec(deprecated("is deprecated. Use '" #f "' instead"))
+#else
+#define COGL_DEPRECATED_FOR(f) G_DEPRECATED
+#endif
+
+#if    __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
+#define COGL_UNAVAILABLE(maj,min) __attribute__((deprecated("Not available before " #maj "." #min)))
+#elif defined(_MSC_FULL_VER) && (_MSC_FULL_VER > 140050320)
+#define COGL_UNAVAILABLE(maj,min) __declspec(deprecated("is not available before " #maj "." #min))
+#else
+#define COGL_UNAVAILABLE(maj,min)
+#endif
+
+#endif /* COGL_DISABLE_DEPRECATION_WARNINGS */
+
+/**
+ * COGL_VERSION_MIN_REQUIRED:
+ *
+ * A macro that should be defined by the user prior to including the
+ * cogl.h header.
+ *
+ * The definition should be one of the predefined Cogl version macros,
+ * such as: %COGL_VERSION_1_8, %COGL_VERSION_1_10, ...
+ *
+ * This macro defines the lower bound for the Cogl API to be used.
+ *
+ * If a function has been deprecated in a newer version of Cogl, it
+ * is possible to use this symbol to avoid the compiler warnings without
+ * disabling warnings for every deprecated function.
+ *
+ * Since: 1.16
+ */
+#ifndef COGL_VERSION_MIN_REQUIRED
+# define COGL_VERSION_MIN_REQUIRED (COGL_VERSION_CURRENT_STABLE)
+#endif
+
+/**
+ * COGL_VERSION_MAX_ALLOWED:
+ *
+ * A macro that should be define by the user prior to including the
+ * cogl.h header.
+ *
+ * The definition should be one of the predefined Cogl version macros,
+ * such as: %COGL_VERSION_1_0, %COGL_VERSION_1_2, ...
+ *
+ * This macro defines the upper bound for the Cogl API to be used.
+ *
+ * If a function has been introduced in a newer version of Cogl, it
+ * is possible to use this symbol to get compiler warnings when trying
+ * to use that function.
+ *
+ * Since: 1.16
+ */
+#ifndef COGL_VERSION_MAX_ALLOWED
+# if COGL_VERSION_MIN_REQUIRED > COGL_VERSION_PREVIOUS_STABLE
+#  define COGL_VERSION_MAX_ALLOWED COGL_VERSION_MIN_REQUIRED
+# else
+#  define COGL_VERSION_MAX_ALLOWED COGL_VERSION_CURRENT_STABLE
+# endif
+#endif
+
+/* sanity checks */
+#if COGL_VERSION_MAX_ALLOWED < COGL_VERSION_MIN_REQUIRED
+# error "COGL_VERSION_MAX_ALLOWED must be >= COGL_VERSION_MIN_REQUIRED"
+#endif
+#if COGL_VERSION_MIN_REQUIRED < COGL_VERSION_1_0
+# error "COGL_VERSION_MIN_REQUIRED must be >= COGL_VERSION_1_0"
+#endif
+
+/* XXX: Every new stable minor release should add a set of macros here */
+#if COGL_VERSION_MIN_REQUIRED >= COGL_VERSION_1_0
+# define COGL_DEPRECATED_IN_1_0              COGL_DEPRECATED
+# define COGL_DEPRECATED_IN_1_0_FOR(f)       COGL_DEPRECATED_FOR(f)
+#else
+# define COGL_DEPRECATED_IN_1_0
+# define COGL_DEPRECATED_IN_1_0_FOR(f)
+#endif
+
+#if COGL_VERSION_MAX_ALLOWED < COGL_VERSION_1_0
+# define COGL_AVAILABLE_IN_1_0               COGL_UNAVAILABLE(1, 0)
+#else
+# define COGL_AVAILABLE_IN_1_0
+#endif
+
+#if COGL_VERSION_MIN_REQUIRED >= COGL_VERSION_1_2
+# define COGL_DEPRECATED_IN_1_2              COGL_DEPRECATED
+# define COGL_DEPRECATED_IN_1_2_FOR(f)       COGL_DEPRECATED_FOR(f)
+#else
+# define COGL_DEPRECATED_IN_1_2
+# define COGL_DEPRECATED_IN_1_2_FOR(f)
+#endif
+
+#if COGL_VERSION_MAX_ALLOWED < COGL_VERSION_1_2
+# define COGL_AVAILABLE_IN_1_2               COGL_UNAVAILABLE(1, 2)
+#else
+# define COGL_AVAILABLE_IN_1_2
+#endif
+
+#if COGL_VERSION_MIN_REQUIRED >= COGL_VERSION_1_4
+# define COGL_DEPRECATED_IN_1_4              COGL_DEPRECATED
+# define COGL_DEPRECATED_IN_1_4_FOR(f)       COGL_DEPRECATED_FOR(f)
+#else
+# define COGL_DEPRECATED_IN_1_4
+# define COGL_DEPRECATED_IN_1_4_FOR(f)
+#endif
+
+#if COGL_VERSION_MAX_ALLOWED < COGL_VERSION_1_4
+# define COGL_AVAILABLE_IN_1_4               COGL_UNAVAILABLE(1, 4)
+#else
+# define COGL_AVAILABLE_IN_1_4
+#endif
+
+#if COGL_VERSION_MIN_REQUIRED >= COGL_VERSION_1_6
+# define COGL_DEPRECATED_IN_1_6              COGL_DEPRECATED
+# define COGL_DEPRECATED_IN_1_6_FOR(f)       COGL_DEPRECATED_FOR(f)
+#else
+# define COGL_DEPRECATED_IN_1_6
+# define COGL_DEPRECATED_IN_1_6_FOR(f)
+#endif
+
+#if COGL_VERSION_MAX_ALLOWED < COGL_VERSION_1_6
+# define COGL_AVAILABLE_IN_1_6               COGL_UNAVAILABLE(1, 6)
+#else
+# define COGL_AVAILABLE_IN_1_6
+#endif
+
+#if COGL_VERSION_MIN_REQUIRED >= COGL_VERSION_1_8
+# define COGL_DEPRECATED_IN_1_8              COGL_DEPRECATED
+# define COGL_DEPRECATED_IN_1_8_FOR(f)       COGL_DEPRECATED_FOR(f)
+#else
+# define COGL_DEPRECATED_IN_1_8
+# define COGL_DEPRECATED_IN_1_8_FOR(f)
+#endif
+
+#if COGL_VERSION_MAX_ALLOWED < COGL_VERSION_1_8
+# define COGL_AVAILABLE_IN_1_8               COGL_UNAVAILABLE(1, 8)
+#else
+# define COGL_AVAILABLE_IN_1_8
+#endif
+
+#if COGL_VERSION_MIN_REQUIRED >= COGL_VERSION_1_10
+# define COGL_DEPRECATED_IN_1_10             COGL_DEPRECATED
+# define COGL_DEPRECATED_IN_1_10_FOR(f)      COGL_DEPRECATED_FOR(f)
+#else
+# define COGL_DEPRECATED_IN_1_10
+# define COGL_DEPRECATED_IN_1_10_FOR(f)
+#endif
+
+#if COGL_VERSION_MAX_ALLOWED < COGL_VERSION_1_10
+# define COGL_AVAILABLE_IN_1_10              COGL_UNAVAILABLE(1, 10)
+#else
+# define COGL_AVAILABLE_IN_1_10
+#endif
+
+#if COGL_VERSION_MIN_REQUIRED >= COGL_VERSION_1_12
+# define COGL_DEPRECATED_IN_1_12             COGL_DEPRECATED
+# define COGL_DEPRECATED_IN_1_12_FOR(f)      COGL_DEPRECATED_FOR(f)
+#else
+# define COGL_DEPRECATED_IN_1_12
+# define COGL_DEPRECATED_IN_1_12_FOR(f)
+#endif
+
+#if COGL_VERSION_MAX_ALLOWED < COGL_VERSION_1_12
+# define COGL_AVAILABLE_IN_1_12              COGL_UNAVAILABLE(1, 12)
+#else
+# define COGL_AVAILABLE_IN_1_12
+#endif
+
+#if COGL_VERSION_MIN_REQUIRED >= COGL_VERSION_1_14
+# define COGL_DEPRECATED_IN_1_14             COGL_DEPRECATED
+# define COGL_DEPRECATED_IN_1_14_FOR(f)      COGL_DEPRECATED_FOR(f)
+#else
+# define COGL_DEPRECATED_IN_1_14
+# define COGL_DEPRECATED_IN_1_14_FOR(f)
+#endif
+
+#if COGL_VERSION_MAX_ALLOWED < COGL_VERSION_1_14
+# define COGL_AVAILABLE_IN_1_14              COGL_UNAVAILABLE(1, 14)
+#else
+# define COGL_AVAILABLE_IN_1_14
+#endif
+
+#if COGL_VERSION_MIN_REQUIRED >= COGL_VERSION_1_16
+# define COGL_DEPRECATED_IN_1_16             COGL_DEPRECATED
+# define COGL_DEPRECATED_IN_1_16_FOR(f)      COGL_DEPRECATED_FOR(f)
+#else
+# define COGL_DEPRECATED_IN_1_16
+# define COGL_DEPRECATED_IN_1_16_FOR(f)
+#endif
+
+#if COGL_VERSION_MAX_ALLOWED < COGL_VERSION_1_16
+# define COGL_AVAILABLE_IN_1_16              COGL_UNAVAILABLE(1, 16)
+#else
+# define COGL_AVAILABLE_IN_1_16
+#endif
+
+#endif /* __COGL_MACROS_H__ */