aboutsummaryrefslogtreecommitdiff
path: root/shm.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-03-23 19:45:27 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-03-23 19:45:27 +0000
commit0de3701984ff3b09a804d8369dafc3cd5baefdcc (patch)
tree7230436425622eb1f1b58d8392dc42fb6400e9e3 /shm.c
parentrender: scroll: use shm scrolling even though we have a top region (diff)
shm: scroll: move top/bottom region handling from renderer into shm
This allows us to restore the regions without copying the contents to temporary memory.
Diffstat (limited to 'shm.c')
-rw-r--r--shm.c49
1 files changed, 43 insertions, 6 deletions
diff --git a/shm.c b/shm.c
index 59dcb2ac..d05210a2 100644
--- a/shm.c
+++ b/shm.c
@@ -287,7 +287,9 @@ shm_can_scroll(void)
}
bool
-shm_scroll(struct wl_shm *shm, struct buffer *buf, int rows)
+shm_scroll(struct wl_shm *shm, struct buffer *buf, int rows,
+ int top_margin, int top_keep_rows,
+ int bottom_margin, int bottom_keep_rows)
{
assert(can_punch_hole);
assert(buf->busy);
@@ -323,8 +325,24 @@ shm_scroll(struct wl_shm *shm, struct buffer *buf, int rows)
struct timeval tot;
timersub(&time1, &time0, &tot);
- LOG_INFO("fallocate: %lds %ldus", tot.tv_sec, tot.tv_usec);
+ LOG_INFO("ftruncate: %lds %ldus", tot.tv_sec, tot.tv_usec);
+
+ struct timeval time2 = time1;
+#endif
+
+ if (top_keep_rows > 0) {
+ /* Copy current 'top' region to its new location */
+ memmove(
+ (uint8_t *)buf->mmapped + (top_margin + rows) * buf->stride,
+ (uint8_t *)buf->mmapped + (top_margin + 0) * buf->stride,
+ top_keep_rows * buf->stride);
+
+#if TIME_SCROLL
+ gettimeofday(&time2, NULL);
+ timersub(&time2, &time1, &tot);
+ LOG_INFO("memmove (top region): %lds %ldus", tot.tv_sec, tot.tv_usec);
#endif
+ }
/* Destroy old objects (they point to the old offset) */
pixman_image_unref(buf->pix);
@@ -341,13 +359,32 @@ shm_scroll(struct wl_shm *shm, struct buffer *buf, int rows)
}
#if TIME_SCROLL
- struct timeval time2;
- gettimeofday(&time2, NULL);
- timersub(&time2, &time1, &tot);
+ struct timeval time3;
+ gettimeofday(&time3, NULL);
+ timersub(&time3, &time2, &tot);
LOG_INFO("PUNCH HOLE: %lds %ldus", tot.tv_sec, tot.tv_usec);
#endif
- return instantiate_offset(shm, buf, new_offset);
+
+ bool ret = instantiate_offset(shm, buf, new_offset);
+
+ if (ret && bottom_keep_rows > 0) {
+ /* Copy 'bottom' region to its new location */
+ memmove(
+ (uint8_t *)buf->mmapped + buf->size - (bottom_margin + bottom_keep_rows) * buf->stride,
+ (uint8_t *)buf->mmapped + buf->size - (bottom_margin + rows + bottom_keep_rows) * buf->stride,
+ bottom_keep_rows * buf->stride);
+
+#if TIME_SCROLL
+ struct timeval time4;
+ gettimeofday(&time4, NULL);
+
+ timersub(&time4, &time3, &tot);
+ LOG_INFO("memmove (bottom region): %lds %ldus", tot.tv_sec, tot.tv_usec);
+#endif
+ }
+
+ return ret;
}
void