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.cpp | 25 +++++++++++----------- .../renderer_opengl/gl_rasterizer_cache.cpp | 8 +++---- 2 files changed, 17 insertions(+), 16 deletions(-) (limited to 'src/video_core/renderer_opengl') diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 13e2a77ce..170548528 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include #include #include #include @@ -290,18 +291,18 @@ void RasterizerOpenGL::DrawArrays() { : (depth_surface == nullptr ? 1u : depth_surface->res_scale); MathUtil::Rectangle draw_rect{ - static_cast(MathUtil::Clamp(static_cast(surfaces_rect.left) + - viewport_rect.left * res_scale, - surfaces_rect.left, surfaces_rect.right)), // Left - static_cast(MathUtil::Clamp(static_cast(surfaces_rect.bottom) + - viewport_rect.top * res_scale, - surfaces_rect.bottom, surfaces_rect.top)), // Top - static_cast(MathUtil::Clamp(static_cast(surfaces_rect.left) + - viewport_rect.right * res_scale, - surfaces_rect.left, surfaces_rect.right)), // Right - static_cast(MathUtil::Clamp(static_cast(surfaces_rect.bottom) + - viewport_rect.bottom * res_scale, - surfaces_rect.bottom, surfaces_rect.top))}; // Bottom + static_cast( + std::clamp(static_cast(surfaces_rect.left) + viewport_rect.left * res_scale, + surfaces_rect.left, surfaces_rect.right)), // Left + static_cast( + std::clamp(static_cast(surfaces_rect.bottom) + viewport_rect.top * res_scale, + surfaces_rect.bottom, surfaces_rect.top)), // Top + static_cast( + std::clamp(static_cast(surfaces_rect.left) + viewport_rect.right * res_scale, + surfaces_rect.left, surfaces_rect.right)), // Right + static_cast(std::clamp(static_cast(surfaces_rect.bottom) + + viewport_rect.bottom * res_scale, + surfaces_rect.bottom, surfaces_rect.top))}; // Bottom // Bind the framebuffer surfaces BindFramebufferSurfaces(color_surface, depth_surface, has_stencil); 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