From a04eecc27b9c69e78d225bd1e6fe8938adf572b1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20H=C3=B8gsberg?= Date: Mon, 2 May 2011 13:52:00 -0400 Subject: [PATCH] compositor: Drop broken opaque repaint optimization for now --- compositor/compositor.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/compositor/compositor.c b/compositor/compositor.c index 944e1bc..0cde2a8 100644 --- a/compositor/compositor.c +++ b/compositor/compositor.c @@ -675,7 +675,7 @@ wlsc_output_repaint(struct wlsc_output *output) struct wlsc_compositor *ec = output->compositor; struct wlsc_surface *es; struct wlsc_input_device *eid; - pixman_region32_t new_damage, total_damage, repaint; + pixman_region32_t new_damage, total_damage; int using_hardware_cursor = 1; output->prepare_render(output); @@ -724,18 +724,6 @@ wlsc_output_repaint(struct wlsc_output *output) glClear(GL_COLOR_BUFFER_BIT); wlsc_surface_draw(es, output, &total_damage); } else { - wl_list_for_each(es, &ec->surface_list, link) { - if (es->visual != &ec->compositor.rgb_visual) - continue; - - pixman_region32_init_rect(&repaint, - es->x, es->y, - es->width, es->height); - wlsc_surface_draw(es, output, &total_damage); - pixman_region32_subtract(&total_damage, - &total_damage, &repaint); - } - if (output->background) wlsc_surface_draw(output->background, output, &total_damage); @@ -747,14 +735,6 @@ wlsc_output_repaint(struct wlsc_output *output) if (ec->overlay == es) continue; - if (es->visual == &ec->compositor.rgb_visual) { - pixman_region32_union_rect(&total_damage, - &total_damage, - es->x, es->y, - es->width, es->height); - continue; - } - wlsc_surface_draw(es, output, &total_damage); } } -- 2.7.4