diff options
| author | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2015-02-19 11:15:33 +0200 |
|---|---|---|
| committer | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2015-02-24 09:45:55 +0200 |
| commit | 25c0ca57159b35e2d98004ee1e24e7d02c017e6d (patch) | |
| tree | 762732d4cc8c60a19186e97482ca3bbd4d48a035 /src/pixman-renderer.c | |
| parent | 8844bf2ab0795ec3c60acae24c7685fda8d36a81 (diff) | |
| download | weston-25c0ca57159b35e2d98004ee1e24e7d02c017e6d.tar.gz | |
compositor: turn weston_view boundingbox into masked
weston_view::transform.boundingbox is made to include the layer mask,
which removes the need for masked_boundingbox.
The following were using boundingbox when they should have used
masked_boundingbox:
- drm_output_prepare_overlay_view() uses boundingbox to compute overlay
position, source and destination coordinates.
- drm_assign_planes() uses boundingbox for view overlap checks.
- is_view_not_visible() uses boundingbox, but nothing will show outside
the layer mask.
- weston_surface_assign_output() intersects boundingbox with output
region to choose the primary output for a surface.
- weston_view_assign_output() intersects boundingbox with output region
to pick the outputs the view is on.
This patch essentially changes all those cases to use the masked
boundingbox.
Therefore there are no cases which would need the boundingbox without
the layer mask, and we can convert boundingbox into masked and remove
the left-over member.
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
[v2: don't move the decl of 'mask' in weston_view_update_transform]
Reviewed-By: Giulio Camuffo <giuliocamuffo@gmail.com>
Diffstat (limited to 'src/pixman-renderer.c')
| -rw-r--r-- | src/pixman-renderer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pixman-renderer.c b/src/pixman-renderer.c index 530e2ed4..937df8f0 100644 --- a/src/pixman-renderer.c +++ b/src/pixman-renderer.c @@ -398,7 +398,7 @@ draw_view(struct weston_view *ev, struct weston_output *output, pixman_region32_init(&repaint); pixman_region32_intersect(&repaint, - &ev->transform.masked_boundingbox, damage); + &ev->transform.boundingbox, damage); pixman_region32_subtract(&repaint, &repaint, &ev->clip); if (!pixman_region32_not_empty(&repaint)) |