diff options
| author | Dr. Dystopia <jonis9898@hotmail.com> | 2026-07-31 23:16:34 +0200 |
|---|---|---|
| committer | Dr. Dystopia <jonis9898@hotmail.com> | 2026-08-16 10:28:21 +0200 |
| commit | eb956a158c76a0b7ebf19423d31ac91a31dc394e (patch) | |
| tree | 2ef18e6c3e558b3bb58c98404789df322e2a3afa /Source/Core/VideoCommon/TextureDecoder_Common.cpp | |
| parent | 54070da5851e12f2d1a4389daa528e4fb81327ce (diff) | |
Replace manual calculations with std::lerp and std::midpoint
Diffstat (limited to 'Source/Core/VideoCommon/TextureDecoder_Common.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/TextureDecoder_Common.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
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 <algorithm> #include <array> #include <cstddef> +#include <numeric> #include <span> #include "Common/CommonTypes.h" @@ -602,12 +603,14 @@ void TexDecoder_DecodeTexel(u8* dst, std::span<const u8> 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; |
