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

Merge branch 'surface-fix-buffer-release'

This commit is contained in:
Drew DeVault 2018-06-08 19:54:11 -04:00
parent 8770449eb7 3e83f9d6b8
commit 7f3ad497eb
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
types/wlr_surface.c
View File

@ -394,6 +394,10 @@ static void surface_apply_damage(struct wlr_surface *surface,
} }
wl_shm_buffer_end_access(buf); wl_shm_buffer_end_access(buf);
// We've uploaded the wl_shm_buffer data to the GPU, we won't access the
// wl_buffer anymore
surface_state_release_buffer(surface->current);
} else if (invalid_buffer || reupload_buffer) { } else if (invalid_buffer || reupload_buffer) {
wlr_texture_destroy(surface->texture); wlr_texture_destroy(surface->texture);
@ -409,9 +413,10 @@ static void surface_apply_damage(struct wlr_surface *surface,
surface->texture = NULL; surface->texture = NULL;
wlr_log(L_ERROR, "Unknown buffer handle attached"); wlr_log(L_ERROR, "Unknown buffer handle attached");
} }
}
surface_state_release_buffer(surface->current); // Don't release the wl_buffer yet: since the texture is shared with the
// client, we'll access the wl_buffer when rendering
}
} }
static void surface_commit_pending(struct wlr_surface *surface) { static void surface_commit_pending(struct wlr_surface *surface) {