On Thu, Nov 5, 2015 at 10:14 AM, Frediano Ziglio <fziglio@xxxxxxxxxx> wrote:
> From: Marc-André Lureau <marcandre.lureau@xxxxxxxxx>
>
> ---
> server/red_worker.c | 42 +++++++++++++++++++++++-------------------
> server/tree.h | 1 +
> 2 files changed, 24 insertions(+), 19 deletions(-)
>
> diff --git a/server/red_worker.c b/server/red_worker.c
> index d8a8a4a..8f7a28b 100644
> --- a/server/red_worker.c
> +++ b/server/red_worker.c
> @@ -2987,6 +2987,7 @@ static inline int red_current_add_with_shadow(RedWorker *worker, Ring *ring, Dra
> {
> #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);
> @@ -3062,24 +3063,8 @@ static inline void red_update_streamable(RedWorker *worker, Drawable *drawable,
> drawable->streamable = TRUE;
> }
>
> -static inline int red_current_add_qxl(RedWorker *worker, Ring *ring, Drawable *drawable,
> - RedDrawable *red_drawable)
> +static void red_print_stats(RedWorker *worker)
> {
> - int ret;
> -
> - if (has_shadow(red_drawable)) {
> - SpicePoint delta;
> -
> -#ifdef RED_WORKER_STAT
> - ++worker->add_with_shadow_count;
> -#endif
> - delta.x = red_drawable->u.copy_bits.src_pos.x - red_drawable->bbox.left;
> - delta.y = red_drawable->u.copy_bits.src_pos.y - red_drawable->bbox.top;
> - ret = red_current_add_with_shadow(worker, ring, drawable, &delta);
> - } else {
> - red_update_streamable(worker, drawable, red_drawable);
> - ret = red_current_add(worker, ring, drawable);
> - }
> #ifdef RED_WORKER_STAT
> if ((++worker->add_count % 100) == 0) {
> stat_time_t total = worker->add_stat.total;
> @@ -3104,6 +3089,26 @@ static inline int red_current_add_qxl(RedWorker *worker, Ring *ring, Drawable *d
> stat_reset(&worker->__exclude_stat);
> }
> #endif
> +}
> +
> +static int red_add_drawable(RedWorker *worker, Drawable *drawable)
> +{
> + int ret = FALSE, surface_id = drawable->surface_id;
> + RedDrawable *red_drawable = drawable->red_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);
> + } else {
> + red_update_streamable(worker, drawable, red_drawable);
> + ret = red_current_add(worker, ring, drawable);
> + }
> +
> + red_print_stats(worker);
> return ret;
> }
>
> @@ -3401,8 +3406,7 @@ static inline void red_process_draw(RedWorker *worker, RedDrawable *red_drawable
> goto cleanup;
> }
>
> - if (red_current_add_qxl(worker, &worker->surfaces[surface_id].current, drawable,
> - red_drawable)) {
> + if (red_add_drawable(worker, drawable)) {
> if (drawable->tree_item.effect != QXL_EFFECT_OPAQUE) {
> worker->transparent_count++;
> }
> diff --git a/server/tree.h b/server/tree.h
> index 704bf53..82f9ce3 100644
> --- a/server/tree.h
> +++ b/server/tree.h
> @@ -45,6 +45,7 @@ struct TreeItem {
> QRegion rgn;
> };
>
> +/* A region "below" a copy, or the src region of the copy */
> struct Shadow {
> TreeItem base;
> QRegion on_hold;
> --
> 2.4.3
>
> _______________________________________________
> Spice-devel mailing list
> Spice-devel@xxxxxxxxxxxxxxxxxxxxx
> http://lists.freedesktop.org/mailman/listinfo/spice-devel
Look goods to me. ACK!
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/spice-devel