From 3d0f4e3642aa5610e99a60ae92627bd7b0450b55 Mon Sep 17 00:00:00 2001 From: Marc-André Lureau Date: Mon, 23 Nov 2015 17:02:03 +0000 Subject: display: factor out draw_until MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Acked-by: Fabiano Fidêncio --- server/display-channel.c | 58 ++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 32 deletions(-) (limited to 'server') diff --git a/server/display-channel.c b/server/display-channel.c index d54f7256..d2ee5238 100644 --- a/server/display-channel.c +++ b/server/display-channel.c @@ -1282,6 +1282,29 @@ static void surface_update_dest(RedSurface *surface, const SpiceRect *area) canvas->ops->read_bits(canvas, dest, -stride, area); } +static void draw_until(DisplayChannel *display, RedSurface *surface, Drawable *last) +{ + RingItem *ring_item; + Container *container; + Drawable *now; + + do { + ring_item = ring_get_tail(&surface->current_list); + now = SPICE_CONTAINEROF(ring_item, Drawable, surface_list_link); + now->refs++; + container = now->tree_item.base.container; + current_remove_drawable(display, now); + container_cleanup(container); + /* drawable_draw may call display_channel_draw for the surfaces 'now' depends on. Notice, + that it is valid to call display_channel_draw in this case and not display_channel_draw_till: + It is impossible that there was newer item then 'last' in one of the surfaces + that display_channel_draw is called for, Otherwise, 'now' would have already been rendered. + See the call for red_handle_depends_on_target_surface in red_process_draw */ + drawable_draw(display, now); + display_channel_drawable_unref(display, now); + } while (now != last); +} + /* * Renders drawables for updating the requested area, but only drawables that are older * than 'last' (exclusive). @@ -1345,23 +1368,8 @@ void display_channel_draw_till(DisplayChannel *display, const SpiceRect *area, i return; } - do { - Container *container; + draw_until(display, surface, surface_last); - ring_item = ring_get_tail(&surface->current_list); - now = SPICE_CONTAINEROF(ring_item, Drawable, surface_list_link); - now->refs++; - container = now->tree_item.base.container; - current_remove_drawable(display, now); - container_cleanup(container); - /* drawable_draw may call display_channel_draw for the surfaces 'now' depends on. Notice, - that it is valid to call display_channel_draw in this case and not display_channel_draw_till: - It is impossible that there was newer item then 'last' in one of the surfaces - that display_channel_draw is called for, Otherwise, 'now' would have already been rendered. - See the call for red_handle_depends_on_target_surface in red_process_draw */ - drawable_draw(display, now); - display_channel_drawable_unref(display, now); - } while (now != surface_last); surface_update_dest(surface, area); } @@ -1398,22 +1406,8 @@ void display_channel_draw(DisplayChannel *display, const SpiceRect *area, int su } region_destroy(&rgn); - if (!last) { - surface_update_dest(surface, area); - return; - } - - do { - Container *container; + if (last) + draw_until(display, surface, last); - ring_item = ring_get_tail(&surface->current_list); - now = SPICE_CONTAINEROF(ring_item, Drawable, surface_list_link); - now->refs++; - container = now->tree_item.base.container; - current_remove_drawable(display, now); - container_cleanup(container); - drawable_draw(display, now); - display_channel_drawable_unref(display, now); - } while (now != last); surface_update_dest(surface, area); } -- cgit