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

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

@@ -221,7 +221,8 @@ typedef enum { /*< prefix=COGL_BUFFER_MAP_HINT >*/
  * conflicting with the @access mask you pass. It is also an error to
  * release your last reference while the buffer is mapped.
  *
- * Return value: A pointer to the mapped memory or %NULL is the call fails
+ * Return value: (transfer none): A pointer to the mapped memory or
+ *        %NULL is the call fails
  *
  * Since: 1.2
  * Stability: unstable
@@ -257,7 +258,8 @@ cogl_buffer_map (CoglBuffer *buffer,
  * conflicting with the @access mask you pass. It is also an error to
  * release your last reference while the buffer is mapped.
  *
- * Return value: A pointer to the mapped memory or %NULL is the call fails
+ * Return value: (transfer none): A pointer to the mapped memory or
+ *        %NULL is the call fails
  *
  * Since: 2.0
  * Stability: unstable

data/vendor/local/include/cogl/cogl/cogl-clip-state.h

@@ -32,19 +32,6 @@
 
 COGL_BEGIN_DECLS
 
-/**
- * cogl_clip_push_from_path:
- *
- * 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 (void);
-
 COGL_END_DECLS
 
 #endif /* __COGL_CLIP_STATE_H */

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

@@ -31,10 +31,12 @@
 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);
 
 #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);
 

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

@@ -21,6 +21,13 @@
  *
  */
 
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
+#error "Only <cogl/cogl.h> can be included directly."
+#endif
+
+#ifndef __COGL_COLOR_H__
+#define __COGL_COLOR_H__
+
 /**
  * SECTION:cogl-color
  * @short_description: A generic color definition
@@ -31,14 +38,8 @@
  * Since: 1.0
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
-#error "Only <cogl/cogl.h> can be included directly."
-#endif
-
-#ifndef __COGL_COLOR_H__
-#define __COGL_COLOR_H__
-
 #include <cogl/cogl-types.h>
+#include <cogl/cogl-macros.h>
 
 COGL_BEGIN_DECLS
 
@@ -112,6 +113,7 @@ 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,
@@ -151,6 +153,7 @@ 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,
@@ -538,6 +541,44 @@ cogl_color_unpremultiply (CoglColor *color);
 CoglBool
 cogl_color_equal (const void *v1, const void *v2);
 
+/**
+ * cogl_color_to_hsl:
+ * @color: a #CoglColor
+ * @hue: (out): return location for the hue value or %NULL
+ * @saturation: (out): return location for the saturation value or %NULL
+ * @luminance: (out): return location for the luminance value or %NULL
+ *
+ * Converts @color to the HLS format.
+ *
+ * The @hue value is in the 0 .. 360 range. The @luminance and
+ * @saturation values are in the 0 .. 1 range.
+ *
+ * Since: 1.16
+ */
+void
+cogl_color_to_hsl (const CoglColor *color,
+                   float           *hue,
+                   float           *saturation,
+                   float           *luminance);
+
+/**
+ * cogl_color_init_from_hsl:
+ * @color: (out): return location for a #CoglColor
+ * @hue: hue value, in the 0 .. 360 range
+ * @saturation: saturation value, in the 0 .. 1 range
+ * @luminance: luminance value, in the 0 .. 1 range
+ *
+ * Converts a color expressed in HLS (hue, luminance and saturation)
+ * values into a #CoglColor.
+ *
+ * Since: 1.16
+ */
+void
+cogl_color_init_from_hsl (CoglColor *color,
+                          float      hue,
+                          float      saturation,
+                          float      luminance);
+
 COGL_END_DECLS
 
 #endif /* __COGL_COLOR_H__ */

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

@@ -92,8 +92,8 @@ COGL_BEGIN_DECLS
 #define COGL_CONTEXT(OBJECT) ((CoglContext *)OBJECT)
 
 /**
- * cogl_context_new:
- * @display: A #CoglDisplay pointer
+ * cogl_context_new: (constructor)
+ * @display: (allow-none): A #CoglDisplay pointer
  * @error: A CoglError return location.
  *
  * Creates a new #CoglContext which acts as an application sandbox
@@ -125,6 +125,25 @@ cogl_context_new (CoglDisplay *display,
 CoglDisplay *
 cogl_context_get_display (CoglContext *context);
 
+/**
+ * cogl_context_get_renderer:
+ * @context: A #CoglContext pointer
+ *
+ * Retrieves the #CoglRenderer that is internally associated with the
+ * given @context. This will return the same #CoglRenderer that was
+ * passed to cogl_display_new() or if %NULL was passed to
+ * cogl_display_new() or cogl_context_new() then this function returns
+ * a pointer to the renderer that was automatically connected
+ * internally.
+ *
+ * Return value: (transfer none): The #CoglRenderer associated with the
+ *               given @context.
+ * Since: 1.16
+ * Stability: unstable
+ */
+CoglRenderer *
+cogl_context_get_renderer (CoglContext *context);
+
 #ifdef COGL_HAS_EGL_PLATFORM_ANDROID_SUPPORT
 /**
  * cogl_android_set_native_window:
@@ -195,6 +214,8 @@ cogl_is_context (void *object);
  * @COGL_FEATURE_ID_DEPTH_RANGE: cogl_pipeline_set_depth_range() support
  * @COGL_FEATURE_ID_POINT_SPRITE: Whether
  *     cogl_pipeline_set_layer_point_sprite_coords_enabled() is supported.
+ * @COGL_FEATURE_ID_PER_VERTEX_POINT_SIZE: Whether cogl_point_size_in
+ *     can be used as an attribute to set a per-vertex point size.
  * @COGL_FEATURE_ID_MAP_BUFFER_FOR_READ: Whether cogl_buffer_map() is
  *     supported with CoglBufferAccess including read support.
  * @COGL_FEATURE_ID_MAP_BUFFER_FOR_WRITE: Whether cogl_buffer_map() is
@@ -240,6 +261,8 @@ typedef enum _CoglFeatureID
   COGL_FEATURE_ID_GLES2_CONTEXT,
   COGL_FEATURE_ID_DEPTH_TEXTURE,
   COGL_FEATURE_ID_PRESENTATION_TIME,
+  COGL_FEATURE_ID_FENCE,
+  COGL_FEATURE_ID_PER_VERTEX_POINT_SIZE,
 
   /*< private >*/
   _COGL_N_FEATURE_IDS   /*< skip >*/
@@ -305,8 +328,9 @@ typedef void (*CoglFeatureCallback) (CoglFeatureID feature, void *user_data);
 /**
  * cogl_foreach_feature:
  * @context: A #CoglContext pointer
- * @callback: A #CoglFeatureCallback called for each supported feature
- * @user_data: Private data to pass to the callback
+ * @callback: (scope call): A #CoglFeatureCallback called for each
+ *            supported feature
+ * @user_data: (closure): Private data to pass to the callback
  *
  * Iterates through all the context level features currently supported
  * for a given @context and for each feature @callback is called.

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

@@ -38,13 +38,14 @@
 
 #define COGL_HAS_GLIB_SUPPORT 1
 #define COGL_HAS_GTYPE_SUPPORT 1
+#define COGL_HAS_COGL_PATH_SUPPORT 1
 #define COGL_HAS_GL 1
 #define CLUTTER_COGL_HAS_GL 1
 #define COGL_HAS_WIN32_SUPPORT 1
 
 #define COGL_VERSION_MAJOR_INTERNAL 1
-#define COGL_VERSION_MINOR_INTERNAL 14
+#define COGL_VERSION_MINOR_INTERNAL 16
 #define COGL_VERSION_MICRO_INTERNAL 0
-#define COGL_VERSION_STRING_INTERNAL "1.14.0"
+#define COGL_VERSION_STRING_INTERNAL "1.16.0"
 
 #endif

data/vendor/local/include/cogl/cogl/cogl-depth-state.h

@@ -40,7 +40,7 @@ COGL_BEGIN_DECLS
  */
 
 /**
- * CoglDepthState
+ * CoglDepthState:
  *
  * Since: 2.0
  */

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

@@ -85,7 +85,8 @@ typedef struct _CoglDisplay	      CoglDisplay;
  *
  * A common use for explicitly allocating a display object is to
  * define a template for allocating onscreen framebuffers which is
- * what the @onscreen_template argument is for.
+ * what the @onscreen_template argument is for, or alternatively
+ * you can use cogl_display_set_onscreen_template().
  *
  * When a display is first allocated via cogl_display_new() it is in a
  * mutable configuration mode. It's designed this way so we can
@@ -100,8 +101,8 @@ typedef struct _CoglDisplay	      CoglDisplay;
  * abort with a message. For simple applications with no fallback
  * options then relying on the implicit setup can be fine.
  *
- * Return value: A newly allocated #CoglDisplay object in a mutable
- *               configuration mode.
+ * Return value: (transfer full): A newly allocated #CoglDisplay
+ *               object in a mutable configuration mode.
  * Since: 1.10
  * Stability: unstable
  */
@@ -115,12 +116,34 @@ cogl_display_new (CoglRenderer *renderer,
  *
  * Queries the #CoglRenderer associated with the given @display.
  *
+ * Return value: (transfer none): The associated #CoglRenderer
+ *
  * Since: 1.10
  * Stability: unstable
  */
 CoglRenderer *
 cogl_display_get_renderer (CoglDisplay *display);
 
+/**
+ * cogl_display_set_onscreen_template:
+ * @display: a #CoglDisplay
+ * @onscreen_template: A template for creating #CoglOnscreen framebuffers
+ *
+ * Specifies a template for creating #CoglOnscreen framebuffers.
+ *
+ * Depending on the system, the constraints for creating #CoglOnscreen
+ * framebuffers need to be known before setting up a #CoglDisplay because the
+ * final setup of the display may constrain how onscreen framebuffers may be
+ * allocated. If Cogl knows how an application wants to allocate onscreen
+ * framebuffers then it can try to make sure to setup the display accordingly.
+ *
+ * Since: 1.16
+ * Stability: unstable
+ */
+void
+cogl_display_set_onscreen_template (CoglDisplay *display,
+                                    CoglOnscreenTemplate *onscreen_template);
+
 /**
  * cogl_display_setup:
  * @display: a #CoglDisplay

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

@@ -25,10 +25,6 @@ GType cogl_material_alpha_func_get_type (void) G_GNUC_CONST;
 GType cogl_material_layer_type_get_type (void) G_GNUC_CONST;
 #define COGL_TYPE_MATERIAL_LAYER_TYPE (cogl_material_layer_type_get_type())
 
-/* enumerations from "./cogl-path.h" */
-GType cogl_path_fill_rule_get_type (void) G_GNUC_CONST;
-#define COGL_TYPE_PATH_FILL_RULE (cogl_path_fill_rule_get_type())
-
 /* enumerations from "./cogl-shader.h" */
 GType cogl_shader_type_get_type (void) G_GNUC_CONST;
 #define COGL_TYPE_SHADER_TYPE (cogl_shader_type_get_type())

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

@@ -30,6 +30,8 @@
 
 #include "cogl-types.h"
 
+COGL_BEGIN_DECLS
+
 /**
  * SECTION:cogl-error
  * @short_description: A way for Cogl to throw exceptions
@@ -173,4 +175,6 @@ cogl_error_matches (CoglError *error,
 #define COGL_GLIB_ERROR(COGL_ERROR) ((CoglError *)COGL_ERROR)
 #endif
 
+COGL_END_DECLS
+
 #endif /* __COGL_ERROR_H__ */

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

@@ -0,0 +1,136 @@
+/*
+ * Cogl
+ *
+ * An object oriented GL/GLES Abstraction/Utility Layer
+ *
+ * Copyright (C) 2012 Collabora Ltd.
+ *
+ * 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_FENCE_H__
+#define __COGL_FENCE_H__
+
+#include <cogl/cogl-types.h>
+#include <cogl/cogl-framebuffer.h>
+
+/**
+ * SECTION:cogl-fence
+ * @short_description: Functions for notification of command completion
+ *
+ * Cogl allows notification of GPU command completion; users may mark
+ * points in the GPU command stream and receive notification when the GPU
+ * has executed to that point.
+ */
+
+/**
+ * CoglFence:
+ *
+ * An opaque object representing a fence. This type is currently
+ * unused but in the future may be used to pass extra information
+ * about the fence completion.
+ *
+ * Since: 2.0
+ * Stability: Unstable
+ */
+typedef struct _CoglFence CoglFence;
+
+/**
+ * CoglFenceCallback:
+ * @fence: Unused. In the future this parameter may be used to pass
+ *   extra information about the fence completion but for now it
+ *   should be ignored.
+ * @user_data: The private data passed to cogl_framebuffer_add_fence_callback()
+ *
+ * The callback prototype used with
+ * cogl_framebuffer_add_fence_callback() for notification of GPU
+ * command completion.
+ *
+ * Since: 2.0
+ * Stability: Unstable
+ */
+typedef void (* CoglFenceCallback) (CoglFence *fence,
+                                    void *user_data);
+
+/**
+ * CoglFenceClosure:
+ *
+ * An opaque type representing one future callback to be made when the
+ * GPU command stream has passed a certain point.
+ *
+ * Since: 2.0
+ * Stability: Unstable
+ */
+typedef struct _CoglFenceClosure CoglFenceClosure;
+
+/**
+ * cogl_frame_closure_get_user_data:
+ * @closure: A #CoglFenceClosure returned from cogl_framebuffer_add_fence()
+ *
+ * Returns the user_data submitted to cogl_framebuffer_add_fence() which
+ * returned a given #CoglFenceClosure.
+ *
+ * Since: 2.0
+ * Stability: Unstable
+ */
+void *
+cogl_fence_closure_get_user_data (CoglFenceClosure *closure);
+
+/**
+ * cogl_framebuffer_add_fence_callback:
+ * @framebuffer: The #CoglFramebuffer the commands have been submitted to
+ * @callback: (scope notified): A #CoglFenceCallback to be called when
+ *            all commands submitted to Cogl have been executed
+ * @user_data: (closure): Private data that will be passed to the callback
+ *
+ * Calls the provided callback when all previously-submitted commands have
+ * been executed by the GPU.
+ *
+ * Returns non-NULL if the fence succeeded, or %NULL if it was unable to
+ * be inserted and the callback will never be called.  The user does not
+ * need to free the closure; it will be freed automatically when the
+ * callback is called, or cancelled.
+ *
+ * Since: 2.0
+ * Stability: Unstable
+ */
+CoglFenceClosure *
+cogl_framebuffer_add_fence_callback (CoglFramebuffer *framebuffer,
+                                     CoglFenceCallback callback,
+                                     void *user_data);
+
+/**
+ * cogl_framebuffer_cancel_fence_callback:
+ * @framebuffer: The #CoglFramebuffer the commands were submitted to
+ * @closure: The #CoglFenceClosure returned from
+ *           cogl_framebuffer_add_fence_callback()
+ *
+ * Removes a fence previously submitted with
+ * cogl_framebuffer_add_fence_callback(); the callback will not be
+ * called.
+ *
+ * Since: 2.0
+ * Stability: Unstable
+ */
+void
+cogl_framebuffer_cancel_fence_callback (CoglFramebuffer *framebuffer,
+                                        CoglFenceClosure *closure);
+
+#endif /* __COGL_FENCE_H__ */