isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-11 02:44:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

wayland/surface: Account for geometry scale in scanout check

Browse Source 
Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/3025
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3290>
This commit is contained in:
Daniel van Vugt 2023-09-19 16:10:41 +08:00
parent 3829888463
commit f23876e99e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2301,8 +2301,8 @@ meta_wayland_surface_can_scanout_untransformed (MetaWaylandSurface *surface,
untransformed_layout_height = view_layout.height * view_scale; untransformed_layout_height = view_layout.height * view_scale;
} }
if (view_layout.width != surface->viewport.dst_width || if ((view_layout.width / geometry_scale) != surface->viewport.dst_width ||
view_layout.height != surface->viewport.dst_height || (view_layout.height / geometry_scale) != surface->viewport.dst_height ||
!G_APPROX_VALUE (untransformed_layout_width, !G_APPROX_VALUE (untransformed_layout_width,
meta_wayland_surface_get_buffer_width (surface), meta_wayland_surface_get_buffer_width (surface),
FLT_EPSILON) || FLT_EPSILON) ||
@ -2313,9 +2313,9 @@ meta_wayland_surface_can_scanout_untransformed (MetaWaylandSurface *surface,
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 or buffer size does not match stage-view " "destination or buffer size does not match stage-view "
"layout. (%d != %d || %d != %d || %f != %d %f != %d)", "layout. (%d/%d != %d || %d/%d != %d || %f != %d %f != %d)",
view_layout.width, surface->viewport.dst_width, view_layout.width, geometry_scale, surface->viewport.dst_width,
view_layout.height, surface->viewport.dst_height, view_layout.height, geometry_scale, surface->viewport.dst_height,
untransformed_layout_width, untransformed_layout_width,
meta_wayland_surface_get_buffer_width (surface), meta_wayland_surface_get_buffer_width (surface),
untransformed_layout_height, untransformed_layout_height,