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

surface: fix wlr_surface_get_effective_damage to give surface coords 

Transforms were applied, but scale wasn't.
This commit is contained in:
emersion 2018-11-04 11:08:06 +01:00
parent 3e0a0f3c3a
commit dec303bea6
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,14 +17,14 @@
#include <wlr/types/wlr_output.h> #include <wlr/types/wlr_output.h>
enum wlr_surface_state_field { enum wlr_surface_state_field {
WLR_SURFACE_STATE_BUFFER = 1, WLR_SURFACE_STATE_BUFFER = 1 << 0,
WLR_SURFACE_STATE_SURFACE_DAMAGE = 2, WLR_SURFACE_STATE_SURFACE_DAMAGE = 1 << 1,
WLR_SURFACE_STATE_BUFFER_DAMAGE = 4, WLR_SURFACE_STATE_BUFFER_DAMAGE = 1 << 2,
WLR_SURFACE_STATE_OPAQUE_REGION = 8, WLR_SURFACE_STATE_OPAQUE_REGION = 1 << 3,
WLR_SURFACE_STATE_INPUT_REGION = 16, WLR_SURFACE_STATE_INPUT_REGION = 1 << 4,
WLR_SURFACE_STATE_TRANSFORM = 32, WLR_SURFACE_STATE_TRANSFORM = 1 << 5,
WLR_SURFACE_STATE_SCALE = 64, WLR_SURFACE_STATE_SCALE = 1 << 6,
WLR_SURFACE_STATE_FRAME_CALLBACK_LIST = 128, WLR_SURFACE_STATE_FRAME_CALLBACK_LIST = 1 << 7,
}; };
struct wlr_surface_state { struct wlr_surface_state {
@ -32,7 +32,7 @@ struct wlr_surface_state {
struct wl_resource *buffer_resource; struct wl_resource *buffer_resource;
int32_t dx, dy; // relative to previous position int32_t dx, dy; // relative to previous position
pixman_region32_t surface_damage, buffer_damage; pixman_region32_t surface_damage, buffer_damage; // clipped to bounds
pixman_region32_t opaque, input; pixman_region32_t opaque, input;
enum wl_output_transform transform; enum wl_output_transform transform;
int32_t scale; int32_t scale;
@ -68,11 +68,12 @@ struct wlr_surface {
* The last commit's buffer damage, in buffer-local coordinates. This * The last commit's buffer damage, in buffer-local coordinates. This
* contains both the damage accumulated by the client via * contains both the damage accumulated by the client via
* `wlr_surface_state.surface_damage` and `wlr_surface_state.buffer_damage`. * `wlr_surface_state.surface_damage` and `wlr_surface_state.buffer_damage`.
* If the buffer has changed its size or moved, the whole buffer is * If the buffer has been resized, the whole buffer is damaged.
* damaged.
* *
* This region needs to be scaled and transformed into output coordinates, * This region needs to be scaled and transformed into output coordinates,
* just like the buffer's texture. * just like the buffer's texture. In addition, if the buffer has shrunk the
* old size needs to be damaged and if the buffer has moved the old and new
* positions need to be damaged.
*/ */
pixman_region32_t buffer_damage; pixman_region32_t buffer_damage;
/** /**

3
rootston/output.c
View File

@ -700,8 +700,7 @@ static void damage_from_surface(struct wlr_surface *surface, int sx, int sy,
pixman_region32_init(&damage); pixman_region32_init(&damage);
wlr_surface_get_effective_damage(surface, &damage); wlr_surface_get_effective_damage(surface, &damage);
wlr_region_scale(&damage, &damage, wlr_region_scale(&damage, &damage, wlr_output->scale);
wlr_output->scale / (float)surface->current.scale);
if (ceil(wlr_output->scale) > surface->current.scale) { if (ceil(wlr_output->scale) > surface->current.scale) {
// When scaling up a surface, it'll become blurry so we need to // When scaling up a surface, it'll become blurry so we need to
// expand the damage region // expand the damage region

12
types/wlr_surface.c
View File

@ -183,16 +183,15 @@ static void surface_update_damage(pixman_region32_t *buffer_damage,
pixman_region32_t surface_damage; pixman_region32_t surface_damage;
pixman_region32_init(&surface_damage); pixman_region32_init(&surface_damage);
pixman_region32_union(buffer_damage, buffer_damage,
&pending->buffer_damage);
pixman_region32_copy(&surface_damage, &pending->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(pending->transform), wlr_output_transform_invert(pending->transform),
pending->width, pending->height); pending->width, pending->height);
wlr_region_scale(&surface_damage, &surface_damage, pending->scale); wlr_region_scale(&surface_damage, &surface_damage, pending->scale);
pixman_region32_union(buffer_damage, buffer_damage, &surface_damage); pixman_region32_union(buffer_damage,
&pending->buffer_damage, &surface_damage);
pixman_region32_fini(&surface_damage); pixman_region32_fini(&surface_damage);
} }
} }
@ -291,8 +290,8 @@ static void surface_apply_damage(struct wlr_surface *surface) {
} }
if (surface->buffer != NULL && surface->buffer->released) { if (surface->buffer != NULL && surface->buffer->released) {
struct wlr_buffer *updated_buffer = struct wlr_buffer *updated_buffer = wlr_buffer_apply_damage(
wlr_buffer_apply_damage(surface->buffer, resource, &surface->buffer_damage); surface->buffer, resource, &surface->buffer_damage);
if (updated_buffer != NULL) { if (updated_buffer != NULL) {
surface->buffer = updated_buffer; surface->buffer = updated_buffer;
return; return;
@ -1029,6 +1028,7 @@ void wlr_surface_get_effective_damage(struct wlr_surface *surface,
wlr_region_transform(damage, &surface->buffer_damage, wlr_region_transform(damage, &surface->buffer_damage,
surface->current.transform, surface->current.buffer_width, surface->current.transform, surface->current.buffer_width,
surface->current.buffer_height); surface->current.buffer_height);
wlr_region_scale(damage, damage, 1.0 / (float)surface->current.scale);
// On resize, damage the previous bounds of the surface. The current bounds // On resize, damage the previous bounds of the surface. The current bounds
// have already been damaged in surface_update_damage. // have already been damaged in surface_update_damage.