brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland/surface: Use committed texture width/height in _surface_commit

Browse Source 
meta_wayland_surface_get_buffer_width/height uses the currently applied
buffer, which may have a different size.

Fixes: 7649e2f3ab ("wayland/surface: Move buffer size check to meta_wayland_surface_commit")
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3466>
This commit is contained in:
Michel Dänzer 2023-12-19 11:23:22 +01:00 committed by Michel Dänzer
parent 98c8c03729
commit 17640d9c98
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -927,8 +927,8 @@ meta_wayland_surface_commit (MetaWaylandSurface *surface)
wl_resource_post_error (surface->resource, WL_SURFACE_ERROR_INVALID_SIZE, wl_resource_post_error (surface->resource, WL_SURFACE_ERROR_INVALID_SIZE,
"Buffer size (%dx%d) must be an integer multiple " "Buffer size (%dx%d) must be an integer multiple "
"of the buffer_scale (%d).", "of the buffer_scale (%d).",
meta_wayland_surface_get_buffer_width (surface), meta_multi_texture_get_width (committed_texture),
meta_wayland_surface_get_buffer_height (surface), meta_multi_texture_get_height (committed_texture),
committed_scale); committed_scale);
return; return;
} }
@ -943,8 +943,8 @@ meta_wayland_surface_commit (MetaWaylandSurface *surface)
g_warning ("Bug in client with pid %ld: Cursor buffer size (%dx%d) is " g_warning ("Bug in client with pid %ld: Cursor buffer size (%dx%d) is "
"not an integer multiple of the buffer_scale (%d).", "not an integer multiple of the buffer_scale (%d).",
(long) pid, (long) pid,
meta_wayland_surface_get_buffer_width (surface), meta_multi_texture_get_width (committed_texture),
meta_wayland_surface_get_buffer_height (surface), meta_multi_texture_get_height (committed_texture),
committed_scale); committed_scale);
} }
} }