diff options
| author | emersion <contact@emersion.fr> | 2018-06-17 18:24:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-17 18:24:34 +0100 |
| commit | cc89906ddfe249c59cfa35babf1aeccaae3b5e26 (patch) | |
| tree | ac2f7f681e92618b1cea797c00a1ee22813e88dc | |
| parent | fb118ac9966bbb663ddb9964f54c879a0bb88fba (diff) | |
| parent | 843621714fff0dc4c1ce63e105a03b5d4028b833 (diff) | |
Merge pull request #1067 from emersion/fix-surface-double-release
surface: fix double wl_buffer.release events
| -rw-r--r-- | types/wlr_surface.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/types/wlr_surface.c b/types/wlr_surface.c index af1e9446..0f84312e 100644 --- a/types/wlr_surface.c +++ b/types/wlr_surface.c @@ -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; |