mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-26 09:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

render: Apply clip to rendered texture correctly

Browse source 
The new wlr_render_pass API provides src_box, dst_box and clip
parameters for texture rendition. Rather than clipping the dst_box,
which control the projection matrix and leads to compression, intersect
the damage and clip box and pass these as a clip parameter.

Fixes: https://github.com/swaywm/sway/issues/7579
Regressed by: https://github.com/swaywm/sway/pull/7552
This commit is contained in:
Kenny Levinsen 2023-05-09 15:08:47 +02:00 committed by Simon Ser
parent a79994e119
commit 393c29fc59
1 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
sway/desktop/render.c
View file

@ -99,7 +99,7 @@ static void set_scale_filter(struct wlr_output *wlr_output,
static void render_texture(struct render_context *ctx, struct wlr_texture *texture, static void render_texture(struct render_context *ctx, struct wlr_texture *texture,
const struct wlr_fbox *_src_box, const struct wlr_box *dst_box, const struct wlr_fbox *_src_box, const struct wlr_box *dst_box,
enum wl_output_transform transform, float alpha) { const struct wlr_box *clip_box, enum wl_output_transform transform, float alpha) {
struct sway_output *output = ctx->output; struct sway_output *output = ctx->output;
struct wlr_box proj_box = *dst_box; struct wlr_box proj_box = *dst_box;
@ -113,6 +113,12 @@ static void render_texture(struct render_context *ctx, struct wlr_texture *textu
pixman_region32_init_rect(&damage, proj_box.x, proj_box.y, pixman_region32_init_rect(&damage, proj_box.x, proj_box.y,
proj_box.width, proj_box.height); proj_box.width, proj_box.height);
pixman_region32_intersect(&damage, &damage, ctx->output_damage); pixman_region32_intersect(&damage, &damage, ctx->output_damage);
if (clip_box) {
pixman_region32_intersect_rect(&damage, &damage,
clip_box->x, clip_box->y, clip_box->width, clip_box->height);
}
bool damaged = pixman_region32_not_empty(&damage); bool damaged = pixman_region32_not_empty(&damage);
if (!damaged) { if (!damaged) {
goto damage_finish; goto damage_finish;
@ -151,19 +157,17 @@ static void render_surface_iterator(struct sway_output *output,
struct wlr_fbox src_box; struct wlr_fbox src_box;
wlr_surface_get_buffer_source_box(surface, &src_box); wlr_surface_get_buffer_source_box(surface, &src_box);
struct wlr_box proj_box = *_box;
scale_box(&proj_box, wlr_output->scale);
struct wlr_box dst_box = *_box; struct wlr_box dst_box = *_box;
struct wlr_box *clip_box = data->clip_box; struct wlr_box clip_box = *_box;
if (clip_box != NULL) { if (data->clip_box != NULL) {
dst_box.width = fmin(dst_box.width, clip_box->width); clip_box.width = fmin(dst_box.width, data->clip_box->width);
dst_box.height = fmin(dst_box.height, clip_box->height); clip_box.height = fmin(dst_box.height, data->clip_box->height);
} }
scale_box(&dst_box, wlr_output->scale); scale_box(&dst_box, wlr_output->scale);
scale_box(&clip_box, wlr_output->scale);
render_texture(data->ctx, texture, render_texture(data->ctx, texture,
&src_box, &dst_box, surface->current.transform, alpha); &src_box, &dst_box, &clip_box, surface->current.transform, alpha);
wlr_presentation_surface_sampled_on_output(server.presentation, surface, wlr_presentation_surface_sampled_on_output(server.presentation, surface,
wlr_output); wlr_output);
@ -320,20 +324,20 @@ static void render_saved_view(struct render_context *ctx, struct sway_view *view
} }
struct wlr_box dst_box = proj_box; struct wlr_box dst_box = proj_box;
scale_box(&proj_box, wlr_output->scale); struct wlr_box clip_box = proj_box;
if (!floating) { if (!floating) {
dst_box.width = fmin(dst_box.width, clip_box.width = fmin(dst_box.width,
view->container->current.content_width - view->container->current.content_width -
(saved_buf->x - view->container->current.content_x) + view->saved_geometry.x); (saved_buf->x - view->container->current.content_x) + view->saved_geometry.x);
dst_box.height = fmin(dst_box.height, clip_box.height = fmin(dst_box.height,
view->container->current.content_height - view->container->current.content_height -
(saved_buf->y - view->container->current.content_y) + view->saved_geometry.y); (saved_buf->y - view->container->current.content_y) + view->saved_geometry.y);
} }
scale_box(&dst_box, wlr_output->scale); scale_box(&dst_box, wlr_output->scale);
scale_box(&clip_box, wlr_output->scale);
render_texture(ctx, saved_buf->buffer->texture, render_texture(ctx, saved_buf->buffer->texture,
&saved_buf->source_box, &dst_box, saved_buf->transform, alpha); &saved_buf->source_box, &dst_box, &clip_box, saved_buf->transform, alpha);
} }
// FIXME: we should set the surface that this saved buffer originates from // FIXME: we should set the surface that this saved buffer originates from
@ -509,7 +513,7 @@ static void render_titlebar(struct render_context *ctx, struct sway_container *c
texture_box.width = ob_inner_width; texture_box.width = ob_inner_width;
} }
render_texture(ctx, marks_texture, render_texture(ctx, marks_texture,
NULL, &texture_box, WL_OUTPUT_TRANSFORM_NORMAL, con->alpha); NULL, &texture_box, NULL, WL_OUTPUT_TRANSFORM_NORMAL, con->alpha);
// Padding above // Padding above
memcpy(&color, colors->background, sizeof(float) * 4); memcpy(&color, colors->background, sizeof(float) * 4);
@ -580,7 +584,7 @@ static void render_titlebar(struct render_context *ctx, struct sway_container *c
} }
render_texture(ctx, title_texture, render_texture(ctx, title_texture,
NULL, &texture_box, WL_OUTPUT_TRANSFORM_NORMAL, con->alpha); NULL, &texture_box, NULL, WL_OUTPUT_TRANSFORM_NORMAL, con->alpha);
// Padding above // Padding above
memcpy(&color, colors->background, sizeof(float) * 4); memcpy(&color, colors->background, sizeof(float) * 4);