From e624a6169b377dce98c43e5647933be334c87d59 Mon Sep 17 00:00:00 2001 From: Marc-André Lureau Date: Thu, 26 Sep 2013 13:18:52 +0200 Subject: worker: generalize surface_dirty_region_to_rects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Acked-by: Fabiano Fidêncio --- server/red_worker.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) (limited to 'server') diff --git a/server/red_worker.c b/server/red_worker.c index 4dcad83a..f49c2532 100644 --- a/server/red_worker.c +++ b/server/red_worker.c @@ -5489,24 +5489,20 @@ static void red_connect_cursor(RedWorker *worker, RedClient *client, RedsStream cursor_channel_init(channel, ccc); } -static void surface_dirty_region_to_rects(RedSurface *surface, - QXLRect *qxl_dirty_rects, - uint32_t num_dirty_rects) +static void region_to_qxlrects(QRegion *region, QXLRect *qxl_rects, uint32_t num_rects) { - QRegion *surface_dirty_region; - SpiceRect *dirty_rects; + SpiceRect *rects; int i; - surface_dirty_region = &surface->draw_dirty_region; - dirty_rects = spice_new0(SpiceRect, num_dirty_rects); - region_ret_rects(surface_dirty_region, dirty_rects, num_dirty_rects); - for (i = 0; i < num_dirty_rects; i++) { - qxl_dirty_rects[i].top = dirty_rects[i].top; - qxl_dirty_rects[i].left = dirty_rects[i].left; - qxl_dirty_rects[i].bottom = dirty_rects[i].bottom; - qxl_dirty_rects[i].right = dirty_rects[i].right; + rects = spice_new0(SpiceRect, num_rects); + region_ret_rects(region, rects, num_rects); + for (i = 0; i < num_rects; i++) { + qxl_rects[i].top = rects[i].top; + qxl_rects[i].left = rects[i].left; + qxl_rects[i].bottom = rects[i].bottom; + qxl_rects[i].right = rects[i].right; } - free(dirty_rects); + free(rects); } void display_channel_update(DisplayChannel *display, @@ -5527,7 +5523,7 @@ void display_channel_update(DisplayChannel *display, *qxl_dirty_rects = spice_new0(QXLRect, *num_dirty_rects); } - surface_dirty_region_to_rects(surface, *qxl_dirty_rects, *num_dirty_rects); + region_to_qxlrects(&surface->draw_dirty_region, *qxl_dirty_rects, *num_dirty_rects); if (clear_dirty) region_clear(&surface->draw_dirty_region); } -- cgit