From 713a675401cea4cde9f2bfb3771f3c32554bb278 Mon Sep 17 00:00:00 2001 From: Ethan Lee Date: Sat, 26 Mar 2022 22:26:15 -0400 Subject: [PATCH] wayland: Relax the check for mismatching output scales --- src/video/wayland/SDL_waylandvideo.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/video/wayland/SDL_waylandvideo.c b/src/video/wayland/SDL_waylandvideo.c index 52a324ca3..77925ad74 100644 --- a/src/video/wayland/SDL_waylandvideo.c +++ b/src/video/wayland/SDL_waylandvideo.c @@ -307,11 +307,13 @@ xdg_output_handle_logical_size(void *data, struct zxdg_output_v1 *xdg_output, /* FIXME: GNOME has a bug where the logical size does not account for * scale, resulting in bogus viewport sizes. * - * Until this is fixed, validate the scale, then override if necessary. + * Until this is fixed, validate that _some_ kind of scaling is being + * done (we can't match exactly because fractional scaling can't be + * detected otherwise), then override if necessary. * -flibit */ const float scale = (float) driverdata->width / (float) width; - if (scale != driverdata->scale_factor) { + if ((scale == 1.0f) && (driverdata->scale_factor != 1.0f)) { SDL_LogWarn( SDL_LOG_CATEGORY_VIDEO, "xdg_output scale did not match, overriding with wl_output scale"