From 344f2e57f608f6a4621514bddd5c1fff7d8e3764 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Sun, 11 Dec 2016 21:54:21 +1000 Subject: VideoCommon: Use avg(color1, color2) for color3 in CMPR textures --- Source/Core/VideoCommon/TextureDecoder_Common.cpp | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'Source/Core/VideoCommon/TextureDecoder_Common.cpp') diff --git a/Source/Core/VideoCommon/TextureDecoder_Common.cpp b/Source/Core/VideoCommon/TextureDecoder_Common.cpp index ad58980bfb..cdaba05bc2 100644 --- a/Source/Core/VideoCommon/TextureDecoder_Common.cpp +++ b/Source/Core/VideoCommon/TextureDecoder_Common.cpp @@ -654,6 +654,11 @@ void TexDecoder_DecodeTexel(u8* dst, const u8* src, int s, int t, int imageWidth int red1 = Convert5To8((c1 >> 11) & 0x1F); int red2 = Convert5To8((c2 >> 11) & 0x1F); + // Approximation of x/3: 3/8 (1/2 - 1/8) + int blue3 = ((blue2 - blue1) >> 1) - ((blue2 - blue1) >> 3); + int green3 = ((green2 - green1) >> 1) - ((green2 - green1) >> 3); + int red3 = ((red2 - red1) >> 1) - ((red2 - red1) >> 3); + u16 ss = s & 3; u16 tt = t & 3; @@ -675,19 +680,20 @@ void TexDecoder_DecodeTexel(u8* dst, const u8* src, int s, int t, int imageWidth color = MakeRGBA(red2, green2, blue2, 255); break; case 2: - color = MakeRGBA(red1 + (red2 - red1) / 3, green1 + (green2 - green1) / 3, - blue1 + (blue2 - blue1) / 3, 255); + color = MakeRGBA(red1 + red3, green1 + green3, blue1 + blue3, 255); break; case 3: - color = MakeRGBA(red2 + (red1 - red2) / 3, green2 + (green1 - green2) / 3, - blue2 + (blue1 - blue2) / 3, 255); + color = MakeRGBA(red2 - red3, green2 - green3, blue2 - blue3, 255); break; case 6: - color = MakeRGBA((int)ceil((float)(red1 + red2) / 2), (int)ceil((float)(green1 + green2) / 2), - (int)ceil((float)(blue1 + blue2) / 2), 255); + color = + MakeRGBA((red1 + red2 + 1) / 2, (green1 + green2 + 1) / 2, (blue1 + blue2 + 1) / 2, 255); break; case 7: - color = MakeRGBA(red2, green2, blue2, 0); + // 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 + 1) / 2, (green1 + green2 + 1) / 2, (blue1 + blue2 + 1) / 2, 0); break; default: color = 0; -- cgit v1.2.3