diff --git a/Source/Core/DolphinQt/TAS/IRWidget.cpp b/Source/Core/DolphinQt/TAS/IRWidget.cpp index 0b08da1a40..74bfb61262 100644 --- a/Source/Core/DolphinQt/TAS/IRWidget.cpp +++ b/Source/Core/DolphinQt/TAS/IRWidget.cpp @@ -5,6 +5,7 @@ #include #include +#include #include #include @@ -65,7 +66,7 @@ void IRWidget::paintEvent(QPaintEvent* event) painter.drawLine(PADDING + w / 2, PADDING + h / 2, x, y); painter.setBrush(Qt::blue); - int wh_avg = (w + h) / 2; + int wh_avg = std::midpoint(w, h); int radius = wh_avg / 30; painter.drawEllipse(x - radius, y - radius, radius * 2, radius * 2); } diff --git a/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp b/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp index 0f6730720f..c8fa7b3647 100644 --- a/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp +++ b/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include #include @@ -177,7 +178,7 @@ public: const int min = libevdev_get_abs_minimum(m_dev, m_code); const int max = libevdev_get_abs_maximum(m_dev, m_code); - m_base = (max + min) / 2; + m_base = std::midpoint(min, max); m_range = (upper ? max : min) - m_base; } diff --git a/Source/Core/VideoCommon/PerformanceTracker.cpp b/Source/Core/VideoCommon/PerformanceTracker.cpp index 3d519865be..2ff6a7863b 100644 --- a/Source/Core/VideoCommon/PerformanceTracker.cpp +++ b/Source/Core/VideoCommon/PerformanceTracker.cpp @@ -94,7 +94,7 @@ void PerformanceTracker::HandleRawDt(DT diff) // Sometimes euler averages can break when the average is inf/nan const auto hz_avg = m_hz_avg.load(); if (std::isfinite(hz_avg)) - m_hz_avg = hz_avg + a * (hz - hz_avg); + m_hz_avg = std::lerp(hz_avg, hz, a); else m_hz_avg = hz; diff --git a/Source/Core/VideoCommon/ShaderGenCommon.h b/Source/Core/VideoCommon/ShaderGenCommon.h index 7d2c80f086..3ec230b35f 100644 --- a/Source/Core/VideoCommon/ShaderGenCommon.h +++ b/Source/Core/VideoCommon/ShaderGenCommon.h @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include @@ -247,7 +248,7 @@ void WriteSwitch(ShaderCode& out, APIType ApiType, std::string_view variable, } else { - u32 mid = low + ((high - low) / 2); + u32 mid = std::midpoint(low, high); out.Write("{:{}}if ({} < {}u) {{\n", "", cur_indent, variable, mid); BuildTree(cur_indent + 2, low, mid); out.Write("{:{}}}} else {{\n", "", cur_indent); diff --git a/Source/Core/VideoCommon/TextureDecoder_Common.cpp b/Source/Core/VideoCommon/TextureDecoder_Common.cpp index 3506514a54..a9e0cf91d8 100644 --- a/Source/Core/VideoCommon/TextureDecoder_Common.cpp +++ b/Source/Core/VideoCommon/TextureDecoder_Common.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include #include "Common/CommonTypes.h" @@ -602,12 +603,14 @@ void TexDecoder_DecodeTexel(u8* dst, std::span src, int s, int t, int color = MakeRGBA(DXTBlend(red1, red2), DXTBlend(green1, green2), DXTBlend(blue1, blue2), 255); break; case 6: - color = MakeRGBA((red1 + red2) / 2, (green1 + green2) / 2, (blue1 + blue2) / 2, 255); + color = MakeRGBA(std::midpoint(red1, red2), std::midpoint(green1, green2), + std::midpoint(blue1, blue2), 255); break; case 7: // color[3] is the same as color[2] (average of both colors), but transparent. // This differs from DXT1 where color[3] is transparent black. - color = MakeRGBA((red1 + red2) / 2, (green1 + green2) / 2, (blue1 + blue2) / 2, 0); + color = MakeRGBA(std::midpoint(red1, red2), std::midpoint(green1, green2), + std::midpoint(blue1, blue2), 0); break; default: color = 0; diff --git a/Source/Core/VideoCommon/TextureDecoder_Generic.cpp b/Source/Core/VideoCommon/TextureDecoder_Generic.cpp index 835ddb523e..04dd0456b2 100644 --- a/Source/Core/VideoCommon/TextureDecoder_Generic.cpp +++ b/Source/Core/VideoCommon/TextureDecoder_Generic.cpp @@ -5,6 +5,7 @@ #include #include +#include #include "Common/CPUDetect.h" #include "Common/CommonTypes.h" @@ -151,8 +152,10 @@ static void DecodeDXTBlock(u32* dst, const DXTBlock* src, int pitch) { // color[3] is the same as color[2] (average of both colors), but transparent. // This differs from DXT1 where color[3] is transparent black. - colors[2] = MakeRGBA((red1 + red2) / 2, (green1 + green2) / 2, (blue1 + blue2) / 2, 255); - colors[3] = MakeRGBA((red1 + red2) / 2, (green1 + green2) / 2, (blue1 + blue2) / 2, 0); + colors[2] = MakeRGBA(std::midpoint(red1, red2), std::midpoint(green1, green2), + std::midpoint(blue1, blue2), 255); + colors[3] = MakeRGBA(std::midpoint(red1, red2), std::midpoint(green1, green2), + std::midpoint(blue1, blue2), 0); } for (int y = 0; y < 4; y++) diff --git a/Source/Core/VideoCommon/TextureDecoder_x64.cpp b/Source/Core/VideoCommon/TextureDecoder_x64.cpp index 3918361561..a3bbcd8020 100644 --- a/Source/Core/VideoCommon/TextureDecoder_x64.cpp +++ b/Source/Core/VideoCommon/TextureDecoder_x64.cpp @@ -3,6 +3,8 @@ #include "VideoCommon/TextureDecoder.h" +#include + #ifdef CHECK #include "Common/Assert.h" #endif @@ -188,8 +190,10 @@ static void DecodeDXTBlock(u32* dst, const DXTBlock* src, int pitch) { // color[3] is the same as color[2] (average of both colors), but transparent. // This differs from DXT1 where color[3] is transparent black. - colors[2] = MakeRGBA((red1 + red2) / 2, (green1 + green2) / 2, (blue1 + blue2) / 2, 255); - colors[3] = MakeRGBA((red1 + red2) / 2, (green1 + green2) / 2, (blue1 + blue2) / 2, 0); + colors[2] = MakeRGBA(std::midpoint(red1 + red2), std::midpoint(green1, green2), + std::midpoint(blue1, blue2), 255); + colors[3] = MakeRGBA(std::midpoint(red1 + red2), std::midpoint(green1, green2), + std::midpoint(blue1, blue2), 0); } for (int y = 0; y < 4; y++)