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

Merge pull request #101 from nyorain/texture_fix 

Fix surface buffer uploading
This commit is contained in:
Drew DeVault 2017-08-18 10:16:45 -04:00 committed by GitHub
parent dd4ebb5805 10eee58d2d
commit e5fd858394
2 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/wlr/types/wlr_surface.h
View File

@ -38,6 +38,7 @@ struct wlr_surface {
float buffer_to_surface_matrix[16]; float buffer_to_surface_matrix[16];
float surface_to_buffer_matrix[16]; float surface_to_buffer_matrix[16];
bool reupload_buffer;
struct { struct {
struct wl_signal commit; struct wl_signal commit;

16
types/wlr_surface.c
View File

@ -206,8 +206,13 @@ static void surface_commit(struct wl_client *client,
surface->current.buffer = surface->pending.buffer; surface->current.buffer = surface->pending.buffer;
} }
if ((surface->pending.invalid & WLR_SURFACE_INVALID_SURFACE_DAMAGE)) { if ((surface->pending.invalid & WLR_SURFACE_INVALID_SURFACE_DAMAGE)) {
int32_t oldw = surface->current.buffer_width;
int32_t oldh = surface->current.buffer_height;
wlr_surface_update_size(surface); wlr_surface_update_size(surface);
surface->reupload_buffer = oldw != surface->current.buffer_width ||
oldh != surface->current.buffer_height;
pixman_region32_union(&surface->current.surface_damage, pixman_region32_union(&surface->current.surface_damage,
&surface->current.surface_damage, &surface->current.surface_damage,
&surface->pending.surface_damage); &surface->pending.surface_damage);
@ -257,13 +262,17 @@ void wlr_surface_flush_damage(struct wlr_surface *surface) {
return; return;
} }
} }
uint32_t format = wl_shm_buffer_get_format(buffer);
if (surface->reupload_buffer) {
wlr_texture_upload_shm(surface->texture, format, buffer);
} else {
pixman_region32_t damage = surface->current.buffer_damage; pixman_region32_t damage = surface->current.buffer_damage;
if (!pixman_region32_not_empty(&damage)) { if (!pixman_region32_not_empty(&damage)) {
goto release; goto release;
} }
int n; int n;
pixman_box32_t *rects = pixman_region32_rectangles(&damage, &n); pixman_box32_t *rects = pixman_region32_rectangles(&damage, &n);
uint32_t format = wl_shm_buffer_get_format(buffer);
for (int i = 0; i < n; ++i) { for (int i = 0; i < n; ++i) {
pixman_box32_t rect = rects[i]; pixman_box32_t rect = rects[i];
if (!wlr_texture_update_shm(surface->texture, format, if (!wlr_texture_update_shm(surface->texture, format,
@ -274,12 +283,15 @@ void wlr_surface_flush_damage(struct wlr_surface *surface) {
break; break;
} }
} }
}
release:
pixman_region32_fini(&surface->current.surface_damage); pixman_region32_fini(&surface->current.surface_damage);
pixman_region32_init(&surface->current.surface_damage); pixman_region32_init(&surface->current.surface_damage);
pixman_region32_fini(&surface->current.buffer_damage); pixman_region32_fini(&surface->current.buffer_damage);
pixman_region32_init(&surface->current.buffer_damage); pixman_region32_init(&surface->current.buffer_damage);
release:
wl_resource_queue_event(surface->current.buffer, WL_BUFFER_RELEASE); wl_resource_queue_event(surface->current.buffer, WL_BUFFER_RELEASE);
} }