[Spice-devel] [PATCH 04/10] worker: move delta computation

[Frediano Ziglio]

> 
> On Thu, Nov 5, 2015 at 10:14 AM, Frediano Ziglio <fziglio at redhat.com> wrote:
> > From: Marc-André Lureau <marcandre.lureau at gmail.com>
> >
> > Move delta computation from red_add_drawable to
> > red_current_add_with_shadow.
> > ---
> >  server/red_worker.c | 17 +++++++++--------
> >  1 file changed, 9 insertions(+), 8 deletions(-)
> >
> > diff --git a/server/red_worker.c b/server/red_worker.c
> > index 8f7a28b..8cd709a 100644
> > --- a/server/red_worker.c
> > +++ b/server/red_worker.c
> > @@ -2982,15 +2982,20 @@ static inline Shadow *__new_shadow(RedWorker
> > *worker, Drawable *item, SpicePoint
> >      return shadow;
> >  }
> >
> > -static inline int red_current_add_with_shadow(RedWorker *worker, Ring
> > *ring, Drawable *item,
> > -                                              SpicePoint *delta)
> > +static inline int red_current_add_with_shadow(RedWorker *worker, Ring
> > *ring, Drawable *item)
> >  {
> >  #ifdef RED_WORKER_STAT
> >      stat_time_t start_time = stat_now(worker);
> >      ++worker->add_with_shadow_count;
> >  #endif
> >
> > -    Shadow *shadow = __new_shadow(worker, item, delta);
> > +    RedDrawable *red_drawable = item->red_drawable;
> > +    SpicePoint delta = {
> > +        .x = red_drawable->u.copy_bits.src_pos.x -
> > red_drawable->bbox.left,
> > +        .y = red_drawable->u.copy_bits.src_pos.y - red_drawable->bbox.top
> > +    };
> > +
> > +    Shadow *shadow = __new_shadow(worker, item, &delta);
> >      if (!shadow) {
> >          stat_add(&worker->add_stat, start_time);
> >          return FALSE;
> > @@ -3098,11 +3103,7 @@ static int red_add_drawable(RedWorker *worker,
> > Drawable *drawable)
> >      Ring *ring = &worker->surfaces[surface_id].current;
> >
> >      if (has_shadow(red_drawable)) {
> > -        SpicePoint delta = {
> > -            .x = red_drawable->u.copy_bits.src_pos.x -
> > red_drawable->bbox.left,
> > -            .y = red_drawable->u.copy_bits.src_pos.y -
> > red_drawable->bbox.top
> > -        };
> > -        ret = red_current_add_with_shadow(worker, ring, drawable, &delta);
> > +        ret = red_current_add_with_shadow(worker, ring, drawable);
> >      } else {
> >          red_update_streamable(worker, drawable, red_drawable);
> >          ret = red_current_add(worker, ring, drawable);
> > --
> > 2.4.3
> >
> > _______________________________________________
> > Spice-devel mailing list
> > Spice-devel at lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/spice-devel
> 
> Looks good to me. ACK!
> Btw, nice split :-)
> 

Merged

Frediano