mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-03 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

backend/x11: ensure buffers are released on shutdown

Browse source 
(cherry picked from commit afe1ae4479)
This commit is contained in:
Simon Ser 2022-12-06 20:22:55 +01:00
parent 14b58a5b3a
commit cdd510a65c
2 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
backend/x11/output.c
View file

@ -140,6 +140,9 @@ static void destroy_x11_buffer(struct wlr_x11_buffer *buffer) {
wl_list_remove(&buffer->buffer_destroy.link); wl_list_remove(&buffer->buffer_destroy.link);
wl_list_remove(&buffer->link); wl_list_remove(&buffer->link);
xcb_free_pixmap(buffer->x11->xcb, buffer->pixmap); xcb_free_pixmap(buffer->x11->xcb, buffer->pixmap);
for (size_t i = 0; i < buffer->n_busy; i++) {
wlr_buffer_unlock(buffer->buffer);
}
free(buffer); free(buffer);
} }
@ -263,6 +266,7 @@ static struct wlr_x11_buffer *get_or_create_x11_buffer(
wl_list_for_each(buffer, &output->buffers, link) { wl_list_for_each(buffer, &output->buffers, link) {
if (buffer->buffer == wlr_buffer) { if (buffer->buffer == wlr_buffer) {
wlr_buffer_lock(buffer->buffer); wlr_buffer_lock(buffer->buffer);
buffer->n_busy++;
return buffer; return buffer;
} }
} }
@ -675,6 +679,8 @@ void handle_x11_present_event(struct wlr_x11_backend *x11,
return; return;
} }
assert(buffer->n_busy > 0);
buffer->n_busy--;
wlr_buffer_unlock(buffer->buffer); // may destroy buffer wlr_buffer_unlock(buffer->buffer); // may destroy buffer
break; break;
case XCB_PRESENT_COMPLETE_NOTIFY:; case XCB_PRESENT_COMPLETE_NOTIFY:;

1
include/backend/x11.h
View file

@ -113,6 +113,7 @@ struct wlr_x11_buffer {
xcb_pixmap_t pixmap; xcb_pixmap_t pixmap;
struct wl_list link; // wlr_x11_output::buffers struct wl_list link; // wlr_x11_output::buffers
struct wl_listener buffer_destroy; struct wl_listener buffer_destroy;
size_t n_busy;
}; };
struct wlr_x11_format { struct wlr_x11_format {