libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-17 07:07:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GRAPHICS: Respect alpha and rgba formats in interpolation and conversion

Browse Source
This commit is contained in:
Eric Culp 2012-07-06 15:21:21 -04:00 committed by Filippos Karapetis
parent c2ddab7dd2
commit c666ecd41d
1 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
graphics/scaler/intern.h
View File

@ -72,21 +72,29 @@ static inline uint32 interpolate32_3_1(uint32 p1, uint32 p2) {
*/
template<typename ColorMask>
uint32 interpolate32_2_1(uint32 pixel1, uint32 pixel2) {
uint32 rsum, gsum, bsum;
uint32 rsum, gsum, bsum, asum;
rsum = (pixel1 & ColorMask::kRedMask) << 1;
rsum += (pixel2 & ColorMask::kRedMask);
rsum = ((pixel1 & ColorMask::kRedMask) >> ColorMask::kRedShift) << 1;
rsum += ((pixel2 & ColorMask::kRedMask) >> ColorMask::kRedShift);
rsum /= 3;
rsum <<= ColorMask::kRedShift;
gsum = (pixel1 & ColorMask::kGreenMask) << 1;
gsum += (pixel2 & ColorMask::kGreenMask);
gsum = ((pixel1 & ColorMask::kGreenMask) >> ColorMask::kGreenShift) << 1;
gsum += ((pixel2 & ColorMask::kGreenMask) >> ColorMask::kGreenShift);
gsum /= 3;
gsum <<= ColorMask::kGreenShift;
bsum = (pixel1 & ColorMask::kBlueMask) << 1;
bsum += (pixel2 & ColorMask::kBlueMask);
bsum = ((pixel1 & ColorMask::kBlueMask) >> ColorMask::kBlueShift) << 1;
bsum += ((pixel2 & ColorMask::kBlueMask) >> ColorMask::kBlueShift);
bsum /= 3;
bsum <<= ColorMask::kBlueShift;
return (rsum & ColorMask::kRedMask) | (gsum & ColorMask::kGreenMask) | (bsum & ColorMask::kBlueMask);
asum = ((pixel1 & ColorMask::kAlphaMask) >> ColorMask::kAlphaShift) << 1;
asum += ((pixel2 & ColorMask::kAlphaMask) >> ColorMask::kAlphaShift);
asum /= 3;
asum <<= ColorMask::kAlphaShift;
return (rsum & ColorMask::kRedMask) | (gsum & ColorMask::kGreenMask) | (bsum & ColorMask::kBlueMask) | (asum & ColorMask::kAlphaMask);
}
/**
@ -252,24 +260,26 @@ inline uint32 interpolate32_14_1_1<Graphics::ColorMasks<565> >(uint32 p1, uint32
*/
template<typename ColorMask>
uint32 interpolate32_1_1_1(uint32 pixel1, uint32 pixel2, uint32 pixel3)
{
uint32 interpolate32_1_1_1(uint32 pixel1, uint32 pixel2, uint32 pixel3) {
uint32 rsum, gsum, bsum;
rsum = (pixel1 & ColorMask::kRedMask);
rsum += (pixel2 & ColorMask::kRedMask);
rsum += (pixel3 & ColorMask::kRedMask);
rsum = ((pixel1 & ColorMask::kRedMask) >> ColorMask::kRedShift);
rsum += ((pixel2 & ColorMask::kRedMask) >> ColorMask::kRedShift);
rsum += ((pixel3 & ColorMask::kRedMask) >> ColorMask::kRedShift);
rsum /= 3;
rsum <<= ColorMask::kRedShift;
gsum = (pixel1 & ColorMask::kGreenMask);
gsum += (pixel2 & ColorMask::kGreenMask);
gsum += (pixel3 & ColorMask::kGreenMask);
gsum = ((pixel1 & ColorMask::kGreenMask) >> ColorMask::kGreenShift);
gsum += ((pixel2 & ColorMask::kGreenMask) >> ColorMask::kGreenShift);
gsum += ((pixel3 & ColorMask::kGreenMask) >> ColorMask::kGreenShift);
gsum /= 3;
gsum <<= ColorMask::kGreenShift;
bsum = (pixel1 & ColorMask::kBlueMask);
bsum += (pixel2 & ColorMask::kBlueMask);
bsum += (pixel3 & ColorMask::kBlueMask);
bsum = ((pixel1 & ColorMask::kBlueMask) >> ColorMask::kBlueShift);
bsum += ((pixel2 & ColorMask::kBlueMask) >> ColorMask::kBlueShift);
bsum += ((pixel3 & ColorMask::kBlueMask) >> ColorMask::kBlueShift);
bsum /= 3;
bsum <<= ColorMask::kBlueShift;
return (rsum & ColorMask::kRedMask) | (gsum & ColorMask::kGreenMask) | (bsum & ColorMask::kBlueMask);
}