blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #777 from emersion/fix-surface-buffer-not-updated 

surface: fix texture not updated on commit
This commit is contained in:
Drew DeVault 2018-03-29 20:48:10 -04:00 committed by GitHub
parent 4137d9fc80 6bbf507082
commit 8ada41c272
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
types/wlr_surface.c
View File

@ -331,7 +331,7 @@ static void wlr_surface_damage_subsurfaces(struct wlr_subsurface *subsurface) {
} }
static void wlr_surface_apply_damage(struct wlr_surface *surface, 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; struct wl_resource *resource = surface->current->buffer;
if (resource == NULL) { if (resource == NULL) {
return; return;
@ -374,7 +374,7 @@ static void wlr_surface_apply_damage(struct wlr_surface *surface,
} }
wl_shm_buffer_end_access(buf); wl_shm_buffer_end_access(buf);
} else if (!surface->texture || reupload_buffer) { } else if (invalid_buffer || reupload_buffer) {
wlr_texture_destroy(surface->texture); wlr_texture_destroy(surface->texture);
if (wlr_renderer_resource_is_wl_drm_buffer(surface->renderer, resource)) { 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 oldw = surface->current->buffer_width;
int32_t oldh = surface->current->buffer_height; int32_t oldh = surface->current->buffer_height;
bool null_buffer_commit = bool invalid_buffer = surface->pending->invalid & WLR_SURFACE_INVALID_BUFFER;
(surface->pending->invalid & WLR_SURFACE_INVALID_BUFFER && bool null_buffer_commit = invalid_buffer && surface->pending->buffer == NULL;
surface->pending->buffer == NULL);
wlr_surface_move_state(surface, surface->pending, surface->current); 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 || bool reupload_buffer = oldw != surface->current->buffer_width ||
oldh != surface->current->buffer_height; oldh != surface->current->buffer_height;
wlr_surface_apply_damage(surface, reupload_buffer); wlr_surface_apply_damage(surface, invalid_buffer, reupload_buffer);
// commit subsurface order // commit subsurface order
struct wlr_subsurface *subsurface; struct wlr_subsurface *subsurface;