summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2011-05-02 13:52:00 -0400
committerKristian Høgsberg <krh@bitplanet.net>2011-05-02 13:52:00 -0400
commita04eecc27b9c69e78d225bd1e6fe8938adf572b1 (patch)
tree48d7bfef62f38d96c23f8375e468612d6c2fc06e
parent2e94d1120a417537dca4da192b0a4cce6ebefe56 (diff)
compositor: Drop broken opaque repaint optimization for now
-rw-r--r--compositor/compositor.c22
1 files changed, 1 insertions, 21 deletions
diff --git a/compositor/compositor.c b/compositor/compositor.c
index 944e1bc7..0cde2a8d 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);
}
}