[Spice-devel] [PATCH v2 1/3] worker: s/validate_area/surface_update_dest

[Jonathon Jongsma]

On Mon, 2015-11-23 at 13:33 -0600, Jonathon Jongsma wrote:
> Acked-by: Jonathon Jongsma <jjongsma at redhat.com>
> 

I take it back.  This should probably be re-merged with the next patch. See
below.

> 
> 
> On Mon, 2015-11-23 at 19:45 +0100, Fabiano Fidêncio wrote:
> > From: Marc-André Lureau <marcandre.lureau at gmail.com>
> > 
> > ---
> >  server/red_worker.c | 8 ++++----
> >  1 file changed, 4 insertions(+), 4 deletions(-)
> > 
> > diff --git a/server/red_worker.c b/server/red_worker.c
> > index becd42f..efadd91 100644
> > --- a/server/red_worker.c
> > +++ b/server/red_worker.c
> > @@ -936,7 +936,7 @@ static void image_surface_init(DisplayChannel *display)
> >      display->image_surfaces.ops = &image_surfaces_ops;
> >  }
> >  
> > -static void validate_area(DisplayChannel *display, const SpiceRect *area,
> > uint32_t surface_id)
> > +static void surface_update_dest(DisplayChannel *display, RedSurface
> > *surface,
> > const SpiceRect *area)
> >  {
> >      RedSurface *surface;

This introduces a 'surface' argument while retaining the local 'surface'
variable. That doesn't really make sense. Either this commit should only change
the name (and not the parameters) or we should merge it with the next commit.


> >  
> > @@ -1037,7 +1037,7 @@ void display_channel_draw_till(DisplayChannel
> > *display,
> > const SpiceRect *area, i
> >          drawable_draw(display, now);
> >          display_channel_drawable_unref(display, now);
> >      } while (now != surface_last);
> > -    validate_area(display, area, surface_id);
> > +    surface_update_dest(display, surface, area);
> >  }
> >  
> >  void display_channel_draw(DisplayChannel *display, const SpiceRect *area,
> > int
> > surface_id)
> > @@ -1074,7 +1074,7 @@ void display_channel_draw(DisplayChannel *display,
> > const
> > SpiceRect *area, int su
> >      region_destroy(&rgn);
> >  
> >      if (!last) {
> > -        validate_area(display, area, surface_id);
> > +        surface_update_dest(display, surface, area);
> >          return;
> >      }
> >  
> > @@ -1090,7 +1090,7 @@ void display_channel_draw(DisplayChannel *display,
> > const
> > SpiceRect *area, int su
> >          drawable_draw(display, now);
> >          display_channel_drawable_unref(display, now);
> >      } while (now != last);
> > -    validate_area(display, area, surface_id);
> > +    surface_update_dest(display, surface, area);
> >  }
> >  
> >  static int red_process_cursor(RedWorker *worker, uint32_t max_pipe_size,
> > int