[Spice-devel] [PATCH 3/5] worker: Move is_opaque_item() to tree.h

Frediano Ziglio fziglio at redhat.com
Wed Nov 11 04:22:03 PST 2015


 
> On Tue, Nov 10, 2015 at 9:41 PM, Jonathon Jongsma <jjongsma at redhat.com>
> wrote:
> > ---
> >  server/red_worker.c | 6 ------
> >  server/tree.h       | 6 ++++++
> >  2 files changed, 6 insertions(+), 6 deletions(-)
> >
> > diff --git a/server/red_worker.c b/server/red_worker.c
> > index a2ed49b..dd4633c 100644
> > --- a/server/red_worker.c
> > +++ b/server/red_worker.c
> > @@ -1389,12 +1389,6 @@ static void exclude_region(RedWorker *worker, Ring
> > *ring, RingItem *ring_item, Q
> >      }
> >  }
> >
> > -static inline int is_opaque_item(TreeItem *item)
> > -{
> > -    return item->type == TREE_ITEM_TYPE_CONTAINER ||
> > -           (IS_DRAW_ITEM(item) && ((DrawItem *)item)->effect ==
> > QXL_EFFECT_OPAQUE);
> > -}
> > -
> >  static inline void __current_add_drawable(RedWorker *worker, Drawable
> >  *drawable, RingItem *pos)
> >  {
> >      DisplayChannel *display = worker->display_channel;
> > diff --git a/server/tree.h b/server/tree.h
> > index 6e83f7a..6249c28 100644
> > --- a/server/tree.h
> > +++ b/server/tree.h
> > @@ -73,6 +73,12 @@ struct DrawItem {
> >  #define IS_DRAW_ITEM(item) ((item)->type == TREE_ITEM_TYPE_DRAWABLE)
> >  #define DRAW_ITEM(item) ((DrawItem*)(item))
> >
> > +static inline int is_opaque_item(TreeItem *item)
> > +{
> > +    return item->type == TREE_ITEM_TYPE_CONTAINER ||
> > +        (IS_DRAW_ITEM(item) && ((DrawItem *)item)->effect ==
> > QXL_EFFECT_OPAQUE);
> > +}
> > +
> >  void       tree_item_dump                           (TreeItem *item);
> >  Shadow*    shadow_new                               (DrawItem *item, const
> >  SpicePoint *delta);
> >  Container* container_new                            (DrawItem *item);
> > --
> > 2.4.3
> >
> > _______________________________________________
> > Spice-devel mailing list
> > Spice-devel at lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/spice-devel
> 
> 
> Looks good, ACK!

Merged

Frediano


More information about the Spice-devel mailing list