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

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

@@ -99,7 +99,8 @@ typedef int CoglBool;
 #define COGL_GNUC_NULL_TERMINATED
 #endif
 
-#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
+#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) && \
+  !defined (COGL_COMPILATION)
 #define COGL_GNUC_DEPRECATED                       \
   __attribute__((__deprecated__))
 #else

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

@@ -3,7 +3,7 @@
  *
  * An object oriented GL/GLES Abstraction/Utility Layer
  *
- * Copyright (C) 2012 Intel Corporation.
+ * Copyright (C) 2012,2013 Intel Corporation.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -16,7 +16,8 @@
  * 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/>.
+ * License along with this library. If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  *
  */
@@ -33,7 +34,39 @@
  * Cogl offers a set of macros for checking the version of the library
  * at compile time.
  *
- * Since: 1.12.0
+ * Cogl adds version information to both API deprecations and additions;
+ * by definining the macros %COGL_VERSION_MIN_REQUIRED and
+ * %COGL_VERSION_MAX_ALLOWED, you can specify the range of Cogl versions
+ * whose API you want to use. Functions that were deprecated before, or
+ * introduced after, this range will trigger compiler warnings. For instance,
+ * if we define the following symbols:
+ *
+ * |[
+ *   COGL_VERSION_MIN_REQUIRED = COGL_VERSION_1_6
+ *   COGL_VERSION_MAX_ALLOWED  = COGL_VERSION_1_8
+ * ]|
+ *
+ * and we have the following functions annotated in the Cogl headers:
+ *
+ * |[
+ *   COGL_DEPRECATED_IN_1_4 void cogl_function_A (void);
+ *   COGL_DEPRECATED_IN_1_6 void cogl_function_B (void);
+ *   COGL_AVAILABLE_IN_1_8 void cogl_function_C (void);
+ *   COGL_AVAILABLE_IN_1_10 void cogl_function_D (void);
+ * ]|
+ *
+ * then any application code using the functions above will get the output:
+ *
+ * |[
+ *   cogl_function_A: deprecation warning
+ *   cogl_function_B: no warning
+ *   cogl_function_C: no warning
+ *   cogl_function_D: symbol not available warning
+ * ]|
+ *
+ * It is possible to disable the compiler warnings by defining the macro
+ * %COGL_DISABLE_DEPRECATION_WARNINGS before including the cogl.h
+ * header.
  */
 
 /**
@@ -182,4 +215,118 @@
 #define COGL_VERSION_CHECK(major, minor, micro) \
   (COGL_VERSION >= COGL_VERSION_ENCODE (major, minor, micro))
 
+/**
+ * COGL_VERSION_1_0:
+ *
+ * A macro that evaluates to the 1.0 version of Cogl, in a format
+ * that can be used by the C pre-processor.
+ *
+ * Since: 1.16
+ */
+#define COGL_VERSION_1_0 (COGL_VERSION_ENCODE (1, 0, 0))
+
+/**
+ * COGL_VERSION_1_2:
+ *
+ * A macro that evaluates to the 1.2 version of Cogl, in a format
+ * that can be used by the C pre-processor.
+ *
+ * Since: 1.16
+ */
+#define COGL_VERSION_1_2 (COGL_VERSION_ENCODE (1, 2, 0))
+
+/**
+ * COGL_VERSION_1_4:
+ *
+ * A macro that evaluates to the 1.4 version of Cogl, in a format
+ * that can be used by the C pre-processor.
+ *
+ * Since: 1.16
+ */
+#define COGL_VERSION_1_4 (COGL_VERSION_ENCODE (1, 4, 0))
+
+/**
+ * COGL_VERSION_1_6:
+ *
+ * A macro that evaluates to the 1.6 version of Cogl, in a format
+ * that can be used by the C pre-processor.
+ *
+ * Since: 1.16
+ */
+#define COGL_VERSION_1_6 (COGL_VERSION_ENCODE (1, 6, 0))
+
+/**
+ * COGL_VERSION_1_8:
+ *
+ * A macro that evaluates to the 1.8 version of Cogl, in a format
+ * that can be used by the C pre-processor.
+ *
+ * Since: 1.16
+ */
+#define COGL_VERSION_1_8 (COGL_VERSION_ENCODE (1, 8, 0))
+
+/**
+ * COGL_VERSION_1_10:
+ *
+ * A macro that evaluates to the 1.10 version of Cogl, in a format
+ * that can be used by the C pre-processor.
+ *
+ * Since: 1.16
+ */
+#define COGL_VERSION_1_10 (COGL_VERSION_ENCODE (1, 10, 0))
+
+/**
+ * COGL_VERSION_1_12:
+ *
+ * A macro that evaluates to the 1.12 version of Cogl, in a format
+ * that can be used by the C pre-processor.
+ *
+ * Since: 1.16
+ */
+#define COGL_VERSION_1_12 (COGL_VERSION_ENCODE (1, 12, 0))
+
+/**
+ * COGL_VERSION_1_14:
+ *
+ * A macro that evaluates to the 1.14 version of Cogl, in a format
+ * that can be used by the C pre-processor.
+ *
+ * Since: 1.16
+ */
+#define COGL_VERSION_1_14 (COGL_VERSION_ENCODE (1, 14, 0))
+
+/**
+ * COGL_VERSION_1_16:
+ *
+ * A macro that evaluates to the 1.16 version of Cogl, in a format
+ * that can be used by the C pre-processor.
+ *
+ * Since: 1.16
+ */
+#define COGL_VERSION_1_16 (COGL_VERSION_ENCODE (1, 16, 0))
+
+/* evaluates to the current stable version; for development cycles,
+ * this means the next stable target
+ */
+#if (COGL_VERSION_MINOR_INTERNAL % 2)
+#define COGL_VERSION_CURRENT_STABLE \
+  (COGL_VERSION_ENCODE (COGL_VERSION_MAJOR_INTERNAL, \
+                        COGL_VERSION_MINOR_INTERNAL + 1, 0))
+#else
+#define COGL_VERSION_CURRENT_STABLE \
+  (COGL_VERSION_ENCODE (COGL_VERSION_MAJOR_INTERNAL, \
+                        COGL_VERSION_MINOR_INTERNAL, 0))
+#endif
+
+/* evaluates to the previous stable version */
+#if (COGL_VERSION_MINOR_INTERNAL % 2)
+#define COGL_VERSION_PREVIOUS_STABLE \
+  (COGL_VERSION_ENCODE (COGL_VERSION_MAJOR_INTERNAL, \
+                        COGL_VERSION_MINOR_INTERNAL - 1, 0))
+#else
+#define COGL_VERSION_PREVIOUS_STABLE \
+  (COGL_VERSION_ENCODE (COGL_VERSION_MAJOR_INTERNAL, \
+                        COGL_VERSION_MINOR_INTERNAL - 2, 0))
+#endif
+
 #endif /* __COGL_VERSION_H__ */

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

@@ -34,6 +34,7 @@
 #include <glib.h>
 #include <cogl/cogl-defines.h>
 #include <cogl/cogl-types.h>
+#include <cogl/cogl-macros.h>
 
 COGL_BEGIN_DECLS
 
@@ -82,7 +83,9 @@ COGL_BEGIN_DECLS
  * Creates a new vertex buffer that you can use to add attributes.
  *
  * 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);
 
@@ -93,7 +96,9 @@ cogl_vertex_buffer_new (unsigned int n_vertices);
  * Retrieves the number of vertices that @handle represents
  *
  * 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);
 
@@ -159,7 +164,10 @@ cogl_vertex_buffer_get_n_vertices (CoglHandle handle);
  * |- - - - -0-0-0-0-0-0 0 0 0 0|
  * </programlisting>
  * (Though you can have multiple groups of interleved attributes)</note>
+ *
+ * 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,
@@ -177,7 +185,10 @@ cogl_vertex_buffer_add (CoglHandle         handle,
  * Deletes an attribute from a buffer. You will need to call
  * cogl_vertex_buffer_submit() or issue a draw call to commit this
  * change to the GPU.
+ *
+ * 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);
@@ -193,7 +204,10 @@ cogl_vertex_buffer_delete (CoglHandle   handle,
  * validating your data; it potentially incurs a transport cost (especially if
  * you are using GLX indirect rendering) and potentially a format conversion
  * cost if the GPU doesn't natively support any of the given attribute formats.
+ *
+ * Deprecated: 1.16: Use the #CoglPrimitive api instead
  */
+COGL_DEPRECATED_IN_1_16_FOR (cogl_primitive_API)
 void
 cogl_vertex_buffer_submit (CoglHandle handle);
 
@@ -210,7 +224,10 @@ cogl_vertex_buffer_submit (CoglHandle handle);
  *
  * You don't need to call cogl_vertex_buffer_submit() after using this
  * function.
+ *
+ * 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);
@@ -227,7 +244,10 @@ cogl_vertex_buffer_disable (CoglHandle  handle,
  * attributes before using a buffer for drawing.
  *
  * You don't need to call cogl_vertex_buffer_submit() after using this function
+ *
+ * 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);
@@ -245,7 +265,10 @@ cogl_vertex_buffer_enable (CoglHandle  handle,
  *
  * Any un-submitted attribute changes are automatically submitted before
  * drawing.
+ *
+ * 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,
@@ -267,7 +290,10 @@ cogl_vertex_buffer_draw (CoglHandle       handle,
  *
  * Return value: A CoglHandle for the indices which you can pass to
  *   cogl_vertex_buffer_draw_elements().
+ *
+ * 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,
@@ -280,7 +306,10 @@ cogl_vertex_buffer_indices_new (CoglIndicesType  indices_type,
  * Queries back the data type used for the given indices
  *
  * Returns: The CoglIndicesType used
+ *
+ * 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);
 
@@ -303,7 +332,9 @@ cogl_vertex_buffer_indices_get_type (CoglHandle indices);
  *
  * Any un-submitted attribute changes are automatically submitted before
  * 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,
@@ -313,8 +344,6 @@ cogl_vertex_buffer_draw_elements (CoglHandle       handle,
                                   int              indices_offset,
                                   int              count);
 
-#ifndef COGL_DISABLE_DEPRECATED
-
 /**
  * cogl_vertex_buffer_ref:
  * @handle: a @CoglHandle.
@@ -323,10 +352,11 @@ cogl_vertex_buffer_draw_elements (CoglHandle       handle,
  *
  * Return value: the @handle.
  *
- * Deprecated: 1.2: Use cogl_handle_ref() instead
+ * Deprecated: 1.2: Use cogl_object_ref() instead
  */
+COGL_DEPRECATED_FOR (cogl_object_ref)
 CoglHandle
-cogl_vertex_buffer_ref (CoglHandle handle) G_GNUC_DEPRECATED;
+cogl_vertex_buffer_ref (CoglHandle handle);
 
 /**
  * cogl_vertex_buffer_unref:
@@ -334,12 +364,11 @@ cogl_vertex_buffer_ref (CoglHandle handle) G_GNUC_DEPRECATED;
  *
  * Decrement the reference count for a vertex buffer
  *
- * Deprecated: 1.2: Use cogl_handle_unref() instead
+ * Deprecated: 1.2: Use cogl_object_unref() instead
  */
+COGL_DEPRECATED_FOR (cogl_object_unref)
 void
-cogl_vertex_buffer_unref (CoglHandle handle) G_GNUC_DEPRECATED;
-
-#endif /* COGL_DISABLE_DEPRECATED */
+cogl_vertex_buffer_unref (CoglHandle handle);
 
 /**
  * cogl_vertex_buffer_indices_get_for_quads:
@@ -371,7 +400,10 @@ cogl_vertex_buffer_unref (CoglHandle handle) G_GNUC_DEPRECATED;
  *
  * Returns: A %CoglHandle containing the indices. The handled is
  * owned by Cogl and should not be modified or unref'd.
+ *
+ * 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);
 
@@ -385,7 +417,9 @@ cogl_vertex_buffer_indices_get_for_quads (unsigned int n_indices);
  *   otherwise
  *
  * 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);
 
@@ -400,10 +434,11 @@ cogl_is_vertex_buffer (CoglHandle handle);
  *   otherwise
  *
  * 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_END_DECLS
 
 #endif /* __COGL_VERTEX_BUFFER_H__ */

data/vendor/local/include/cogl/cogl/cogl-win32-renderer.h

@@ -94,6 +94,25 @@ cogl_win32_renderer_remove_filter (CoglRenderer *renderer,
                                    CoglWin32FilterFunc func,
                                    void *data);
 
+/**
+ * cogl_win32_renderer_set_event_retrieval_enabled:
+ * @renderer: a #CoglRenderer
+ * @enable: The new value
+ *
+ * Sets whether Cogl should automatically retrieve messages from
+ * Windows. It defaults to %TRUE. It can be set to %FALSE if the
+ * application wants to handle its own message retrieval. Note that
+ * Cogl still needs to see all of the messages to function properly so
+ * the application should call cogl_win32_renderer_handle_event() for
+ * each message if it disables automatic event retrieval.
+ *
+ * Since: 1.16
+ * Stability: unstable
+ */
+void
+cogl_win32_renderer_set_event_retrieval_enabled (CoglRenderer *renderer,
+                                                 CoglBool enable);
+
 COGL_END_DECLS
 
 #endif /* __COGL_WIN32_RENDERER_H__ */

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

@@ -44,6 +44,8 @@
  */
 
 #include <cogl/cogl-defines.h>
+#include <cogl/cogl-macros.h>
+
 #include <cogl/cogl-error.h>
 
 #include <cogl/cogl-object.h>
@@ -62,7 +64,6 @@
  * 1.x only api...
  */
 #ifndef COGL_ENABLE_EXPERIMENTAL_2_0_API
-#include <cogl/cogl-path.h>
 #include <cogl/cogl-clip-state.h>
 #include <cogl/cogl-vertex-buffer.h>
 #include <cogl/cogl-enum-types.h>
@@ -91,6 +92,7 @@
 #include <cogl/cogl-texture-3d.h>
 #include <cogl/cogl-texture-2d-sliced.h>
 #include <cogl/cogl-sub-texture.h>
+#include <cogl/cogl-atlas-texture.h>
 #include <cogl/cogl-meta-texture.h>
 #include <cogl/cogl-primitive-texture.h>
 #include <cogl/cogl-index-buffer.h>
@@ -107,6 +109,7 @@
 #include <cogl/cogl-onscreen.h>
 #include <cogl/cogl-frame-info.h>
 #include <cogl/cogl-poll.h>
+#include <cogl/cogl-fence.h>
 #if defined (COGL_HAS_EGL_PLATFORM_KMS_SUPPORT)
 #include <cogl/cogl-kms-renderer.h>
 #include <cogl/cogl-kms-display.h>
@@ -126,18 +129,19 @@
 #endif
 
 /*
- * 2.0 only api...
+ * API deprecations
  */
-#ifdef COGL_ENABLE_EXPERIMENTAL_2_0_API
-#include <cogl/cogl2-path.h>
-/* This header will be removed in Cogl 1.12 */
-#include <cogl/cogl2-compatibility.h>
-#endif
+#include <cogl/cogl-deprecated.h>
 
 /*
- * API deprecations
+ * Cogl Path api compatability
+ *
+ * The cogl_path_ api used to be part of the core Cogl api so for
+ * compatability we include cogl-path.h via cogl.h
  */
-#include <cogl/cogl-deprecated.h>
+#if defined (COGL_HAS_COGL_PATH_SUPPORT)
+#include <cogl-path/cogl-path.h>
+#endif
 
 /**
  * SECTION:cogl