isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-09-20 06:25:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

surface-actor: Simplify culling logic

Browse Source 
This reverts the commits 372d73e275 and 1d20045247 - the special
case for alpha-less textures could only happen on Wayland, but now
the opaque region is also set in those cases.

This commit saves us some allocations, simplifies the logic a bit and
makes sure culling uses the same opaque region as our painting paths.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1463
This commit is contained in:
Robert Mader 2020-10-01 01:38:16 +02:00 committed by Georges Basile Stavracas Neto
parent 71f03a718d
commit 78592cbcc8
1 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/compositor/meta-surface-actor.c
View File

@ -295,25 +295,9 @@ meta_surface_actor_cull_out (MetaCullable *cullable,
cairo_region_t *scaled_opaque_region; cairo_region_t *scaled_opaque_region;
opaque_region = meta_shaped_texture_get_opaque_region (priv->texture); opaque_region = meta_shaped_texture_get_opaque_region (priv->texture);
if (opaque_region)
{
cairo_region_reference (opaque_region);
}
else if (meta_shaped_texture_is_opaque (priv->texture))
{
cairo_rectangle_int_t rect;
rect = (cairo_rectangle_int_t) { if (!opaque_region)
.width = meta_shaped_texture_get_width (priv->texture), return;
.height = meta_shaped_texture_get_height (priv->texture)
};
opaque_region = cairo_region_create_rectangle (&rect);
}
else
{
return;
}
scaled_opaque_region = get_scaled_region (surface_actor, scaled_opaque_region = get_scaled_region (surface_actor,
opaque_region, opaque_region,
@ -324,7 +308,6 @@ meta_surface_actor_cull_out (MetaCullable *cullable,
if (clip_region) if (clip_region)
cairo_region_subtract (clip_region, scaled_opaque_region); cairo_region_subtract (clip_region, scaled_opaque_region);
cairo_region_destroy (opaque_region);
cairo_region_destroy (scaled_opaque_region); cairo_region_destroy (scaled_opaque_region);
} }
} }