UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove fps requirement for drm connector selection (#2468)

Browse source
This commit is contained in:
Crydsch 2022-05-09 17:12:38 +02:00 • committed by GitHub
parent df3f64bfd2
commit b2c2b5ee21
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/rcore.c
View file

@ -6591,7 +6591,7 @@ static int FindNearestConnectorMode(const drmModeConnector *connector, uint widt
TRACELOG(LOG_TRACE, "DISPLAY: DRM mode: %d %ux%u@%u %s", i, mode->hdisplay, mode->vdisplay, mode->vrefresh, TRACELOG(LOG_TRACE, "DISPLAY: DRM mode: %d %ux%u@%u %s", i, mode->hdisplay, mode->vdisplay, mode->vrefresh,
(mode->flags & DRM_MODE_FLAG_INTERLACE) ? "interlaced" : "progressive"); (mode->flags & DRM_MODE_FLAG_INTERLACE) ? "interlaced" : "progressive");
if ((mode->hdisplay < width) || (mode->vdisplay < height) || (mode->vrefresh < fps)) if ((mode->hdisplay < width) || (mode->vdisplay < height))
{ {
TRACELOG(LOG_TRACE, "DISPLAY: DRM mode is too small"); TRACELOG(LOG_TRACE, "DISPLAY: DRM mode is too small");
continue; continue;
@ -6603,23 +6603,22 @@ static int FindNearestConnectorMode(const drmModeConnector *connector, uint widt
continue; continue;
} }
if ((mode->hdisplay >= width) && (mode->vdisplay >= height) && (mode->vrefresh >= fps)) if (nearestIndex < 0)
{ {
const int widthDiff = mode->hdisplay - width; nearestIndex = i;
const int heightDiff = mode->vdisplay - height; continue;
const int fpsDiff = mode->vrefresh - fps; }
if (nearestIndex < 0) const int widthDiff = abs(mode->hdisplay - width);
{ const int heightDiff = abs(mode->vdisplay - height);
nearestIndex = i; const int fpsDiff = abs(mode->vrefresh - fps);
continue;
}
const int nearestWidthDiff = CORE.Window.connector->modes[nearestIndex].hdisplay - width; const int nearestWidthDiff = abs(CORE.Window.connector->modes[nearestIndex].hdisplay - width);
const int nearestHeightDiff = CORE.Window.connector->modes[nearestIndex].vdisplay - height; const int nearestHeightDiff = abs(CORE.Window.connector->modes[nearestIndex].vdisplay - height);
const int nearestFpsDiff = CORE.Window.connector->modes[nearestIndex].vrefresh - fps; const int nearestFpsDiff = abs(CORE.Window.connector->modes[nearestIndex].vrefresh - fps);
if ((widthDiff < nearestWidthDiff) || (heightDiff < nearestHeightDiff) || (fpsDiff < nearestFpsDiff)) nearestIndex = i; if ((widthDiff < nearestWidthDiff) || (heightDiff < nearestHeightDiff) || (fpsDiff < nearestFpsDiff)) {
nearestIndex = i;
} }
} }