encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wayland: Relax the check for mismatching output scales

This commit is contained in:
Ethan Lee 2022-03-26 22:26:15 -04:00
parent 5655be1558
commit 713a675401
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/video/wayland/SDL_waylandvideo.c
View File

@ -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 /* FIXME: GNOME has a bug where the logical size does not account for
* scale, resulting in bogus viewport sizes. * 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 * -flibit
*/ */
const float scale = (float) driverdata->width / (float) width; 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_LogWarn(
SDL_LOG_CATEGORY_VIDEO, SDL_LOG_CATEGORY_VIDEO,
"xdg_output scale did not match, overriding with wl_output scale" "xdg_output scale did not match, overriding with wl_output scale"