piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-28 09:59:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

VideoCommon: Use avg(color1, color2) for color3 in CMPR textures

Browse Source
This commit is contained in:
Stenzek
2016-12-11 21:54:21 +10:00
parent 989cdc0929
commit 344f2e57f6
3 changed files with 36 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Core/VideoCommon/TextureDecoder_Common.cpp
View File

@ -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;