mirror of
https://github.com/brl/mutter.git
synced 2024-11-12 17:27:03 -05:00
surface-actor: Simplify culling logic
This reverts the commits372d73e275
and1d20045247
- 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:
parent
71f03a718d
commit
78592cbcc8
@ -295,25 +295,9 @@ meta_surface_actor_cull_out (MetaCullable *cullable,
|
||||
cairo_region_t *scaled_opaque_region;
|
||||
|
||||
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) {
|
||||
.width = meta_shaped_texture_get_width (priv->texture),
|
||||
.height = meta_shaped_texture_get_height (priv->texture)
|
||||
};
|
||||
|
||||
opaque_region = cairo_region_create_rectangle (&rect);
|
||||
}
|
||||
else
|
||||
{
|
||||
return;
|
||||
}
|
||||
if (!opaque_region)
|
||||
return;
|
||||
|
||||
scaled_opaque_region = get_scaled_region (surface_actor,
|
||||
opaque_region,
|
||||
@ -324,7 +308,6 @@ meta_surface_actor_cull_out (MetaCullable *cullable,
|
||||
if (clip_region)
|
||||
cairo_region_subtract (clip_region, scaled_opaque_region);
|
||||
|
||||
cairo_region_destroy (opaque_region);
|
||||
cairo_region_destroy (scaled_opaque_region);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user