backup/OpenDX
1
0
Fork 0
mirror of https://github.com/EduApps-CDG/OpenDX synced 2024-12-30 09:45:37 +01:00
Code Issues Projects Releases Activity

[dxgi] Use 64-bit integers for refresh rate matching math

Browse Source 
Otherwise, there may be integer overflows for certain parameter values.
This commit is contained in:
Philip Rebohle 2019-10-29 08:42:53 +01:00
parent c4e5323e0e
commit 9e69a610cb
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/dxgi/dxgi_output.cpp
View File

@ -491,10 +491,12 @@ namespace dxvk {
if (TargetMode.RefreshRate.Numerator && TargetMode.RefreshRate.Denominator) { if (TargetMode.RefreshRate.Numerator && TargetMode.RefreshRate.Denominator) {
minDiffRefreshRate = std::accumulate( minDiffRefreshRate = std::accumulate(
Modes.begin(), Modes.end(), std::numeric_limits<uint32_t>::max(), Modes.begin(), Modes.end(), std::numeric_limits<uint64_t>::max(),
[&TargetMode] (uint32_t current, const DXGI_MODE_DESC1& mode) { [&TargetMode] (uint64_t current, const DXGI_MODE_DESC1& mode) {
uint32_t rate = mode.RefreshRate.Numerator * TargetMode.RefreshRate.Denominator / mode.RefreshRate.Denominator; uint64_t rate = uint64_t(mode.RefreshRate.Numerator)
uint32_t diff = std::abs(int32_t(rate - TargetMode.RefreshRate.Numerator)); * uint64_t(TargetMode.RefreshRate.Denominator)
/ uint64_t(mode.RefreshRate.Denominator);
uint64_t diff = std::abs(int64_t(rate - uint64_t(TargetMode.RefreshRate.Numerator)));
return std::min(current, diff); return std::min(current, diff);
}); });
} }
@ -531,8 +533,10 @@ namespace dxvk {
} }
if (TargetMode.RefreshRate.Numerator && TargetMode.RefreshRate.Denominator) { if (TargetMode.RefreshRate.Numerator && TargetMode.RefreshRate.Denominator) {
uint32_t rate = it->RefreshRate.Numerator * TargetMode.RefreshRate.Denominator / it->RefreshRate.Denominator; uint64_t rate = uint64_t(it->RefreshRate.Numerator)
uint32_t diff = std::abs(int32_t(rate - TargetMode.RefreshRate.Numerator)); * uint64_t(TargetMode.RefreshRate.Denominator)
/ uint64_t(it->RefreshRate.Denominator);
uint64_t diff = std::abs(int64_t(rate - uint64_t(TargetMode.RefreshRate.Numerator)));
skipMode |= diff != minDiffRefreshRate; skipMode |= diff != minDiffRefreshRate;
} }