From fae2dd034462c5a6b086e46b3437ea6e2456d5eb Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 19 Apr 2018 23:01:50 -0400 Subject: math_util: Remove the Clamp() function C++17 adds clamp() to the standard library, so we can remove ours in favor of it. --- src/video_core/renderer_opengl/gl_rasterizer_cache.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/video_core/renderer_opengl/gl_rasterizer_cache.cpp') diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp index 561c6913d..6c1c6775a 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp @@ -1086,10 +1086,10 @@ SurfaceSurfaceRect_Tuple RasterizerCacheOpenGL::GetFramebufferSurfaces( } MathUtil::Rectangle viewport_clamped{ - static_cast(MathUtil::Clamp(viewport.left, 0, static_cast(config.width))), - static_cast(MathUtil::Clamp(viewport.top, 0, static_cast(config.height))), - static_cast(MathUtil::Clamp(viewport.right, 0, static_cast(config.width))), - static_cast(MathUtil::Clamp(viewport.bottom, 0, static_cast(config.height)))}; + static_cast(std::clamp(viewport.left, 0, static_cast(config.width))), + static_cast(std::clamp(viewport.top, 0, static_cast(config.height))), + static_cast(std::clamp(viewport.right, 0, static_cast(config.width))), + static_cast(std::clamp(viewport.bottom, 0, static_cast(config.height)))}; // get color and depth surfaces SurfaceParams color_params; -- cgit v1.2.3