[mutter] ClutterTexture: Remove texture pixel format access
- From: Jonas Ådahl <jadahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] ClutterTexture: Remove texture pixel format access
- Date: Wed, 20 Jul 2016 06:29:04 +0000 (UTC)
commit 21f2f52269bc7deb142f8e86fb102a8b180d08e3
Author: Jonas Ådahl <jadahl gmail com>
Date: Wed Jul 20 13:43:52 2016 +0800
ClutterTexture: Remove texture pixel format access
Deprecated, misleading and not used anywhere; lets get rid of it.
https://bugzilla.gnome.org/show_bug.cgi?id=768977
clutter/clutter/deprecated/clutter-texture.c | 48 --------------------------
clutter/clutter/deprecated/clutter-texture.h | 2 -
2 files changed, 0 insertions(+), 50 deletions(-)
---
diff --git a/clutter/clutter/deprecated/clutter-texture.c b/clutter/clutter/deprecated/clutter-texture.c
index dd0e9b0..09a8c1e 100644
--- a/clutter/clutter/deprecated/clutter-texture.c
+++ b/clutter/clutter/deprecated/clutter-texture.c
@@ -145,7 +145,6 @@ enum
PROP_0,
PROP_NO_SLICE,
PROP_MAX_TILE_WASTE,
- PROP_PIXEL_FORMAT,
PROP_SYNC_SIZE,
PROP_REPEAT_Y,
PROP_REPEAT_X,
@@ -911,10 +910,6 @@ clutter_texture_get_property (GObject *object,
switch (prop_id)
{
- case PROP_PIXEL_FORMAT:
- g_value_set_enum (value, clutter_texture_get_pixel_format (texture));
- break;
-
case PROP_MAX_TILE_WASTE:
g_value_set_int (value, clutter_texture_get_max_tile_waste (texture));
break;
@@ -1040,15 +1035,6 @@ clutter_texture_class_init (ClutterTextureClass *klass)
obj_props[PROP_FILTER_QUALITY] = pspec;
g_object_class_install_property (gobject_class, PROP_FILTER_QUALITY, pspec);
- pspec = g_param_spec_enum ("pixel-format",
- P_("Pixel Format"),
- P_("The Cogl pixel format to use"),
- COGL_TYPE_PIXEL_FORMAT,
- COGL_PIXEL_FORMAT_RGBA_8888,
- CLUTTER_PARAM_READABLE);
- obj_props[PROP_PIXEL_FORMAT] = pspec;
- g_object_class_install_property (gobject_class, PROP_PIXEL_FORMAT, pspec);
-
pspec = g_param_spec_boxed ("cogl-texture",
P_("Cogl Texture"),
P_("The underlying Cogl texture handle used to draw this actor"),
@@ -2872,40 +2858,6 @@ clutter_texture_get_repeat (ClutterTexture *texture,
}
/**
- * clutter_texture_get_pixel_format:
- * @texture: a #ClutterTexture
- *
- * Retrieves the pixel format used by @texture. This is
- * equivalent to:
- *
- * |[
- * handle = clutter_texture_get_pixel_format (texture);
- *
- * if (handle != COGL_INVALID_HANDLE)
- * format = cogl_texture_get_format (handle);
- * ]|
- *
- * Return value: a #CoglPixelFormat value
- *
- * Since: 1.0
- *
- * Deprecated: 1.12: There is no direct replacement for this function
- */
-CoglPixelFormat
-clutter_texture_get_pixel_format (ClutterTexture *texture)
-{
- CoglHandle cogl_texture;
-
- g_return_val_if_fail (CLUTTER_IS_TEXTURE (texture), COGL_PIXEL_FORMAT_ANY);
-
- cogl_texture = clutter_texture_get_cogl_texture (texture);
- if (cogl_texture == NULL)
- return COGL_PIXEL_FORMAT_ANY;
-
- return cogl_texture_get_format (cogl_texture);
-}
-
-/**
* clutter_texture_set_keep_aspect_ratio:
* @texture: a #ClutterTexture
* @keep_aspect: %TRUE to maintain aspect ratio
diff --git a/clutter/clutter/deprecated/clutter-texture.h b/clutter/clutter/deprecated/clutter-texture.h
index 98477ba..6e04943 100644
--- a/clutter/clutter/deprecated/clutter-texture.h
+++ b/clutter/clutter/deprecated/clutter-texture.h
@@ -98,8 +98,6 @@ void clutter_texture_get_repeat (ClutterTexture
gboolean *repeat_x,
gboolean *repeat_y);
CLUTTER_DEPRECATED_IN_1_12
-CoglPixelFormat clutter_texture_get_pixel_format (ClutterTexture *texture);
-CLUTTER_DEPRECATED_IN_1_12
gint clutter_texture_get_max_tile_waste (ClutterTexture *texture);
CLUTTER_DEPRECATED_IN_1_12_FOR(ClutterImage and clutter_actor_set_content_gravity)
void clutter_texture_set_keep_aspect_ratio (ClutterTexture *texture,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]