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

surface: fix damage transformation

This commit is contained in:
Kirill Primak 2021-11-20 13:30:18 +03:00 committed by Simon Ser
parent ca1af8119c
commit c9f3c2b4f7
1 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
types/wlr_surface.c
View File

@ -123,6 +123,19 @@ static void surface_handle_set_input_region(struct wl_client *client,
} }
} }
static void surface_state_transformed_buffer_size(struct wlr_surface_state *state,
int *out_width, int *out_height) {
int width = state->buffer_width;
int height = state->buffer_height;
if ((state->transform & WL_OUTPUT_TRANSFORM_90) != 0) {
int tmp = width;
width = height;
height = tmp;
}
*out_width = width;
*out_height = height;
}
/** /**
* Computes the surface viewport source size, ie. the size after applying the * Computes the surface viewport source size, ie. the size after applying the
* surface's scale, transform and cropping (via the viewport's source * surface's scale, transform and cropping (via the viewport's source
@ -140,15 +153,10 @@ static void surface_state_viewport_src_size(struct wlr_surface_state *state,
*out_width = state->viewport.src.width; *out_width = state->viewport.src.width;
*out_height = state->viewport.src.height; *out_height = state->viewport.src.height;
} else { } else {
int width = state->buffer_width / state->scale; surface_state_transformed_buffer_size(state,
int height = state->buffer_height / state->scale; out_width, out_height);
if ((state->transform & WL_OUTPUT_TRANSFORM_90) != 0) { *out_width /= state->scale;
int tmp = width; *out_height /= state->scale;
width = height;
height = tmp;
}
*out_width = width;
*out_height = height;
} }
} }
@ -225,10 +233,13 @@ static void surface_update_damage(pixman_region32_t *buffer_damage,
floor(pending->viewport.src.y)); floor(pending->viewport.src.y));
} }
wlr_region_scale(&surface_damage, &surface_damage, pending->scale);
int width, height;
surface_state_transformed_buffer_size(pending, &width, &height);
wlr_region_transform(&surface_damage, &surface_damage, wlr_region_transform(&surface_damage, &surface_damage,
wlr_output_transform_invert(pending->transform), wlr_output_transform_invert(pending->transform),
pending->width, pending->height); width, height);
wlr_region_scale(&surface_damage, &surface_damage, pending->scale);
pixman_region32_union(buffer_damage, pixman_region32_union(buffer_damage,
&pending->buffer_damage, &surface_damage); &pending->buffer_damage, &surface_damage);
@ -1472,7 +1483,11 @@ void wlr_surface_get_buffer_source_box(struct wlr_surface *surface,
box->y = surface->current.viewport.src.y * surface->current.scale; box->y = surface->current.viewport.src.y * surface->current.scale;
box->width = surface->current.viewport.src.width * surface->current.scale; box->width = surface->current.viewport.src.width * surface->current.scale;
box->height = surface->current.viewport.src.height * surface->current.scale; box->height = surface->current.viewport.src.height * surface->current.scale;
wlr_fbox_transform(box, box, surface->current.transform,
surface->current.buffer_width, surface->current.buffer_height); int width, height;
surface_state_transformed_buffer_size(&surface->current, &width, &height);
wlr_fbox_transform(box, box,
wlr_output_transform_invert(surface->current.transform),
width, height);
} }
} }