mirror of
https://github.com/libsdl-org/SDL.git
synced 2026-05-28 03:26:15 +08:00
Revert "(video) fix SDL_GetClosestFullscreenDisplayMode aspect ratio & refresh rate picking logic"
This reverts commit 0231ff03de.
This causes SDL to return 1024x768 when asking for a best fit to 640x480 (thanks @AJenbo), so I'm reverting this until we can investigate more.
This commit is contained in:
@@ -1416,14 +1416,14 @@ bool SDL_GetClosestFullscreenDisplayMode(SDL_DisplayID displayID, int w, int h,
|
|||||||
if (closest) {
|
if (closest) {
|
||||||
float current_aspect_ratio = (float)mode->w / mode->h;
|
float current_aspect_ratio = (float)mode->w / mode->h;
|
||||||
float closest_aspect_ratio = (float)closest->w / closest->h;
|
float closest_aspect_ratio = (float)closest->w / closest->h;
|
||||||
if (SDL_fabsf(aspect_ratio - closest_aspect_ratio) <= SDL_fabsf(aspect_ratio - current_aspect_ratio)) {
|
if (SDL_fabsf(aspect_ratio - closest_aspect_ratio) < SDL_fabsf(aspect_ratio - current_aspect_ratio)) {
|
||||||
// The mode we already found has a similar or better aspect ratio match
|
// The mode we already found has a better aspect ratio match
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mode->w == closest->w && mode->h == closest->h &&
|
if (mode->w == closest->w && mode->h == closest->h &&
|
||||||
SDL_fabsf(closest->refresh_rate - refresh_rate) <= SDL_fabsf(mode->refresh_rate - refresh_rate)) {
|
SDL_fabsf(closest->refresh_rate - refresh_rate) < SDL_fabsf(mode->refresh_rate - refresh_rate)) {
|
||||||
/* We already found a mode and the new mode's refresh rate is the same or is further away from our
|
/* We already found a mode and the new mode is further from our
|
||||||
* refresh rate target */
|
* refresh rate target */
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user