X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-terminal%2Fgrdev.c;h=a700a7316bb2e3351839909e418d8b4248d512ac;hb=51cff8bdedbc283b2403ab4a688903d8b1f2fab5;hp=bbc45afad48a11ede0454c2d7a02e10d7cb7253f;hpb=aec3f44651998211d559b474bb830aad65680a62;p=elogind.git diff --git a/src/libsystemd-terminal/grdev.c b/src/libsystemd-terminal/grdev.c index bbc45afad..a700a7316 100644 --- a/src/libsystemd-terminal/grdev.c +++ b/src/libsystemd-terminal/grdev.c @@ -343,7 +343,7 @@ void grdev_display_disable(grdev_display *display) { } } -const grdev_display_target *grdev_display_next_target(grdev_display *display, const grdev_display_target *prev, uint64_t minage) { +const grdev_display_target *grdev_display_next_target(grdev_display *display, const grdev_display_target *prev) { grdev_display_cache *cache; size_t idx; @@ -374,26 +374,19 @@ const grdev_display_target *grdev_display_next_target(grdev_display *display, co if (!pipe->running || !pipe->enabled) continue; - /* if front-buffer is up-to-date, there's nothing to do */ - if (minage > 0 && pipe->front && pipe->front->age >= minage) - continue; - /* find suitable back-buffer */ - if (!(fb = pipe->back)) { - if (!pipe->vtable->target || !(fb = pipe->vtable->target(pipe))) + if (!pipe->back) { + if (!pipe->vtable->target) + continue; + if (!(fb = pipe->vtable->target(pipe))) continue; assert(fb == pipe->back); } - /* if back-buffer is up-to-date, schedule flip */ - if (minage > 0 && fb->age >= minage) { - grdev_display_flip_target(display, target, fb->age); - continue; - } + target->front = pipe->front; + target->back = pipe->back; - /* we have an out-of-date back-buffer; return for redraw */ - target->fb = fb; return target; } @@ -408,7 +401,7 @@ void grdev_display_flip_target(grdev_display *display, const grdev_display_targe assert(!display->modified); assert(display->enabled); assert(target); - assert(target->fb); + assert(target->back); cache = container_of(target, grdev_display_cache, target); @@ -416,12 +409,12 @@ void grdev_display_flip_target(grdev_display *display, const grdev_display_targe assert(cache->pipe->tile->display == display); /* reset age of all FB on overflow */ - if (age < target->fb->age) + if (age < target->back->age) for (i = 0; i < cache->pipe->max_fbs; ++i) if (cache->pipe->fbs[i]) cache->pipe->fbs[i]->age = 0; - ((grdev_fb*)target->fb)->age = age; + ((grdev_fb*)target->back)->age = age; cache->pipe->flip = true; }