mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

clients/constraints: Fix up buffer handling 

Clear the selected buffer pointer immediately before the array walk to
pick a new buffer so we don't accidentally re-use the attached buffer
when it's already in use.

Set the buffer used bit only when we attach and commit a buffer - this way
we don't accidentally consume all our buffers with no way to have them
released.

Clean up buffers based on wl_buffer presence instead of used at end of
run.

Signed-off-by: Derek Foreman <derek.foreman@collabora.com>
This commit is contained in:
Derek Foreman 2024-06-12 15:02:55 -05:00
parent 83b37c0ac4
commit 2819cb51c6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clients/constraints.c
View File

@ -540,10 +540,10 @@ shm_pool_get_buffer(struct shm_pool *pool, const struct surface *surface)
if (buffer && !buffer->used) if (buffer && !buffer->used)
return buffer; return buffer;
buffer = NULL;
for (i = 0; i < ARRAY_LENGTH(pool->buffers); i++) { for (i = 0; i < ARRAY_LENGTH(pool->buffers); i++) {
if (!pool->buffers[i].used) { if (!pool->buffers[i].used) {
buffer = &pool->buffers[i]; buffer = &pool->buffers[i];
buffer->used = true;
/* ARRAY_LENGTH(pool->buffers) is a factor of pool->size */ /* ARRAY_LENGTH(pool->buffers) is a factor of pool->size */
offset = pool->size / ARRAY_LENGTH(pool->buffers) * i; offset = pool->size / ARRAY_LENGTH(pool->buffers) * i;
break; break;
@ -576,7 +576,6 @@ shm_pool_get_buffer(struct shm_pool *pool, const struct surface *surface)
CAIRO_STATUS_SUCCESS) { CAIRO_STATUS_SUCCESS) {
fprintf(stderr, "cairo failed to create surface\n"); fprintf(stderr, "cairo failed to create surface\n");
wl_buffer_destroy(buffer->wl_buffer); wl_buffer_destroy(buffer->wl_buffer);
buffer->used = false;
buffer->data = NULL; buffer->data = NULL;
return NULL; return NULL;
} }
@ -604,7 +603,7 @@ shm_pool_deinit(const struct shm_pool *pool)
for (i = 0; i < ARRAY_LENGTH(pool->buffers); i++) { for (i = 0; i < ARRAY_LENGTH(pool->buffers); i++) {
const struct buffer *b = &pool->buffers[i]; const struct buffer *b = &pool->buffers[i];
if (b->used) { if (b->wl_buffer) {
wl_buffer_destroy(b->wl_buffer); wl_buffer_destroy(b->wl_buffer);
cairo_surface_destroy(b->cairo_surface); cairo_surface_destroy(b->cairo_surface);
} }
@ -719,6 +718,7 @@ surface_redraw(struct surface *surface)
surface_draw_line(surface, surface->constraints->state); surface_draw_line(surface, surface->constraints->state);
surface->needs_redraw = false; surface->needs_redraw = false;
buffer->used = true;
wl_surface_attach(surface->wl_surface, buffer->wl_buffer, 0, 0); wl_surface_attach(surface->wl_surface, buffer->wl_buffer, 0, 0);
wl_surface_damage(surface->wl_surface, 0, 0, surface->width, surface->height); wl_surface_damage(surface->wl_surface, 0, 0, surface->width, surface->height);
} }