summaryrefslogtreecommitdiffstats
path: root/server/red_worker.c
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@gmail.com>2013-09-13 18:03:08 +0200
committerFrediano Ziglio <fziglio@redhat.com>2015-11-06 09:16:02 +0000
commitf1c7bca4d4676ae52f9fc807ef39c3034008353d (patch)
treeda98e125a0229edf3da52bee4eca5667bdc90512 /server/red_worker.c
parente603e96837d882174c55dc8e01750d0116881077 (diff)
downloadspice-f1c7bca4d4676ae52f9fc807ef39c3034008353d.tar.gz
spice-f1c7bca4d4676ae52f9fc807ef39c3034008353d.tar.xz
spice-f1c7bca4d4676ae52f9fc807ef39c3034008353d.zip
worker: move delta computation
Move delta computation from red_add_drawable to red_current_add_with_shadow. Acked-by: Fabiano Fidêncio <fidencio@redhat.com>
Diffstat (limited to 'server/red_worker.c')
-rw-r--r--server/red_worker.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/server/red_worker.c b/server/red_worker.c
index 2ba18960..fb05ef0e 100644
--- a/server/red_worker.c
+++ b/server/red_worker.c
@@ -2951,15 +2951,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;
@@ -3067,11 +3072,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);