diff options
| author | Emmanuele Bassi <ebassi@linux.intel.com> | 2011-09-12 11:33:18 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@linux.intel.com> | 2011-09-12 11:33:18 +0100 |
| commit | 27502af591597dd30c2b7e522e5c087f426810d3 (patch) | |
| tree | a80a357c537cb26a3d4ae79f3d7bafc07557141d | |
| parent | e5cd039b5327a1d856e5285d35c6bd0db738f765 (diff) | |
| download | clutter-27502af591597dd30c2b7e522e5c087f426810d3.tar.gz | |
actor: Pack bitfields in ClutterActorPrivate
Bitfields should go at the end, to avoid holes in the middle of the
struct.
| -rw-r--r-- | clutter/clutter-actor.c | 57 |
1 files changed, 29 insertions, 28 deletions
diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c index 9a84bb7c5..9c051c161 100644 --- a/clutter/clutter-actor.c +++ b/clutter/clutter-actor.c @@ -393,34 +393,6 @@ struct _ClutterActorPrivate ClutterActorBox allocation; ClutterAllocationFlags allocation_flags; - guint position_set : 1; - guint min_width_set : 1; - guint min_height_set : 1; - guint natural_width_set : 1; - guint natural_height_set : 1; - /* cached request is invalid (implies allocation is too) */ - guint needs_width_request : 1; - /* cached request is invalid (implies allocation is too) */ - guint needs_height_request : 1; - /* cached allocation is invalid (request has changed, probably) */ - guint needs_allocation : 1; - guint show_on_set_parent : 1; - guint has_clip : 1; - guint clip_to_allocation : 1; - guint enable_model_view_transform : 1; - guint enable_paint_unmapped : 1; - guint has_pointer : 1; - guint propagated_one_redraw : 1; - guint paint_volume_valid : 1; - guint last_paint_volume_valid : 1; - guint in_clone_paint : 1; - guint transform_valid : 1; - /* This is TRUE if anything has queued a redraw since we were last - painted. In this case effect_to_redraw will point to an effect - the redraw was queued from or it will be NULL if the redraw was - queued without an effect. */ - guint is_dirty : 1; - gfloat clip[4]; /* Rotation angles */ @@ -508,6 +480,35 @@ struct _ClutterActorPrivate ClutterPaintVolume last_paint_volume; ClutterStageQueueRedrawEntry *queue_redraw_entry; + + /* bitfields */ + guint position_set : 1; + guint min_width_set : 1; + guint min_height_set : 1; + guint natural_width_set : 1; + guint natural_height_set : 1; + /* cached request is invalid (implies allocation is too) */ + guint needs_width_request : 1; + /* cached request is invalid (implies allocation is too) */ + guint needs_height_request : 1; + /* cached allocation is invalid (request has changed, probably) */ + guint needs_allocation : 1; + guint show_on_set_parent : 1; + guint has_clip : 1; + guint clip_to_allocation : 1; + guint enable_model_view_transform : 1; + guint enable_paint_unmapped : 1; + guint has_pointer : 1; + guint propagated_one_redraw : 1; + guint paint_volume_valid : 1; + guint last_paint_volume_valid : 1; + guint in_clone_paint : 1; + guint transform_valid : 1; + /* This is TRUE if anything has queued a redraw since we were last + painted. In this case effect_to_redraw will point to an effect + the redraw was queued from or it will be NULL if the redraw was + queued without an effect. */ + guint is_dirty : 1; }; enum |