From 66951b7f87034e8e4d1cf0e95980de0b4abcbe20 Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Mon, 1 Sep 2014 10:33:28 -0500 Subject: pixman-renderer: fail to zoom more gracefully When zoom is activated in the pixman rendered the log is filled with warnings and all rendering stops. With this patch the warning is generated once and rendering continues without zooming. Closes bug 80258 Bug: https://bugs.freedesktop.org/show_bug.cgi?id=80258 Tested-by: Pekka Paalanen --- src/pixman-renderer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pixman-renderer.c b/src/pixman-renderer.c index 4fdcb051..351f00e7 100644 --- a/src/pixman-renderer.c +++ b/src/pixman-renderer.c @@ -385,6 +385,7 @@ static void draw_view(struct weston_view *ev, struct weston_output *output, pixman_region32_t *damage) /* in global coordinates */ { + static int zoom_logged = 0; struct pixman_surface_state *ps = get_surface_state(ev->surface); /* repaint bounding region in global coordinates: */ pixman_region32_t repaint; @@ -403,9 +404,9 @@ draw_view(struct weston_view *ev, struct weston_output *output, if (!pixman_region32_not_empty(&repaint)) goto out; - if (output->zoom.active) { + if (output->zoom.active && !zoom_logged) { weston_log("pixman renderer does not support zoom\n"); - goto out; + zoom_logged = 1; } /* TODO: Implement repaint_region_complex() using pixman_composite_trapezoids() */ -- cgit v1.2.1