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

wlr_surface: more consistent argument naming in surface_update_damage

This commit is contained in:
random human 2018-09-25 02:06:02 +05:30
parent 5eca5d8946
commit 84ecfb546b
No known key found for this signature in database
GPG Key ID: 73E5A60444CC77A3
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
types/wlr_surface.c
View File

@ -170,39 +170,39 @@ static void surface_state_finalize(struct wlr_surface *surface,
} }
static void surface_update_damage(pixman_region32_t *buffer_damage, static void surface_update_damage(pixman_region32_t *buffer_damage,
struct wlr_surface_state *previous, struct wlr_surface_state *current) { struct wlr_surface_state *current, struct wlr_surface_state *pending) {
pixman_region32_clear(buffer_damage); pixman_region32_clear(buffer_damage);
pixman_region32_t surface_damage; pixman_region32_t surface_damage;
pixman_region32_init(&surface_damage); pixman_region32_init(&surface_damage);
if (current->width != previous->width || if (pending->width != current->width ||
current->height != previous->height || pending->height != current->height ||
current->dx != 0 || current->dy != 0) { pending->dx != 0 || pending->dy != 0) {
// Damage the whole surface on resize or move // Damage the whole surface on resize or move
int prev_x = -current->dx; int prev_x = -pending->dx;
int prev_y = -current->dy; int prev_y = -pending->dy;
if ((previous->transform & WL_OUTPUT_TRANSFORM_90) != 0) { if ((current->transform & WL_OUTPUT_TRANSFORM_90) != 0) {
int tmp = prev_x; int tmp = prev_x;
prev_x = prev_y; prev_x = prev_y;
prev_y = tmp; prev_y = tmp;
} }
pixman_region32_union_rect(&surface_damage, &surface_damage, prev_x, pixman_region32_union_rect(&surface_damage, &surface_damage, prev_x,
prev_y, previous->width, previous->height); prev_y, current->width, current->height);
pixman_region32_union_rect(&surface_damage, &surface_damage, 0, 0, pixman_region32_union_rect(&surface_damage, &surface_damage, 0, 0,
current->width, current->height); pending->width, pending->height);
} else { } else {
// Copy over surface damage + buffer damage // Copy over surface damage + buffer damage
pixman_region32_union(buffer_damage, buffer_damage, pixman_region32_union(buffer_damage, buffer_damage,
&current->buffer_damage); &pending->buffer_damage);
pixman_region32_copy(&surface_damage, &current->surface_damage); pixman_region32_copy(&surface_damage, &pending->surface_damage);
} }
wlr_region_transform(&surface_damage, &surface_damage, wlr_region_transform(&surface_damage, &surface_damage,
wlr_output_transform_invert(current->transform), wlr_output_transform_invert(pending->transform),
current->width, current->height); pending->width, pending->height);
wlr_region_scale(&surface_damage, &surface_damage, current->scale); wlr_region_scale(&surface_damage, &surface_damage, pending->scale);
pixman_region32_union(buffer_damage, buffer_damage, &surface_damage); pixman_region32_union(buffer_damage, buffer_damage, &surface_damage);
pixman_region32_fini(&surface_damage); pixman_region32_fini(&surface_damage);
} }