brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ClutterTexture: Remove texture pixel format access

Browse Source 
Deprecated, misleading and not used anywhere; lets get rid of it.

https://bugzilla.gnome.org/show_bug.cgi?id=768977
This commit is contained in:
Jonas Ådahl 2016-07-20 13:43:52 +08:00
parent ea64e0abfa
commit 21f2f52269
2 changed files with 0 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
clutter/clutter/deprecated/clutter-texture.c
View File

@ -145,7 +145,6 @@ enum
PROP_0, PROP_0,
PROP_NO_SLICE, PROP_NO_SLICE,
PROP_MAX_TILE_WASTE, PROP_MAX_TILE_WASTE,
PROP_PIXEL_FORMAT,
PROP_SYNC_SIZE, PROP_SYNC_SIZE,
PROP_REPEAT_Y, PROP_REPEAT_Y,
PROP_REPEAT_X, PROP_REPEAT_X,
@ -911,10 +910,6 @@ clutter_texture_get_property (GObject *object,
switch (prop_id) switch (prop_id)
{ {
case PROP_PIXEL_FORMAT:
g_value_set_enum (value, clutter_texture_get_pixel_format (texture));
break;
case PROP_MAX_TILE_WASTE: case PROP_MAX_TILE_WASTE:
g_value_set_int (value, clutter_texture_get_max_tile_waste (texture)); g_value_set_int (value, clutter_texture_get_max_tile_waste (texture));
break; break;
@ -1040,15 +1035,6 @@ clutter_texture_class_init (ClutterTextureClass *klass)
obj_props[PROP_FILTER_QUALITY] = pspec; obj_props[PROP_FILTER_QUALITY] = pspec;
g_object_class_install_property (gobject_class, 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", pspec = g_param_spec_boxed ("cogl-texture",
P_("Cogl Texture"), P_("Cogl Texture"),
P_("The underlying Cogl texture handle used to draw this actor"), P_("The underlying Cogl texture handle used to draw this actor"),
@ -2871,40 +2857,6 @@ clutter_texture_get_repeat (ClutterTexture *texture,
*repeat_y = texture->priv->repeat_y; *repeat_y = texture->priv->repeat_y;
} }
/**
* 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: * clutter_texture_set_keep_aspect_ratio:
* @texture: a #ClutterTexture * @texture: a #ClutterTexture

2
clutter/clutter/deprecated/clutter-texture.h
View File

@ -98,8 +98,6 @@ void clutter_texture_get_repeat (ClutterTexture
gboolean *repeat_x, gboolean *repeat_x,
gboolean *repeat_y); gboolean *repeat_y);
CLUTTER_DEPRECATED_IN_1_12 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); gint clutter_texture_get_max_tile_waste (ClutterTexture *texture);
CLUTTER_DEPRECATED_IN_1_12_FOR(ClutterImage and clutter_actor_set_content_gravity) CLUTTER_DEPRECATED_IN_1_12_FOR(ClutterImage and clutter_actor_set_content_gravity)
void clutter_texture_set_keep_aspect_ratio (ClutterTexture *texture, void clutter_texture_set_keep_aspect_ratio (ClutterTexture *texture,