diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-03-29 20:48:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-29 20:48:10 -0400 |
| commit | 8ada41c27200618b2b407cb095568f660a3e9cf2 (patch) | |
| tree | a282fbc316c045ffc5bbac003450bfb380c65d18 | |
| parent | 4137d9fc80fdf2ef03ff69a0b75ab52123517408 (diff) | |
| parent | 6bbf50708263dbda2a61a7c882d841f0b7b65ad6 (diff) | |
Merge pull request #777 from emersion/fix-surface-buffer-not-updated
surface: fix texture not updated on commit
| -rw-r--r-- | types/wlr_surface.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/types/wlr_surface.c b/types/wlr_surface.c index 3be7bdfc..672e6fea 100644 --- a/types/wlr_surface.c +++ b/types/wlr_surface.c @@ -331,7 +331,7 @@ static void wlr_surface_damage_subsurfaces(struct wlr_subsurface *subsurface) { } static void wlr_surface_apply_damage(struct wlr_surface *surface, - bool reupload_buffer) { + bool invalid_buffer, bool reupload_buffer) { struct wl_resource *resource = surface->current->buffer; if (resource == NULL) { return; @@ -374,7 +374,7 @@ static void wlr_surface_apply_damage(struct wlr_surface *surface, } wl_shm_buffer_end_access(buf); - } else if (!surface->texture || reupload_buffer) { + } else if (invalid_buffer || reupload_buffer) { wlr_texture_destroy(surface->texture); if (wlr_renderer_resource_is_wl_drm_buffer(surface->renderer, resource)) { @@ -398,9 +398,8 @@ static void wlr_surface_commit_pending(struct wlr_surface *surface) { int32_t oldw = surface->current->buffer_width; int32_t oldh = surface->current->buffer_height; - bool null_buffer_commit = - (surface->pending->invalid & WLR_SURFACE_INVALID_BUFFER && - surface->pending->buffer == NULL); + bool invalid_buffer = surface->pending->invalid & WLR_SURFACE_INVALID_BUFFER; + bool null_buffer_commit = invalid_buffer && surface->pending->buffer == NULL; wlr_surface_move_state(surface, surface->pending, surface->current); @@ -411,7 +410,7 @@ static void wlr_surface_commit_pending(struct wlr_surface *surface) { bool reupload_buffer = oldw != surface->current->buffer_width || oldh != surface->current->buffer_height; - wlr_surface_apply_damage(surface, reupload_buffer); + wlr_surface_apply_damage(surface, invalid_buffer, reupload_buffer); // commit subsurface order struct wlr_subsurface *subsurface; |