1
0
mirror of https://github.com/doitsujin/dxvk.git synced 2024-11-30 13:24:10 +01:00

[dxvk] Remove std::clamp usage

Breaks outdated compilers.
This commit is contained in:
Philip Rebohle 2018-04-18 17:49:11 +02:00
parent adb0f5e16b
commit 8125d53e58
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99

View File

@ -96,8 +96,8 @@ namespace dxvk::hud {
minMs = std::min(minMs, uint32_t(us / 100.0f));
maxMs = std::max(maxMs, uint32_t(us / 100.0f));
float r = std::clamp(-1.0f + us / targetUs, 0.0f, 1.0f);
float g = std::clamp( 3.0f - us / targetUs, 0.0f, 1.0f);
float r = std::min(std::max(-1.0f + us / targetUs, 0.0f), 1.0f);
float g = std::min(std::max( 3.0f - us / targetUs, 0.0f), 1.0f);
float l = std::sqrt(r * r + g * g);
HudTexCoord tc = { 0u, 0u };
@ -108,7 +108,7 @@ namespace dxvk::hud {
float hVal = std::log2(std::max((us - minUs) / targetUs + 1.0f, 1.0f))
/ std::log2((maxUs - minUs) / targetUs);
float h = std::clamp(40.0f * hVal, 2.0f, 40.0f);
float h = std::min(std::max(40.0f * hVal, 2.0f), 40.0f);
vData[2 * i + 0] = HudVertex { { x, y }, tc, color };
vData[2 * i + 1] = HudVertex { { x, y - h }, tc, color };