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/VideoCommon/RenderBase.cpp | |
| parent | 99a4ca8de7111c8554b50217744e24bc71912cfe (diff) | |
| parent | 9133e8f1befbebd87c6e61f0e454f3ae2754285a (diff) | |
Merge pull request #6273 from leoetlino/c++17
Enable C++17
Diffstat (limited to 'Source/Core/VideoCommon/RenderBase.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/RenderBase.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp index 523a681884..222b1ba9ab 100644 --- a/Source/Core/VideoCommon/RenderBase.cpp +++ b/Source/Core/VideoCommon/RenderBase.cpp @@ -14,6 +14,7 @@ #include "VideoCommon/RenderBase.h" +#include <algorithm> #include <cinttypes> #include <cmath> #include <memory> @@ -218,11 +219,11 @@ u32 Renderer::AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data) if (bpmem.zcontrol.pixel_format == PEControl::RGB565_Z16) { // if Z is in 16 bit format you must return a 16 bit integer - ret = MathUtil::Clamp<u32>(static_cast<u32>(depth * 65536.0f), 0, 0xFFFF); + ret = std::clamp<u32>(static_cast<u32>(depth * 65536.0f), 0, 0xFFFF); } else { - ret = MathUtil::Clamp<u32>(static_cast<u32>(depth * 16777216.0f), 0, 0xFFFFFF); + ret = std::clamp<u32>(static_cast<u32>(depth * 16777216.0f), 0, 0xFFFFFF); } return ret; |
