Replace MathUtil::Clamp with std::clamp

Source/Core/AudioCommon/Mixer.cpp

@@ -4,13 +4,13 @@
 
 #include "AudioCommon/Mixer.h"
 
+#include <algorithm>
 #include <cmath>
 #include <cstring>
 
 #include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
-#include "Common/MathUtil.h"
 #include "Common/Swap.h"
 #include "Core/ConfigManager.h"
 
@@ -86,14 +86,14 @@ unsigned int Mixer::MixerFifo::Mix(short* samples, unsigned int numSamples,
     int sampleL = ((l1 << 16) + (l2 - l1) * (u16)m_frac) >> 16;
     sampleL = (sampleL * lvolume) >> 8;
     sampleL += samples[currentSample + 1];
-    samples[currentSample + 1] = MathUtil::Clamp(sampleL, -32767, 32767);
+    samples[currentSample + 1] = std::clamp(sampleL, -32767, 32767);
 
     s16 r1 = Common::swap16(m_buffer[(indexR + 1) & INDEX_MASK]);   // current
     s16 r2 = Common::swap16(m_buffer[(indexR2 + 1) & INDEX_MASK]);  // next
     int sampleR = ((r1 << 16) + (r2 - r1) * (u16)m_frac) >> 16;
     sampleR = (sampleR * rvolume) >> 8;
     sampleR += samples[currentSample];
-    samples[currentSample] = MathUtil::Clamp(sampleR, -32767, 32767);
+    samples[currentSample] = std::clamp(sampleR, -32767, 32767);
 
     m_frac += ratio;
     indexR += 2 * (u16)(m_frac >> 16);
@@ -111,8 +111,8 @@ unsigned int Mixer::MixerFifo::Mix(short* samples, unsigned int numSamples,
   s[1] = (s[1] * lvolume) >> 8;
   for (; currentSample < numSamples * 2; currentSample += 2)
   {
-    int sampleR = MathUtil::Clamp(s[0] + samples[currentSample + 0], -32767, 32767);
-    int sampleL = MathUtil::Clamp(s[1] + samples[currentSample + 1], -32767, 32767);
+    int sampleR = std::clamp(s[0] + samples[currentSample + 0], -32767, 32767);
+    int sampleL = std::clamp(s[1] + samples[currentSample + 1], -32767, 32767);
 
     samples[currentSample + 0] = sampleR;
     samples[currentSample + 1] = sampleL;

Source/Core/Common/MathUtil.h

@@ -18,12 +18,6 @@ namespace MathUtil
 constexpr double TAU = 6.2831853071795865;
 constexpr double PI = TAU / 2;
 
-template <class T>
-constexpr T Clamp(const T val, const T& min, const T& max)
-{
-  return std::max(min, std::min(max, val));
-}
-
 template <typename T>
 constexpr auto Sign(const T& val) -> decltype((T{} < val) - (val < T{}))
 {
@@ -81,20 +75,20 @@ struct Rectangle
   // this Clamp.
   void ClampLL(T x1, T y1, T x2, T y2)
   {
-    left = Clamp(left, x1, x2);
-    right = Clamp(right, x1, x2);
-    top = Clamp(top, y2, y1);
-    bottom = Clamp(bottom, y2, y1);
+    left = std::clamp(left, x1, x2);
+    right = std::clamp(right, x1, x2);
+    top = std::clamp(top, y2, y1);
+    bottom = std::clamp(bottom, y2, y1);
   }
 
   // If the rectangle is in a coordinate system with an upper-left origin,
   // use this Clamp.
   void ClampUL(T x1, T y1, T x2, T y2)
   {
-    left = Clamp(left, x1, x2);
-    right = Clamp(right, x1, x2);
-    top = Clamp(top, y1, y2);
-    bottom = Clamp(bottom, y1, y2);
+    left = std::clamp(left, x1, x2);
+    right = std::clamp(right, x1, x2);
+    top = std::clamp(top, y1, y2);
+    bottom = std::clamp(bottom, y1, y2);
   }
 };
 

Source/Core/Core/DSP/DSPAccelerator.cpp

@@ -2,12 +2,13 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include <algorithm>
+
 #include "Core/DSP/DSPAccelerator.h"
 
 #include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
-#include "Common/MathUtil.h"
 
 namespace DSP
 {
@@ -89,7 +90,7 @@ u16 Accelerator::Read(const s16* coefs)
       temp -= 16;
 
     s32 val32 = (scale * temp) + ((0x400 + coef1 * m_yn1 + coef2 * m_yn2) >> 11);
-    val = static_cast<s16>(MathUtil::Clamp<s32>(val32, -0x7FFF, 0x7FFF));
+    val = static_cast<s16>(std::clamp<s32>(val32, -0x7FFF, 0x7FFF));
     step_size_bytes = 2;
 
     m_yn2 = m_yn1;

Source/Core/Core/HW/DSPHLE/UCodes/AX.cpp

@@ -2,6 +2,8 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include <algorithm>
+
 #include "Core/HW/DSPHLE/UCodes/AX.h"
 
 #include "Common/ChunkFile.h"
@@ -9,7 +11,6 @@
 #include "Common/File.h"
 #include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
-#include "Common/MathUtil.h"
 #include "Common/Swap.h"
 #include "Core/HW/DSP.h"
 #include "Core/HW/DSPHLE/DSPHLE.h"
@@ -535,8 +536,8 @@ void AXUCode::OutputSamples(u32 lr_addr, u32 surround_addr)
   // Output samples clamped to 16 bits and interlaced RLRLRLRLRL...
   for (u32 i = 0; i < 5 * 32; ++i)
   {
-    int left = MathUtil::Clamp(m_samples_left[i], -32767, 32767);
-    int right = MathUtil::Clamp(m_samples_right[i], -32767, 32767);
+    int left = std::clamp(m_samples_left[i], -32767, 32767);
+    int right = std::clamp(m_samples_right[i], -32767, 32767);
 
     buffer[2 * i + 0] = Common::swap16(right);
     buffer[2 * i + 1] = Common::swap16(left);

Source/Core/Core/HW/DSPHLE/UCodes/AXVoice.h

@@ -12,11 +12,11 @@
 #error AXVoice.h included without specifying version
 #endif
 
+#include <algorithm>
 #include <functional>
 #include <memory>
 
 #include "Common/CommonTypes.h"
-#include "Common/MathUtil.h"
 #include "Core/DSP/DSPAccelerator.h"
 #include "Core/HW/DSP.h"
 #include "Core/HW/DSPHLE/UCodes/AX.h"
@@ -413,7 +413,7 @@ void MixAdd(int* out, const s16* input, u32 count, u16* pvol, s16* dpop, bool ra
     s64 sample = input[i];
     sample *= volume;
     sample >>= 15;
-    sample = MathUtil::Clamp((s32)sample, -32767, 32767);  // -32768 ?
+    sample = std::clamp((s32)sample, -32767, 32767);  // -32768 ?
 
     out[i] += (s16)sample;
     volume += volume_delta;
@@ -447,8 +447,8 @@ void ProcessVoice(PB_TYPE& pb, const AXBuffers& buffers, u16 count, AXMixControl
   // Apply a global volume ramp using the volume envelope parameters.
   for (u32 i = 0; i < count; ++i)
   {
-    samples[i] = MathUtil::Clamp(((s32)samples[i] * pb.vol_env.cur_volume) >> 15, -32767,
-                                 32767);  // -32768 ?
+    samples[i] = std::clamp(((s32)samples[i] * pb.vol_env.cur_volume) >> 15, -32767,
+                            32767);  // -32768 ?
     pb.vol_env.cur_volume += pb.vol_env.cur_volume_delta;
   }
 

Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp

@@ -4,12 +4,13 @@
 //
 #define AX_WII  // Used in AXVoice.
 
+#include <algorithm>
+
 #include "Core/HW/DSPHLE/UCodes/AXWii.h"
 
 #include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
-#include "Common/MathUtil.h"
 #include "Common/Swap.h"
 #include "Core/HW/DSPHLE/DSPHLE.h"
 #include "Core/HW/DSPHLE/MailHandler.h"
@@ -602,8 +603,8 @@ void AXWiiUCode::OutputSamples(u32 lr_addr, u32 surround_addr, u16 volume, bool
     left = ((s64)left * volume_ramp[i]) >> 15;
     right = ((s64)right * volume_ramp[i]) >> 15;
 
-    m_samples_left[i] = MathUtil::Clamp(left, -32767, 32767);
-    m_samples_right[i] = MathUtil::Clamp(right, -32767, 32767);
+    m_samples_left[i] = std::clamp(left, -32767, 32767);
+    m_samples_right[i] = std::clamp(right, -32767, 32767);
   }
 
   for (u32 i = 0; i < 3 * 32; ++i)
@@ -626,7 +627,7 @@ void AXWiiUCode::OutputWMSamples(u32* addresses)
     u16* out = (u16*)HLEMemory_Get_Pointer(addresses[i]);
     for (u32 j = 0; j < 3 * 6; ++j)
     {
-      int sample = MathUtil::Clamp(in[j], -32767, 32767);
+      int sample = std::clamp(in[j], -32767, 32767);
       out[j] = Common::swap16((u16)sample);
     }
   }

Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp

@@ -4,6 +4,7 @@
 
 #include "Core/HW/DSPHLE/UCodes/Zelda.h"
 
+#include <algorithm>
 #include <array>
 #include <map>
 
@@ -1086,7 +1087,7 @@ void ZeldaAudioRenderer::ApplyReverb(bool post_rendering)
           for (u16 j = 0; j < 8; ++j)
             sample += (s32)buffer[i + j] * rpb.filter_coeffs[j];
           sample >>= 15;
-          buffer[i] = MathUtil::Clamp(sample, -0x8000, 0x7FFF);
+          buffer[i] = std::clamp(sample, -0x8000, 0x7FFF);
         }
       };
 
@@ -1526,7 +1527,7 @@ void ZeldaAudioRenderer::Resample(VPB* vpb, const s16* src, MixingBuffer* dst)
         dst_sample_unclamped += (s64)2 * coeffs[i] * input[i];
       dst_sample_unclamped >>= 16;
 
-      dst_sample = (s16)MathUtil::Clamp<s64>(dst_sample_unclamped, -0x8000, 0x7FFF);
+      dst_sample = (s16)std::clamp<s64>(dst_sample_unclamped, -0x8000, 0x7FFF);
 
       pos += ratio;
     }
@@ -1764,7 +1765,7 @@ void ZeldaAudioRenderer::DecodeAFC(VPB* vpb, s16* dst, size_t block_count)
       s32 sample =
           delta * nibbles[i] + yn1 * m_afc_coeffs[idx * 2] + yn2 * m_afc_coeffs[idx * 2 + 1];
       sample >>= 11;
-      sample = MathUtil::Clamp(sample, -0x8000, 0x7fff);
+      sample = std::clamp(sample, -0x8000, 0x7fff);
       *dst++ = (s16)sample;
       yn2 = yn1;
       yn1 = sample;

Source/Core/Core/HW/DSPHLE/UCodes/Zelda.h

@@ -4,10 +4,10 @@
 
 #pragma once
 
+#include <algorithm>
 #include <array>
 
 #include "Common/CommonTypes.h"
-#include "Common/MathUtil.h"
 #include "Core/HW/DSPHLE/UCodes/UCodes.h"
 
 namespace DSP
@@ -54,7 +54,7 @@ private:
       s32 tmp = (u32)(*buf)[i] * (u32)vol;
       tmp >>= 16 - B;
 
-      (*buf)[i] = (s16)MathUtil::Clamp(tmp, -0x8000, 0x7FFF);
+      (*buf)[i] = (s16)std::clamp(tmp, -0x8000, 0x7FFF);
     }
   }
   template <size_t N>
@@ -96,7 +96,7 @@ private:
     while (count--)
     {
       s32 vol_src = ((s32)*src++ * (s32)vol) >> 15;
-      *dst++ += MathUtil::Clamp(vol_src, -0x8000, 0x7FFF);
+      *dst++ += std::clamp(vol_src, -0x8000, 0x7FFF);
     }
   }
 

Source/Core/Core/HW/GCMemcard/GCMemcard.cpp

@@ -15,7 +15,6 @@
 #include "Common/CommonPaths.h"
 #include "Common/CommonTypes.h"
 #include "Common/File.h"
-#include "Common/MathUtil.h"
 #include "Common/MsgHandler.h"
 #include "Common/StringUtil.h"
 #include "Common/Swap.h"
@@ -609,8 +608,8 @@ u16 BlockAlloc::NextFreeBlock(u16 MaxBlock, u16 StartingBlock) const
 {
   if (m_free_blocks > 0)
   {
-    StartingBlock = MathUtil::Clamp<u16>(StartingBlock, MC_FST_BLOCKS, BAT_SIZE + MC_FST_BLOCKS);
-    MaxBlock = MathUtil::Clamp<u16>(MaxBlock, MC_FST_BLOCKS, BAT_SIZE + MC_FST_BLOCKS);
+    StartingBlock = std::clamp<u16>(StartingBlock, MC_FST_BLOCKS, BAT_SIZE + MC_FST_BLOCKS);
+    MaxBlock = std::clamp<u16>(MaxBlock, MC_FST_BLOCKS, BAT_SIZE + MC_FST_BLOCKS);
     for (u16 i = StartingBlock; i < MaxBlock; ++i)
       if (m_map[i - MC_FST_BLOCKS] == 0)
         return i;

Source/Core/Core/HW/StreamADPCM.cpp

@@ -4,11 +4,12 @@
 
 // Adapted from in_cube by hcs & destop
 
+#include <algorithm>
+
 #include "Core/HW/StreamADPCM.h"
 
 #include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
-#include "Common/MathUtil.h"
 
 namespace StreamADPCM
 {
@@ -30,7 +31,7 @@ static s16 ADPDecodeSample(s32 bits, s32 q, s32& hist1, s32& hist2)
     hist = (hist1 * 0x62) - (hist2 * 0x37);
     break;
   }
-  hist = MathUtil::Clamp((hist + 0x20) >> 6, -0x200000, 0x1fffff);
+  hist = std::clamp((hist + 0x20) >> 6, -0x200000, 0x1fffff);
 
   s32 cur = (((s16)(bits << 12) >> (q & 0xf)) << 6) + hist;
 
@@ -38,7 +39,7 @@ static s16 ADPDecodeSample(s32 bits, s32 q, s32& hist1, s32& hist2)
   hist1 = cur;
 
   cur >>= 6;
-  cur = MathUtil::Clamp(cur, -0x8000, 0x7fff);
+  cur = std::clamp(cur, -0x8000, 0x7fff);
 
   return (s16)cur;
 }

Source/Core/Core/HW/VideoInterface.cpp

@@ -4,6 +4,7 @@
 
 #include "Core/HW/VideoInterface.h"
 
+#include <algorithm>
 #include <array>
 #include <cmath>
 #include <cstddef>
@@ -12,7 +13,6 @@
 #include "Common/CommonTypes.h"
 #include "Common/Config/Config.h"
 #include "Common/Logging/Log.h"
-#include "Common/MathUtil.h"
 
 #include "Core/Config/MainSettings.h"
 #include "Core/Config/SYSCONFSettings.h"
@@ -328,7 +328,7 @@ void RegisterMMIO(MMIO::Mapping* mmio, u32 base)
         u16 value = static_cast<u16>(1 + m_HTiming0.HLW *
                                              (CoreTiming::GetTicks() - s_ticks_last_line_start) /
                                              (GetTicksPerHalfLine()));
-        return MathUtil::Clamp(value, static_cast<u16>(1), static_cast<u16>(m_HTiming0.HLW * 2));
+        return std::clamp<u16>(value, 1, m_HTiming0.HLW * 2);
       }),
       MMIO::ComplexWrite<u16>([](u32, u16 val) {
         WARN_LOG(VIDEOINTERFACE,

Source/Core/Core/HW/WiimoteEmu/Dynamics.cpp

@@ -4,6 +4,7 @@
 
 #include "Core/HW/WiimoteEmu/Dynamics.h"
 
+#include <algorithm>
 #include <cmath>
 
 #include "Common/MathUtil.h"
@@ -170,7 +171,7 @@ void EmulateSwing(MotionState* state, ControllerEmu::Force* swing_group, float t
   if (y_progress > max_y_progress || y_progress < -1)
   {
     state->position.y =
-        MathUtil::Clamp(state->position.y, -1.f * max_distance, max_y_progress * max_distance);
+        std::clamp(state->position.y, -1.f * max_distance, max_y_progress * max_distance);
     state->velocity.y = 0;
     state->acceleration.y = 0;
   }
@@ -184,9 +185,9 @@ WiimoteCommon::DataReportBuilder::AccelData ConvertAccelData(const Common::Vec3&
   // 10-bit integers.
   constexpr long MAX_VALUE = (1 << 10) - 1;
 
-  return {u16(MathUtil::Clamp(std::lround(scaled_accel.x + zero_g), 0l, MAX_VALUE)),
-          u16(MathUtil::Clamp(std::lround(scaled_accel.y + zero_g), 0l, MAX_VALUE)),
-          u16(MathUtil::Clamp(std::lround(scaled_accel.z + zero_g), 0l, MAX_VALUE))};
+  return {u16(std::clamp(std::lround(scaled_accel.x + zero_g), 0l, MAX_VALUE)),
+          u16(std::clamp(std::lround(scaled_accel.y + zero_g), 0l, MAX_VALUE)),
+          u16(std::clamp(std::lround(scaled_accel.z + zero_g), 0l, MAX_VALUE))};
 }
 
 void EmulateCursor(MotionState* state, ControllerEmu::Cursor* ir_group, float time_elapsed)

Source/Core/Core/HW/WiimoteEmu/Extension/Nunchuk.cpp

@@ -4,6 +4,7 @@
 
 #include "Core/HW/WiimoteEmu/Extension/Nunchuk.h"
 
+#include <algorithm>
 #include <array>
 #include <cassert>
 #include <cstring>

Source/Core/Core/HW/WiimoteEmu/MotionPlus.cpp

@@ -642,9 +642,9 @@ void MotionPlus::PrepareInput(const Common::Vec3& angular_velocity)
     mplus_data.pitch_slow = (std::abs(pitch) < SLOW_MAX_RAD_PER_SEC);
     s32 pitch_value = pitch * (mplus_data.pitch_slow ? SLOW_SCALE : FAST_SCALE);
 
-    yaw_value = MathUtil::Clamp(yaw_value + ZERO_VALUE, 0, MAX_VALUE);
-    roll_value = MathUtil::Clamp(roll_value + ZERO_VALUE, 0, MAX_VALUE);
-    pitch_value = MathUtil::Clamp(pitch_value + ZERO_VALUE, 0, MAX_VALUE);
+    yaw_value = std::clamp(yaw_value + ZERO_VALUE, 0, MAX_VALUE);
+    roll_value = std::clamp(roll_value + ZERO_VALUE, 0, MAX_VALUE);
+    pitch_value = std::clamp(pitch_value + ZERO_VALUE, 0, MAX_VALUE);
 
     // Bits 0-7
     mplus_data.yaw1 = u8(yaw_value);

Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp

@@ -2,6 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include <algorithm>
 #include <tuple>
 #include <type_traits>
 #include <utility>
@@ -63,7 +64,7 @@ SType ScaleAndClamp(double ps, u32 stScale)
   float min = (float)std::numeric_limits<SType>::min();
   float max = (float)std::numeric_limits<SType>::max();
 
-  return (SType)MathUtil::Clamp(convPS, min, max);
+  return (SType)std::clamp(convPS, min, max);
 }
 
 template <typename T>

Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.cpp

@@ -109,7 +109,7 @@ Cursor::StateData Cursor::GetState(const bool adjusted)
 
   // Smooth out z movement:
   // FYI: Not using relative input for Z.
-  m_state.z += MathUtil::Clamp(z - m_state.z, -max_z_step, max_z_step);
+  m_state.z += std::clamp(z - m_state.z, -max_z_step, max_z_step);
 
   // Relative input:
   if (m_relative_setting.GetValue())
@@ -122,8 +122,8 @@ Cursor::StateData Cursor::GetState(const bool adjusted)
     }
     else
     {
-      m_state.x = MathUtil::Clamp(m_state.x + input.x * max_step, -1.0, 1.0);
-      m_state.y = MathUtil::Clamp(m_state.y + input.y * max_step, -1.0, 1.0);
+      m_state.x = std::clamp(m_state.x + input.x * max_step, -1.0, 1.0);
+      m_state.y = std::clamp(m_state.y + input.y * max_step, -1.0, 1.0);
     }
   }
   // Absolute input:

Source/Core/InputCommon/ControllerEmu/StickGate.cpp

@@ -4,6 +4,7 @@
 
 #include "InputCommon/ControllerEmu/StickGate.h"
 
+#include <algorithm>
 #include <cmath>
 
 #include "Common/Common.h"
@@ -277,8 +278,8 @@ ReshapableInput::ReshapeData ReshapableInput::Reshape(ControlState x, ControlSta
   // Scale to the gate shape/radius:
   dist *= gate_max_dist;
 
-  return {MathUtil::Clamp(std::cos(angle) * dist, -1.0, 1.0),
-          MathUtil::Clamp(std::sin(angle) * dist, -1.0, 1.0)};
+  return {std::clamp(std::cos(angle) * dist, -1.0, 1.0),
+          std::clamp(std::sin(angle) * dist, -1.0, 1.0)};
 }
 
 }  // namespace ControllerEmu

Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.cpp

@@ -2,6 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include <algorithm>
 #include <array>
 #include <cstdlib>
 #include <fcntl.h>
@@ -15,7 +16,6 @@
 #include <vector>
 
 #include "Common/FileUtil.h"
-#include "Common/MathUtil.h"
 #include "Common/StringUtil.h"
 #include "InputCommon/ControllerInterface/ControllerInterface.h"
 #include "InputCommon/ControllerInterface/Pipes/Pipes.h"
@@ -123,7 +123,7 @@ void PipeDevice::AddAxis(const std::string& name, double value)
 
 void PipeDevice::SetAxis(const std::string& entry, double value)
 {
-  value = MathUtil::Clamp(value, 0.0, 1.0);
+  value = std::clamp(value, 0.0, 1.0);
   double hi = std::max(0.0, value - 0.5) * 2.0;
   double lo = (0.5 - std::min(0.5, value)) * 2.0;
   auto search_hi = m_axes.find(entry + " +");

Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp

@@ -2,6 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include <algorithm>
 #include <cstring>
 #include <fcntl.h>
 #include <libudev.h>

Source/Core/VideoBackends/D3D/Render.cpp

@@ -4,6 +4,7 @@
 
 #include "VideoBackends/D3D/Render.h"
 
+#include <algorithm>
 #include <array>
 #include <cinttypes>
 #include <cmath>