aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-03-22 19:32:11 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-03-22 19:34:58 +0000
commit3b9be09b065d50cc0d698faf6a855627b5cf86cc (patch)
treea0eb5206cf630127792001edad0e334570340263
parentrender: use shm_scroll() when we believe it will be faster (diff)
shm: scroll: no need to instantiate a new buffer when ftruncate() fails
-rw-r--r--shm.c22
1 files changed, 1 insertions, 21 deletions
diff --git a/shm.c b/shm.c
index a96bda4f..1d36137b 100644
--- a/shm.c
+++ b/shm.c
@@ -289,27 +289,7 @@ shm_scroll(struct wl_shm *shm, struct buffer *buf, int rows)
if (ftruncate(buf->fd, new_offset + buf->size) < 0) {
LOG_ERRNO("failed increase memfd size from %zu -> %zu",
buf->offset + buf->size, new_offset + buf->size);
-
- /* Instantiate a new buffer and copy over our content */
- struct buffer *fresh_buf = shm_get_buffer(shm, buf->width, buf->height, buf->cookie);
-
- memcpy(fresh_buf->mmapped,
- (const uint8_t *)buf->mmapped + rows * buf->stride,
- buf->size - rows * buf->stride);
-
- buffer_destroy(buf);
- *buf = *fresh_buf;
-
- assert(false);
-
- /* Mark copied buffer for deletion, but make sure we don't
- * free any of its resources */
- fresh_buf->pix = NULL;
- fresh_buf->wl_buf = NULL;
- fresh_buf->real_mmapped = MAP_FAILED;
- fresh_buf->fd = -1;
- fresh_buf->purge = true;
- return true;
+ return false;
}
#if TIME_SCROLL