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

data/vendor/local/include/cogl/cogl/cogl-sub-texture.h

@@ -72,8 +72,8 @@ typedef struct _CoglSubTexture CoglSubTexture;
  * #CoglMetaTexture interface to resolve a #CoglSubTexture into a
  * low-level texture before drawing.</note>
  *
- * Returns: A newly allocated #CoglSubTexture representing a
- *          sub-region of @parent_texture.
+ * Return value: (transfer full): A newly allocated #CoglSubTexture
+ *          representing a sub-region of @parent_texture.
  *
  * Since: 1.10
  * Stability: unstable

data/vendor/local/include/cogl/cogl/cogl-texture-2d-gl.h

@@ -42,7 +42,7 @@ COGL_BEGIN_DECLS
  * @gl_handle: A GL handle for a GL_TEXTURE_2D texture object
  * @width: Width of the foreign GL texture
  * @height: Height of the foreign GL texture
- * @internal_format: The format of the texture
+ * @format: The format of the texture
  * @error: A #CoglError for exceptions
  *
  * Wraps an existing GL_TEXTURE_2D texture object as a #CoglTexture2D.
@@ -53,10 +53,10 @@ COGL_BEGIN_DECLS
  * or if @width or @height don't have the correct texture
  * geometry.</note>
  *
- * Returns: A newly allocated #CoglTexture2D, or if Cogl could not
- *          validate the @gl_handle in some way (perhaps because of
- *          an unsupported format) it will return %NULL and set
- *          @error.
+ * Return value: (transfer full): A newly allocated #CoglTexture2D, or
+ *          if Cogl could not validate the @gl_handle in some way
+ *          (perhaps because of an unsupported format) it will return
+ *          %NULL and set @error.
  *
  * Since: 2.0
  */

data/vendor/local/include/cogl/cogl/cogl-texture-2d-sliced.h

@@ -100,7 +100,7 @@ typedef struct _CoglTexture2DSliced CoglTexture2DSliced;
  * is larger than is supported by the hardware but slicing is disabled
  * the texture size would be too large to handle.</note>
  *
- * Returns: A new #CoglTexture2DSliced object with no storage
+ * Returns: (transfer full): A new #CoglTexture2DSliced object with no storage
  *          allocated yet.
  *
  * Since: 1.10
@@ -113,6 +113,172 @@ cogl_texture_2d_sliced_new_with_size (CoglContext *ctx,
                                       int max_waste,
                                       CoglPixelFormat internal_format);
 
+/**
+ * cogl_texture_2d_sliced_new_from_file:
+ * @ctx: A #CoglContext
+ * @filename: the file to load
+ * @max_waste: The threshold of how wide a strip of wasted texels
+ *             are allowed along the right and bottom textures before
+ *             they must be sliced to reduce the amount of waste. A
+ *             negative can be passed to disable slicing.
+ * @internal_format: the #CoglPixelFormat to use for the GPU storage of the
+ *    texture. If %COGL_PIXEL_FORMAT_ANY is given then a premultiplied
+ *    format similar to the format of the source data will be used. The
+ *    default blending equations of Cogl expect premultiplied color data;
+ *    the main use of passing a non-premultiplied format here is if you
+ *    have non-premultiplied source data and are going to adjust the blend
+ *    mode (see cogl_material_set_blend()) or use the data for something
+ *    other than straight blending.
+ * @error: A #CoglError to catch exceptional errors or %NULL
+ *
+ * Creates a #CoglTexture2DSliced from an image file.
+ *
+ * A #CoglTexture2DSliced may internally be comprised of 1 or more
+ * #CoglTexture2D textures depending on GPU limitations.  For example
+ * if the GPU only supports power-of-two sized textures then a sliced
+ * texture will turn a non-power-of-two size into a combination of
+ * smaller power-of-two sized textures. If the requested texture size
+ * is larger than is supported by the hardware then the texture will
+ * be sliced into smaller textures that can be accessed by the
+ * hardware.
+ *
+ * @max_waste is used as a threshold for recursively slicing the
+ * right-most or bottom-most slices into smaller sizes until the
+ * wasted padding at the bottom and right of the textures is less than
+ * specified. A negative @max_waste will disable slicing.
+ *
+ * <note>It's possible for the allocation of a sliced texture to fail
+ * later due to impossible slicing constraints if a negative
+ * @max_waste value is given. If the given virtual texture size is
+ * larger than is supported by the hardware but slicing is disabled
+ * the texture size would be too large to handle.</note>
+ *
+ * Return value: (transfer full): A newly created #CoglTexture2DSliced
+ *               or %NULL on failure and @error will be updated.
+ *
+ * Since: 1.16
+ */
+CoglTexture2DSliced *
+cogl_texture_2d_sliced_new_from_file (CoglContext *ctx,
+                                      const char *filename,
+                                      int max_waste,
+                                      CoglPixelFormat internal_format,
+                                      CoglError **error);
+
+/**
+ * cogl_texture_2d_sliced_new_from_data:
+ * @ctx: A #CoglContext
+ * @width: width of texture in pixels
+ * @height: height of texture in pixels
+ * @format: the #CoglPixelFormat the buffer is stored in in RAM
+ * @max_waste: The threshold of how wide a strip of wasted texels
+ *             are allowed along the right and bottom textures before
+ *             they must be sliced to reduce the amount of waste. A
+ *             negative can be passed to disable slicing.
+ * @internal_format: the #CoglPixelFormat to use for the GPU storage of the
+ *    texture. If %COGL_PIXEL_FORMAT_ANY is given then a premultiplied
+ *    format similar to the format of the source data will be used. The
+ *    default blending equations of Cogl expect premultiplied color data;
+ *    the main use of passing a non-premultiplied format here is if you
+ *    have non-premultiplied source data and are going to adjust the blend
+ *    mode (see cogl_material_set_blend()) or use the data for something
+ *    other than straight blending.
+ * @rowstride: the memory offset in bytes between the start of each
+ *    row in @data. A value of 0 will make Cogl automatically
+ *    calculate @rowstride from @width and @format.
+ * @data: pointer the memory region where the source buffer resides
+ * @error: A #CoglError to catch exceptional errors or %NULL
+ *
+ * Creates a new #CoglTexture2DSliced texture based on data residing
+ * in memory.
+ *
+ * A #CoglTexture2DSliced may internally be comprised of 1 or more
+ * #CoglTexture2D textures depending on GPU limitations.  For example
+ * if the GPU only supports power-of-two sized textures then a sliced
+ * texture will turn a non-power-of-two size into a combination of
+ * smaller power-of-two sized textures. If the requested texture size
+ * is larger than is supported by the hardware then the texture will
+ * be sliced into smaller textures that can be accessed by the
+ * hardware.
+ *
+ * @max_waste is used as a threshold for recursively slicing the
+ * right-most or bottom-most slices into smaller sizes until the
+ * wasted padding at the bottom and right of the textures is less than
+ * specified. A negative @max_waste will disable slicing.
+ *
+ * <note>It's possible for the allocation of a sliced texture to fail
+ * later due to impossible slicing constraints if a negative
+ * @max_waste value is given. If the given virtual texture size is
+ * larger than is supported by the hardware but slicing is disabled
+ * the texture size would be too large to handle.</note>
+ *
+ * Return value: (transfer full): A newly created #CoglTexture2DSliced
+ *               or %NULL on failure and @error will be updated.
+ *
+ * Since: 1.16
+ */
+CoglTexture2DSliced *
+cogl_texture_2d_sliced_new_from_data (CoglContext *ctx,
+                                      int width,
+                                      int height,
+                                      int max_waste,
+                                      CoglPixelFormat format,
+                                      CoglPixelFormat internal_format,
+                                      int rowstride,
+                                      const uint8_t *data,
+                                      CoglError **error);
+
+/**
+ * cogl_texture_2d_sliced_new_from_bitmap:
+ * @bmp: A #CoglBitmap
+ * @max_waste: The threshold of how wide a strip of wasted texels
+ *             are allowed along the right and bottom textures before
+ *             they must be sliced to reduce the amount of waste. A
+ *             negative can be passed to disable slicing.
+ * @internal_format: the #CoglPixelFormat to use for the GPU storage of the
+ *    texture. If %COGL_PIXEL_FORMAT_ANY is given then a premultiplied
+ *    format similar to the format of the source data will be used. The
+ *    default blending equations of Cogl expect premultiplied color data;
+ *    the main use of passing a non-premultiplied format here is if you
+ *    have non-premultiplied source data and are going to adjust the blend
+ *    mode (see cogl_material_set_blend()) or use the data for something
+ *    other than straight blending.
+ * @error: A #CoglError to catch exceptional errors or %NULL
+ *
+ * Creates a new #CoglTexture2DSliced texture based on data residing
+ * in a bitmap.
+ *
+ * A #CoglTexture2DSliced may internally be comprised of 1 or more
+ * #CoglTexture2D textures depending on GPU limitations.  For example
+ * if the GPU only supports power-of-two sized textures then a sliced
+ * texture will turn a non-power-of-two size into a combination of
+ * smaller power-of-two sized textures. If the requested texture size
+ * is larger than is supported by the hardware then the texture will
+ * be sliced into smaller textures that can be accessed by the
+ * hardware.
+ *
+ * @max_waste is used as a threshold for recursively slicing the
+ * right-most or bottom-most slices into smaller sizes until the
+ * wasted padding at the bottom and right of the textures is less than
+ * specified. A negative @max_waste will disable slicing.
+ *
+ * <note>It's possible for the allocation of a sliced texture to fail
+ * later due to impossible slicing constraints if a negative
+ * @max_waste value is given. If the given virtual texture size is
+ * larger than is supported by the hardware but slicing is disabled
+ * the texture size would be too large to handle.</note>
+ *
+ * Return value: (transfer full): A newly created #CoglTexture2DSliced
+ *               or %NULL on failure and @error will be updated.
+ *
+ * Since: 1.16
+ */
+CoglTexture2DSliced *
+cogl_texture_2d_sliced_new_from_bitmap (CoglBitmap *bmp,
+                                        int max_waste,
+                                        CoglPixelFormat internal_format,
+                                        CoglError **error);
+
 /**
  * cogl_is_texture_2d_sliced:
  * @object: A #CoglObject pointer

data/vendor/local/include/cogl/cogl/cogl-texture-2d.h

@@ -92,7 +92,7 @@ cogl_is_texture_2d (void *object);
  * checking for the %COGL_FEATURE_ID_TEXTURE_NPOT feature via
  * cogl_has_feature().</note>
  *
- * Returns: A new #CoglTexture2D object with no storage yet allocated.
+ * Returns: (transfer full): A new #CoglTexture2D object with no storage yet allocated.
  *
  * Since: 2.0
  */
@@ -102,6 +102,33 @@ cogl_texture_2d_new_with_size (CoglContext *ctx,
                                int height,
                                CoglPixelFormat internal_format);
 
+/**
+ * cogl_texture_2d_new_from_file:
+ * @ctx: A #CoglContext
+ * @filename: the file to load
+ * @internal_format: the #CoglPixelFormat to use for the GPU storage of the
+ *    texture. If %COGL_PIXEL_FORMAT_ANY is given then a premultiplied
+ *    format similar to the format of the source data will be used. The
+ *    default blending equations of Cogl expect premultiplied color data;
+ *    the main use of passing a non-premultiplied format here is if you
+ *    have non-premultiplied source data and are going to adjust the blend
+ *    mode (see cogl_material_set_blend()) or use the data for something
+ *    other than straight blending.
+ * @error: A #CoglError to catch exceptional errors or %NULL
+ *
+ * Creates a #CoglTexture2D from an image file.
+ *
+ * Return value: (transfer full): A newly created #CoglTexture2D or %NULL on failure
+ *               and @error will be updated.
+ *
+ * Since: 1.16
+ */
+CoglTexture2D *
+cogl_texture_2d_new_from_file (CoglContext *ctx,
+                               const char *filename,
+                               CoglPixelFormat internal_format,
+                               CoglError **error);
+
 /**
  * cogl_texture_2d_new_from_data:
  * @ctx: A #CoglContext
@@ -132,10 +159,10 @@ cogl_texture_2d_new_with_size (CoglContext *ctx,
  * checking for the %COGL_FEATURE_ID_TEXTURE_NPOT feature via
  * cogl_has_feature().</note>
  *
- * Returns: A newly allocated #CoglTexture2D, or if the size is not
- *          supported (because it is too large or a non-power-of-two
- *          size that the hardware doesn't support) it will return
- *          %NULL and set @error.
+ * Returns: (transfer full): A newly allocated #CoglTexture2D, or if
+ *          the size is not supported (because it is too large or a
+ *          non-power-of-two size that the hardware doesn't support)
+ *          it will return %NULL and set @error.
  *
  * Since: 2.0
  */
@@ -173,10 +200,10 @@ cogl_texture_2d_new_from_data (CoglContext *ctx,
  * checking for the %COGL_FEATURE_ID_TEXTURE_NPOT feature via
  * cogl_has_feature().</note>
  *
- * Returns: A newly allocated #CoglTexture2D, or if the size is not
- *          supported (because it is too large or a non-power-of-two
- *          size that the hardware doesn't support) it will return
- *          %NULL and set @error.
+ * Returns: (transfer full): A newly allocated #CoglTexture2D, or if
+ *          the size is not supported (because it is too large or a
+ *          non-power-of-two size that the hardware doesn't support)
+ *          it will return %NULL and set @error.
  *
  * Since: 2.0
  * Stability: unstable

data/vendor/local/include/cogl/cogl/cogl-texture-3d.h

@@ -71,7 +71,7 @@ typedef struct _CoglTexture3D CoglTexture3D;
  * fail if the requested dimensions are not supported by the
  * GPU.</note>
  *
- * Returns: A new #CoglTexture3D object with no storage yet allocated.
+ * Returns: (transfer full): A new #CoglTexture3D object with no storage yet allocated.
  * Since: 1.10
  * Stability: Unstable
  */
@@ -115,9 +115,9 @@ cogl_texture_3d_new_with_size (CoglContext *context,
  * %COGL_FEATURE_ID_TEXTURE_3D is not advertised. It can also fail if the
  * requested dimensions are not supported by the GPU.
  *
- * Return value: the newly created #CoglTexture3D or %NULL if
- *               there was an error an an exception will be returned
- *               through @error.
+ * Return value: (transfer full): the newly created #CoglTexture3D or
+ *               %NULL if there was an error an an exception will be
+ *               returned through @error.
  * Since: 1.10
  * Stability: Unstable
  */
@@ -155,8 +155,8 @@ cogl_texture_3d_new_from_data (CoglContext *context,
  * actual height of the bitmap can be larger than @height × @depth. In
  * this case it assumes there is padding between the images.
  *
- * Return value: the newly created texture or %NULL if
- *   there was an error.
+ * Return value: (transfer full): the newly created texture or %NULL
+ *   if there was an error.
  * Since: 2.0
  * Stability: unstable
  */

data/vendor/local/include/cogl/cogl/cogl-texture-rectangle.h

@@ -102,9 +102,10 @@ cogl_is_texture_rectangle (void *object);
  * first check for the %COGL_FEATURE_ID_TEXTURE_RECTANGLE feature
  * using cogl_has_feature().</note>
  *
- * Returns: A pointer to a newly allocated #CoglTextureRectangle texture
- *          or if the size was too large or there wasn't enough memory
- *          %NULL is returned and @error set.
+ * Return value: (transfer full): A pointer to a newly allocated
+ *          #CoglTextureRectangle texture or if the size was too large
+ *          or there wasn't enough memory %NULL is returned and @error
+ *          set.
  *
  * Since: 1.10
  * Stability: unstable
@@ -143,9 +144,10 @@ cogl_texture_rectangle_new_with_size (CoglContext *ctx,
  * first check for the %COGL_FEATURE_ID_TEXTURE_RECTANGLE feature
  * using cogl_has_feature().</note>
  *
- * Returns: A pointer to a newly allocated #CoglTextureRectangle texture
- *          or if the size was too large or there wasn't enough memory
- *          %NULL is returned and @error set.
+ * Return value: (transfer full): A pointer to a newly allocated
+ *          #CoglTextureRectangle texture or if the size was too large
+ *          or there wasn't enough memory %NULL is returned and @error
+ *          set.
  * Since: 2.0
  * Stability: unstable
  */
@@ -160,7 +162,7 @@ cogl_texture_rectangle_new_from_bitmap (CoglBitmap *bitmap,
  * @gl_handle: A GL handle for a GL_TEXTURE_RECTANGLE texture object
  * @width: Width of the foreign GL texture
  * @height: Height of the foreign GL texture
- * @internal_format: The format of the texture
+ * @format: The format of the texture
  * @error: A #CoglError for exceptions
  *
  * Wraps an existing GL_TEXTURE_RECTANGLE texture object as a
@@ -184,12 +186,11 @@ cogl_texture_rectangle_new_from_bitmap (CoglBitmap *bitmap,
  * first check for the %COGL_FEATURE_ID_TEXTURE_RECTANGLE feature
  * using cogl_has_feature().</note>
 
- * Returns: A newly allocated #CoglTextureRectangle, or if Cogl could
- *          not validate the @gl_handle in some way (perhaps because
- *          of an unsupported format) it will return %NULL and set
- *          @error.
+ * Return value: (transfer full): A newly allocated
+ *          #CoglTextureRectangle, or if Cogl could not validate the
+ *          @gl_handle in some way (perhaps because of an unsupported
+ *          format) it will return %NULL and set @error.
  *
-
  */
 CoglTextureRectangle *
 cogl_texture_rectangle_new_from_foreign (CoglContext *ctx,

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

@@ -112,14 +112,7 @@ uint32_t cogl_texture_error_quark (void);
  *
  * Creates a new #CoglTexture with the specified dimensions and pixel format.
  *
- * The storage for the texture is not necesarily created before this
- * function returns. The storage can be explicitly allocated using
- * cogl_texture_allocate() or preferably you can let Cogl
- * automatically allocate the storage lazily when uploading data when
- * Cogl may know more about how the texture will be used and can
- * optimize how it is allocated.
- *
- * Return value: A newly created #CoglTexture
+ * Return value: (transfer full): A newly created #CoglTexture or %NULL on failure
  *
  * Since: 0.8
  */
@@ -145,7 +138,8 @@ cogl_texture_new_with_size (unsigned int width,
  *
  * Creates a #CoglTexture from an image file.
  *
- * Return value: A newly created #CoglTexture or %NULL on failure
+ * Return value: (transfer full): A newly created #CoglTexture or
+ *               %NULL on failure
  *
  * Since: 0.8
  */
@@ -175,7 +169,8 @@ cogl_texture_new_from_file (const char       *filename,
  *
  * Creates a new #CoglTexture based on data residing in memory.
  *
- * Return value: A newly created #CoglTexture or %NULL on failure
+ * Return value: (transfer full): A newly created #CoglTexture or
+ *               %NULL on failure
  *
  * Since: 0.8
  */
@@ -209,7 +204,8 @@ cogl_texture_new_from_data (int width,
  * the waste arguments to tell Cogl which region should be mapped to
  * the texture coordinate range [0:1].
  *
- * Return value: A newly created #CoglTexture or %NULL on failure
+ * Return value: (transfer full): A newly created #CoglTexture or
+ *               %NULL on failure
  *
  * Since: 0.8
  */
@@ -231,7 +227,8 @@ cogl_texture_new_from_foreign (unsigned int gl_handle,
  *
  * Creates a #CoglTexture from a #CoglBitmap.
  *
- * Return value: A newly created #CoglTexture or %NULL on failure
+ * Return value: (transfer full): A newly created #CoglTexture or
+ *               %NULL on failure
  *
  * Since: 1.0
  */
@@ -314,6 +311,7 @@ cogl_texture_get_format (CoglTexture *texture);
  *                   also no known need for API either. It was just
  *                   a mistake that it was ever published.
  */
+COGL_DEPRECATED_IN_1_10
 unsigned int
 cogl_texture_get_rowstride (CoglTexture *texture);
 
@@ -546,7 +544,8 @@ cogl_texture_set_region_from_bitmap (CoglTexture *texture,
  * not need to keep one separately if you only want to use the sub
  * texture.
  *
- * Return value: A newly created #CoglTexture or %NULL on failure
+ * Return value: (transfer full): A newly created #CoglTexture or
+ *               %NULL on failure
  * Since: 1.2
  */
 CoglTexture *
@@ -556,10 +555,8 @@ cogl_texture_new_from_sub_texture (CoglTexture *full_texture,
                                    int sub_width,
                                    int sub_height);
 
-#ifndef COGL_DISABLE_DEPRECATED
-
 /**
- * cogl_texture_ref:
+ * cogl_texture_ref: (skip)
  * @texture: a #CoglTexture.
  *
  * Increment the reference count for a cogl texture.
@@ -568,21 +565,21 @@ cogl_texture_new_from_sub_texture (CoglTexture *full_texture,
  *
  * Return value: the @texture pointer.
  */
+COGL_DEPRECATED_FOR (cogl_object_ref)
 void *
-cogl_texture_ref (void *texture) G_GNUC_DEPRECATED;
+cogl_texture_ref (void *texture);
 
 /**
- * cogl_texture_unref:
+ * cogl_texture_unref: (skip)
  * @texture: a #CoglTexture.
  *
  * Decrement the reference count for a cogl texture.
  *
  * Deprecated: 1.2: Use cogl_object_unref() instead
  */
+COGL_DEPRECATED_FOR (cogl_object_unref)
 void
-cogl_texture_unref (void *texture) G_GNUC_DEPRECATED;
-
-#endif /* COGL_DISABLE_DEPRECATED */
+cogl_texture_unref (void *texture);
 
 /**
  * cogl_texture_allocate: