diff options
| author | Léo Lam <leo@innovatetechnologi.es> | 2019-05-05 10:24:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-05 10:24:18 +0200 |
| commit | 5d52b6ff095a4f8285ae757745ab0285bad47b9e (patch) | |
| tree | ac4904dfb02322a55dd7e5a2d7cdedf756f8eaf6 /Source/Core/VideoBackends/Software/Tev.cpp | |
| parent | 99a4ca8de7111c8554b50217744e24bc71912cfe (diff) | |
| parent | 9133e8f1befbebd87c6e61f0e454f3ae2754285a (diff) | |
Merge pull request #6273 from leoetlino/c++17
Enable C++17
Diffstat (limited to 'Source/Core/VideoBackends/Software/Tev.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/Software/Tev.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/VideoBackends/Software/Tev.cpp b/Source/Core/VideoBackends/Software/Tev.cpp index 4b7c41347c..8b2d776835 100644 --- a/Source/Core/VideoBackends/Software/Tev.cpp +++ b/Source/Core/VideoBackends/Software/Tev.cpp @@ -2,11 +2,11 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include <algorithm> #include <cmath> #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" -#include "Common/MathUtil.h" #include "VideoBackends/Software/DebugUtil.h" #include "VideoBackends/Software/EfbInterface.h" #include "VideoBackends/Software/Tev.h" @@ -777,7 +777,7 @@ void Tev::Draw() // Based on that, choose the index such that points which are far away from the z-axis use the // 10th "k" value and such that central points use the first value. float floatindex = 9.f - std::abs(offset) * 9.f; - floatindex = MathUtil::Clamp(floatindex, 0.f, 9.f); // TODO: This shouldn't be necessary! + floatindex = std::clamp(floatindex, 0.f, 9.f); // TODO: This shouldn't be necessary! // Get the two closest integer indices, look up the corresponding samples const int indexlower = (int)floatindex; @@ -798,7 +798,7 @@ void Tev::Draw() ze -= bpmem.fog.GetC(); // clamp 0 to 1 - float fog = MathUtil::Clamp(ze, 0.f, 1.f); + float fog = std::clamp(ze, 0.f, 1.f); switch (bpmem.fog.c_proj_fsel.fsel) { |