mirror of
https://gitlab.freedesktop.org/wayland/weston.git
synced 2025-12-25 02:30:11 +01:00
backend-drm: Rename surface_overlap to visible_view
To clarify its meaning, especially relative to clipped_view. Signed-off-by: Robert Mader <robert.mader@collabora.com>
This commit is contained in:
parent
56aeb48f6d
commit
900ab0d39f
1 changed files with 8 additions and 8 deletions
|
|
@ -856,7 +856,7 @@ drm_output_propose_state(struct weston_output *output_base,
|
||||||
struct weston_view *ev = pnode->view;
|
struct weston_view *ev = pnode->view;
|
||||||
struct drm_plane_state *ps = NULL;
|
struct drm_plane_state *ps = NULL;
|
||||||
pixman_region32_t clipped_view;
|
pixman_region32_t clipped_view;
|
||||||
pixman_region32_t surface_overlap;
|
pixman_region32_t visible_view;
|
||||||
bool totally_occluded = false;
|
bool totally_occluded = false;
|
||||||
bool need_underlay = false;
|
bool need_underlay = false;
|
||||||
|
|
||||||
|
|
@ -888,17 +888,17 @@ drm_output_propose_state(struct weston_output *output_base,
|
||||||
&ev->transform.boundingbox,
|
&ev->transform.boundingbox,
|
||||||
&output->base.region);
|
&output->base.region);
|
||||||
|
|
||||||
pixman_region32_init(&surface_overlap);
|
pixman_region32_init(&visible_view);
|
||||||
pixman_region32_subtract(&surface_overlap, &clipped_view,
|
pixman_region32_subtract(&visible_view, &clipped_view,
|
||||||
&occluded_region);
|
&occluded_region);
|
||||||
/* if the view is completely occluded then ignore that
|
/* if the view is completely occluded then ignore that
|
||||||
* view; includes the case where occluded_region covers
|
* view; includes the case where occluded_region covers
|
||||||
* the entire output */
|
* the entire output */
|
||||||
totally_occluded = !pixman_region32_not_empty(&surface_overlap);
|
totally_occluded = !pixman_region32_not_empty(&visible_view);
|
||||||
if (totally_occluded) {
|
if (totally_occluded) {
|
||||||
drm_debug(b, "\t\t\t\t[view] ignoring view %p "
|
drm_debug(b, "\t\t\t\t[view] ignoring view %p "
|
||||||
"(occluded on our output)\n", ev);
|
"(occluded on our output)\n", ev);
|
||||||
pixman_region32_fini(&surface_overlap);
|
pixman_region32_fini(&visible_view);
|
||||||
pixman_region32_fini(&clipped_view);
|
pixman_region32_fini(&clipped_view);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
@ -933,9 +933,9 @@ drm_output_propose_state(struct weston_output *output_base,
|
||||||
* the view intersects the calculated renderer region, it must
|
* the view intersects the calculated renderer region, it must
|
||||||
* be part of, or occluded by, it, and cannot go on an overlay
|
* be part of, or occluded by, it, and cannot go on an overlay
|
||||||
* plane. */
|
* plane. */
|
||||||
pixman_region32_intersect(&surface_overlap, &renderer_region,
|
pixman_region32_intersect(&visible_view, &renderer_region,
|
||||||
&clipped_view);
|
&clipped_view);
|
||||||
if (pixman_region32_not_empty(&surface_overlap)) {
|
if (pixman_region32_not_empty(&visible_view)) {
|
||||||
if (b->has_underlay) {
|
if (b->has_underlay) {
|
||||||
need_underlay = true;
|
need_underlay = true;
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -947,7 +947,7 @@ drm_output_propose_state(struct weston_output *output_base,
|
||||||
current_lowest_zpos_underlay);
|
current_lowest_zpos_underlay);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
pixman_region32_fini(&surface_overlap);
|
pixman_region32_fini(&visible_view);
|
||||||
|
|
||||||
/* If need_underlay, but view contains alpha, then it needs to
|
/* If need_underlay, but view contains alpha, then it needs to
|
||||||
* be rendered. Only fully-opaque views can go on an underlay.
|
* be rendered. Only fully-opaque views can go on an underlay.
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue