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

surface: fix double wl_buffer.release events

Browse source 
Prior to this commit, we re-uploaded the buffer even if a new one
wasn't attached. After uploading, we send wl_buffer.release. So,
this sequence of requests resulted in a double release:

    surface.attach(buffer, 0, 0)
    surface.commit()
    <- buffer.release()
    surface.commit()
    <- buffer.release()
This commit is contained in:
emersion 2018-06-17 12:49:34 +01:00
parent fb118ac996
commit 843621714f
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
1 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
types/wlr_surface.c
View file

@ -325,8 +325,7 @@ static void surface_damage_subsurfaces(struct wlr_subsurface *subsurface) {
}
}
static void surface_apply_damage(struct wlr_surface *surface,
bool invalid_buffer) {
static void surface_apply_damage(struct wlr_surface *surface) {
struct wl_resource *resource = surface->current->buffer;
if (resource == NULL) {
// NULL commit
@ -335,12 +334,6 @@ static void surface_apply_damage(struct wlr_surface *surface,
return;
}
if (surface->buffer != NULL && !surface->buffer->released &&
!invalid_buffer) {
// The buffer is still the same, no need to re-upload
return;
}
if (surface->buffer != NULL && surface->buffer->released) {
pixman_region32_t damage;
pixman_region32_init(&damage);
@ -376,7 +369,9 @@ static void surface_commit_pending(struct wlr_surface *surface) {
surface_move_state(surface, surface->pending, surface->current);
surface_apply_damage(surface, invalid_buffer);
if (invalid_buffer) {
surface_apply_damage(surface);
}
// commit subsurface order
struct wlr_subsurface *subsurface;