Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[Common] Abstract out the decode5A3Image and decodeCI8Image functions… 
… in BannerLoaderGC, BannerLoaderWii, and GCMemcard into ColorUtil.cpp. Makes for less copied code and remains functionally the same.
  • Loading branch information
@lioncash
lioncash committed Oct 2, 2013
1 parent b1268bf commit 1ec4894
Show file tree
Hide file tree
Showing 7 changed files with 50 additions and 89 deletions.
37 changes: 37 additions & 0 deletions Source/Core/Common/Src/ColorUtil.cpp
View file
Expand Up @@ -40,4 +40,41 @@ u32 Decode5A3(u16 val)
return (a << 24) | (r << 16) | (g << 8) | b;
}

void decode5A3image(u32* dst, u16* src, int width, int height)
{
for (int y = 0; y < height; y += 4)
{
for (int x = 0; x < width; x += 4)
{
for (int iy = 0; iy < 4; iy++, src += 4)
{
for (int ix = 0; ix < 4; ix++)
{
u32 RGBA = Decode5A3(Common::swap16(src[ix]));
dst[(y + iy) * width + (x + ix)] = RGBA;
}
}
}
}
}

void decodeCI8image(u32* dst, u8* src, u16* pal, int width, int height)
{
for (int y = 0; y < height; y += 4)
{
for (int x = 0; x < width; x += 8)
{
for (int iy = 0; iy < 4; iy++, src += 8)
{
u32 *tdst = dst+(y+iy)*width+x;
for (int ix = 0; ix < 8; ix++)
{
// huh, this seems wrong. CI8, not 5A3, no?
tdst[ix] = ColorUtil::Decode5A3(Common::swap16(pal[src[ix]]));
}
}
}
}
}

} // namespace
3 changes: 2 additions & 1 deletion Source/Core/Common/Src/ColorUtil.h
View file
Expand Up @@ -8,7 +8,8 @@
namespace ColorUtil
{

u32 Decode5A3(u16 val);
void decode5A3image(u32* dst, u16* src, int width, int height);
void decodeCI8image(u32* dst, u8* src, u16* pal, int width, int height);

} // namespace

Expand Down
53 changes: 8 additions & 45 deletions Source/Core/Core/Src/HW/GCMemcard.cpp
View file
Expand Up @@ -11,43 +11,6 @@ static void ByteSwap(u8 *valueA, u8 *valueB)
*valueB = tmp;
}

void decode5A3image(u32* dst, u16* src, int width, int height)
{
for (int y = 0; y < height; y += 4)
{
for (int x = 0; x < width; x += 4)
{
for (int iy = 0; iy < 4; iy++, src += 4)
{
for (int ix = 0; ix < 4; ix++)
{
u32 RGBA = ColorUtil::Decode5A3(Common::swap16(src[ix]));
dst[(y + iy) * width + (x + ix)] = RGBA;
}
}
}
}
}

void decodeCI8image(u32* dst, u8* src, u16* pal, int width, int height)
{
for (int y = 0; y < height; y += 4)
{
for (int x = 0; x < width; x += 8)
{
for (int iy = 0; iy < 4; iy++, src += 8)
{
u32 *tdst = dst+(y+iy)*width+x;
for (int ix = 0; ix < 8; ix++)
{
// huh, this seems wrong. CI8, not 5A3, no?
tdst[ix] = ColorUtil::Decode5A3(Common::swap16(pal[src[ix]]));
}
}
}
}
}

GCMemcard::GCMemcard(const char *filename, bool forceCreation, bool sjis)
: m_valid(false)
, m_fileName(filename)
Expand Down Expand Up @@ -1083,13 +1046,13 @@ bool GCMemcard::ReadBannerRGBA8(u8 index, u32* buffer) const
u8 *pxdata = (u8* )(mc_data_blocks[DataBlock].block + DataOffset);
u16 *paldata = (u16*)(mc_data_blocks[DataBlock].block + DataOffset + pixels);

decodeCI8image(buffer, pxdata, paldata, 96, 32);
ColorUtil::decodeCI8image(buffer, pxdata, paldata, 96, 32);
}
else
{
u16 *pxdata = (u16*)(mc_data_blocks[DataBlock].block + DataOffset);

decode5A3image(buffer, pxdata, 96, 32);
ColorUtil::decode5A3image(buffer, pxdata, 96, 32);
}
return true;
}
Expand Down Expand Up @@ -1185,16 +1148,16 @@ u32 GCMemcard::ReadAnimRGBA8(u8 index, u32* buffer, u8 *delays) const
switch (fmts[i])
{
case CI8SHARED: // CI8 with shared palette
decodeCI8image(buffer,data[i],sharedPal,32,32);
ColorUtil::decodeCI8image(buffer,data[i],sharedPal,32,32);
buffer += 32*32;
break;
case RGB5A3: // RGB5A3
decode5A3image(buffer, (u16*)(data[i]), 32, 32);
ColorUtil::decode5A3image(buffer, (u16*)(data[i]), 32, 32);
buffer += 32*32;
break;
case CI8: // CI8 with own palette
u16 *paldata = (u16*)(data[i] + 32*32);
decodeCI8image(buffer, data[i], paldata, 32, 32);
ColorUtil::decodeCI8image(buffer, data[i], paldata, 32, 32);
buffer += 32*32;
break;
}
Expand All @@ -1211,15 +1174,15 @@ u32 GCMemcard::ReadAnimRGBA8(u8 index, u32* buffer, u8 *delays) const
switch (fmts[j])
{
case CI8SHARED: // CI8 with shared palette
decodeCI8image(buffer,data[j],sharedPal,32,32);
ColorUtil::decodeCI8image(buffer,data[j],sharedPal,32,32);
break;
case RGB5A3: // RGB5A3
decode5A3image(buffer, (u16*)(data[j]), 32, 32);
ColorUtil::decode5A3image(buffer, (u16*)(data[j]), 32, 32);
buffer += 32*32;
break;
case CI8: // CI8 with own palette
u16 *paldata = (u16*)(data[j] + 32*32);
decodeCI8image(buffer, data[j], paldata, 32, 32);
ColorUtil::decodeCI8image(buffer, data[j], paldata, 32, 32);
buffer += 32*32;
break;
}
Expand Down
21 changes: 1 addition & 20 deletions Source/Core/DiscIO/Src/BannerLoaderGC.cpp
View file
Expand Up @@ -55,7 +55,7 @@ std::vector<u32> CBannerLoaderGC::GetBanner(int* pWidth, int* pHeight)
std::vector<u32> Buffer;
Buffer.resize(DVD_BANNER_WIDTH * DVD_BANNER_HEIGHT);
auto const pBanner = (DVDBanner*)m_pBannerFile;
decode5A3image(&Buffer[0], pBanner->image, DVD_BANNER_WIDTH, DVD_BANNER_HEIGHT);
ColorUtil::decode5A3image(&Buffer[0], pBanner->image, DVD_BANNER_WIDTH, DVD_BANNER_HEIGHT);
*pWidth = DVD_BANNER_WIDTH;
*pHeight = DVD_BANNER_HEIGHT;
return Buffer;
Expand Down Expand Up @@ -163,25 +163,6 @@ std::vector<std::string> CBannerLoaderGC::GetDescriptions()
return descriptions;
}


void CBannerLoaderGC::decode5A3image(u32* dst, u16* src, int width, int height)
{
for (int y = 0; y < height; y += 4)
{
for (int x = 0; x < width; x += 4)
{
for (int iy = 0; iy < 4; iy++, src += 4)
{
for (int ix = 0; ix < 4; ix++)
{
u32 RGBA = ColorUtil::Decode5A3(Common::swap16(src[ix]));
dst[(y + iy) * width + (x + ix)] = RGBA;
}
}
}
}
}

CBannerLoaderGC::BANNER_TYPE CBannerLoaderGC::getBannerType()
{
u32 bannerSignature = *(u32*)m_pBannerFile;
Expand Down
3 changes: 1 addition & 2 deletions Source/Core/DiscIO/Src/BannerLoaderGC.h
View file
Expand Up @@ -75,9 +75,8 @@ class CBannerLoaderGC
bool m_IsValid;
BANNER_TYPE m_BNRType;

void decode5A3image(u32* dst, u16* src, int width, int height);
BANNER_TYPE getBannerType();

DiscIO::IVolume::ECountry const m_country;
};

Expand Down
20 changes: 1 addition & 19 deletions Source/Core/DiscIO/Src/BannerLoaderWii.cpp
View file
Expand Up @@ -103,7 +103,7 @@ std::vector<u32> CBannerLoaderWii::GetBanner(int* pWidth, int* pHeight)
SWiiBanner* pBanner = (SWiiBanner*)m_pBannerFile;
std::vector<u32> Buffer;
Buffer.resize(192 * 64);
decode5A3image(&Buffer[0], (u16*)pBanner->m_BannerTexture, 192, 64);
ColorUtil::decode5A3image(&Buffer[0], (u16*)pBanner->m_BannerTexture, 192, 64);
*pWidth = 192;
*pHeight = 64;
return Buffer;
Expand Down Expand Up @@ -153,22 +153,4 @@ std::vector<std::string> CBannerLoaderWii::GetDescriptions()
return result;
}

void CBannerLoaderWii::decode5A3image(u32* dst, u16* src, int width, int height)
{
for (int y = 0; y < height; y += 4)
{
for (int x = 0; x < width; x += 4)
{
for (int iy = 0; iy < 4; iy++, src += 4)
{
for (int ix = 0; ix < 4; ix++)
{
u32 RGBA = ColorUtil::Decode5A3(Common::swap16(src[ix]));
dst[(y + iy) * width + (x + ix)] = RGBA;
}
}
}
}
}

} // namespace
2 changes: 0 additions & 2 deletions Source/Core/DiscIO/Src/BannerLoaderWii.h
View file
Expand Up @@ -59,8 +59,6 @@ class CBannerLoaderWii

bool m_IsValid;

void decode5A3image(u32* dst, u16* src, int width, int height);

bool GetStringFromComments(const CommentIndex index, std::string& s);
};
} // namespace
Expand Down

0 comments on commit 1ec4894

Please sign in to comment.