fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2025-12-25 23:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

backend-drm: Use visible_view in more cases

Browse source 
Instead of clipped_view. The former is the part of the later that is
not occluded.

Signed-off-by: Robert Mader <robert.mader@collabora.com>
This commit is contained in:
Robert Mader 2025-10-15 17:47:52 +02:00
parent 900ab0d39f
commit 4cb7347407
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
libweston/backend-drm/state-propose.c
View file

@ -857,6 +857,7 @@ drm_output_propose_state(struct weston_output *output_base,
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 visible_view; pixman_region32_t visible_view;
pixman_region32_t tmp;
bool totally_occluded = false; bool totally_occluded = false;
bool need_underlay = false; bool need_underlay = false;
@ -933,9 +934,10 @@ 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(&visible_view, &renderer_region, pixman_region32_init(&tmp);
pixman_region32_intersect(&tmp, &renderer_region,
&clipped_view); &clipped_view);
if (pixman_region32_not_empty(&visible_view)) { if (pixman_region32_not_empty(&tmp)) {
if (b->has_underlay) { if (b->has_underlay) {
need_underlay = true; need_underlay = true;
} else { } else {
@ -947,7 +949,8 @@ drm_output_propose_state(struct weston_output *output_base,
current_lowest_zpos_underlay); current_lowest_zpos_underlay);
} }
} }
pixman_region32_fini(&visible_view); pixman_region32_fini(&tmp);
pixman_region32_fini(&clipped_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.
@ -993,7 +996,7 @@ drm_output_propose_state(struct weston_output *output_base,
drm_debug(b, "\t\t[view] failing state generation: " drm_debug(b, "\t\t[view] failing state generation: "
"placing view %p to renderer not allowed\n", "placing view %p to renderer not allowed\n",
ev); ev);
pixman_region32_fini(&clipped_view); pixman_region32_fini(&visible_view);
goto err_region; goto err_region;
} else if (!ps) { } else if (!ps) {
char *fr_str = bits_to_str(pnode->try_view_on_plane_failure_reasons, char *fr_str = bits_to_str(pnode->try_view_on_plane_failure_reasons,
@ -1005,11 +1008,11 @@ drm_output_propose_state(struct weston_output *output_base,
} }
if (!ps || drm_mixed_mode_check_underlay(mode, scanout_state, ps->zpos)) { if (!ps || drm_mixed_mode_check_underlay(mode, scanout_state, ps->zpos)) {
/* clipped_view contains the area that's going to be /* visible_view contains the area that's going to be
* visible on screen; add this to the renderer region */ * visible on screen; add this to the renderer region */
pixman_region32_union(&renderer_region, pixman_region32_union(&renderer_region,
&renderer_region, &renderer_region,
&clipped_view); &visible_view);
} }
/* Opaque areas of our clipped view occlude areas behind it; /* Opaque areas of our clipped view occlude areas behind it;
@ -1018,14 +1021,14 @@ drm_output_propose_state(struct weston_output *output_base,
* opaque) does not necessarily occlude what's behind it, as * opaque) does not necessarily occlude what's behind it, as
* it could be alpha-blended. */ * it could be alpha-blended. */
if (!pnode->is_fully_opaque) if (!pnode->is_fully_opaque)
pixman_region32_intersect(&clipped_view, pixman_region32_intersect(&visible_view,
&clipped_view, &visible_view,
&ev->transform.opaque); &ev->transform.opaque);
pixman_region32_union(&occluded_region, pixman_region32_union(&occluded_region,
&occluded_region, &occluded_region,
&clipped_view); &visible_view);
pixman_region32_fini(&clipped_view); pixman_region32_fini(&visible_view);
} }
pixman_region32_fini(&renderer_region); pixman_region32_fini(&renderer_region);