isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-24 12:02:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused TEXTURE_IN_CLONE_PAINT private flag

Browse Source 
The CLUTTER_TEXTURE_IN_CLONE_PAINT was used with the old CloneTexture
actor; now that we have ClutterClone nothing sets the private flag
anymore, and the flag itself is not needed.
This commit is contained in:
Emmanuele Bassi 2009-07-13 16:16:38 +01:00
parent 13f31d8319
commit 43d394ebae
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
clutter/clutter-private.h
View File

@ -53,7 +53,7 @@
G_BEGIN_DECLS G_BEGIN_DECLS
typedef enum { typedef enum {
CLUTTER_ACTOR_UNUSED_FLAG = 0, CLUTTER_ACTOR_UNUSED_FLAG = 0,
CLUTTER_ACTOR_IN_DESTRUCTION = 1 << 0, CLUTTER_ACTOR_IN_DESTRUCTION = 1 << 0,
CLUTTER_ACTOR_IS_TOPLEVEL = 1 << 1, CLUTTER_ACTOR_IS_TOPLEVEL = 1 << 1,
@ -62,10 +62,9 @@ typedef enum {
* viewport / perspective etc * viewport / perspective etc
* needs (re)setting. * needs (re)setting.
*/ */
CLUTTER_ACTOR_IN_PAINT = 1 << 4, /* Used to avoid recursion */ CLUTTER_ACTOR_IN_PAINT = 1 << 4, /* Used to avoid recursion */
CLUTTER_ACTOR_IN_RELAYOUT = 1 << 5, /* Used to avoid recursion */ CLUTTER_ACTOR_IN_RELAYOUT = 1 << 5, /* Used to avoid recursion */
CLUTTER_TEXTURE_IN_CLONE_PAINT = 1 << 6, /* Used for safety in clones */ CLUTTER_STAGE_IN_RESIZE = 1 << 6
CLUTTER_STAGE_IN_RESIZE = 1 << 7
} ClutterPrivateFlags; } ClutterPrivateFlags;
struct _ClutterInputDevice struct _ClutterInputDevice

7
clutter/clutter-texture.c
View File

@ -610,13 +610,6 @@ clutter_texture_paint (ClutterActor *self)
clutter_shader_set_is_enabled (shader, TRUE); clutter_shader_set_is_enabled (shader, TRUE);
} }
/* A clone may need to fire above if were a TFP/FBO but not visible.
* Ultimatly needs some reworking with maybe an extra prepare_paint
* method or some such.
*/
if (CLUTTER_PRIVATE_FLAGS(self) & CLUTTER_TEXTURE_IN_CLONE_PAINT)
return;
CLUTTER_NOTE (PAINT, CLUTTER_NOTE (PAINT,
"painting texture '%s'", "painting texture '%s'",
clutter_actor_get_name (self) ? clutter_actor_get_name (self) clutter_actor_get_name (self) ? clutter_actor_get_name (self)