isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-27 13:22:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

wayland/surface: Fix can_scanout_untransformed() for transform+viewport

Browse Source 
The buffer needs to match the untransformed layout size.

While on it simplify the check from floats to ints where possible - and
improve logging a bit.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2394>
This commit is contained in:
Robert Mader 2023-03-01 22:04:49 +01:00
parent 8b42564763
commit ef2e9dade8
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/wayland/meta-wayland-surface.c
View File

@ -2241,24 +2241,40 @@ meta_wayland_surface_can_scanout_untransformed (MetaWaylandSurface *surface,
{ {
MetaRectangle view_layout; MetaRectangle view_layout;
float view_scale; float view_scale;
float untransformed_layout_width;
float untransformed_layout_height;
clutter_stage_view_get_layout (CLUTTER_STAGE_VIEW (view), &view_layout); clutter_stage_view_get_layout (CLUTTER_STAGE_VIEW (view), &view_layout);
view_scale = clutter_stage_view_get_scale (CLUTTER_STAGE_VIEW (view)); view_scale = clutter_stage_view_get_scale (CLUTTER_STAGE_VIEW (view));
if (!G_APPROX_VALUE (view_layout.width, surface->viewport.dst_width, if (meta_monitor_transform_is_rotated (meta_renderer_view_get_transform (view)))
FLT_EPSILON) || {
!G_APPROX_VALUE (view_layout.height, surface->viewport.dst_height, untransformed_layout_width = view_layout.height * view_scale;
FLT_EPSILON) || untransformed_layout_height = view_layout.width * view_scale;
!G_APPROX_VALUE (view_layout.width * view_scale, }
else
{
untransformed_layout_width = view_layout.width * view_scale;
untransformed_layout_height = view_layout.height * view_scale;
}
if (view_layout.width != surface->viewport.dst_width ||
view_layout.height != surface->viewport.dst_height ||
!G_APPROX_VALUE (untransformed_layout_width,
get_buffer_width (surface), get_buffer_width (surface),
FLT_EPSILON) || FLT_EPSILON) ||
!G_APPROX_VALUE (view_layout.height * view_scale, !G_APPROX_VALUE (untransformed_layout_height,
get_buffer_height (surface), get_buffer_height (surface),
FLT_EPSILON)) FLT_EPSILON))
{ {
meta_topic (META_DEBUG_RENDER, meta_topic (META_DEBUG_RENDER,
"Surface can not be scanned out untransformed: viewport " "Surface can not be scanned out untransformed: viewport "
"destination size does not match stage-view layout"); "destination or buffer size does not match stage-view "
"layout. (%d != %d || %d != %d || %f != %d %f != %d)",
view_layout.width, surface->viewport.dst_width,
view_layout.height, surface->viewport.dst_height,
untransformed_layout_width, get_buffer_width (surface),
untransformed_layout_height, get_buffer_height (surface));
return FALSE; return FALSE;
} }
} }