[Spice-devel] [RFC v4 32/62] server/red_worker: fix red_pipe_get_tail

[Marc-André Lureau]

Why did you choose to do it seperately from 29/62?

On Tue, Apr 26, 2011 at 12:54 PM, Alon Levy <alevy at redhat.com> wrote:
> ---
>  server/red_worker.c |   11 +++++------
>  1 files changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/server/red_worker.c b/server/red_worker.c
> index d6762be..4fbcb4f 100644
> --- a/server/red_worker.c
> +++ b/server/red_worker.c
> @@ -1287,13 +1287,13 @@ static inline void red_pipe_add_drawable_after(DisplayChannelClient *dcc, Drawab
>     red_channel_client_pipe_add_after(&dcc->common.base, &drawable->pipe_item, &pos_after->pipe_item);
>  }
>
> -static inline PipeItem *red_pipe_get_tail(RedWorker *worker)
> +static inline PipeItem *red_pipe_get_tail(DisplayChannelClient *dcc)
>  {
> -    if (!display_connected(worker)) {
> +    if (!dcc) {
>         return NULL;
>     }
>
> -    return (PipeItem*)ring_get_tail(&worker->display_channel->common.base.rcc->pipe);
> +    return (PipeItem*)ring_get_tail(&dcc->common.base.pipe);
>  }
>
>  static inline void red_destroy_surface(RedWorker *worker, Surfaces *surfaces, uint32_t surface_id);
> @@ -6451,7 +6451,7 @@ static void red_add_lossless_drawable_dependencies(RedWorker *worker,
>         // will be executed before the current drawable
>         for (i = 0; i < num_deps; i++) {
>             red_add_surface_area_image(worker, deps_surfaces_ids[i], deps_areas[i],
> -                                       red_pipe_get_tail(worker), FALSE);
> +                                       red_pipe_get_tail(dcc), FALSE);
>
>         }
>     } else {
> @@ -6471,9 +6471,8 @@ static void red_add_lossless_drawable_dependencies(RedWorker *worker,
>                                                             &drawable->bbox);
>         }
>
> -
>         red_add_surface_area_image(worker, drawable->surface_id, &drawable->bbox,
> -                                   red_pipe_get_tail(worker), TRUE);
> +                                   red_pipe_get_tail(dcc), TRUE);
>     }
>  }
>
> --
> 1.7.4.4
>
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/spice-devel
>



-- 
Marc-André Lureau