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

New compact texture type for OGL/D3D: IA8

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2233 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
XTra.KrazzY
2009-02-13 14:14:45 +00:00
parent a55e672493
commit acb3d1b23d
5 changed files with 61 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Source/Core/VideoCommon/Src/TextureDecoder.cpp
View File

@ -165,7 +165,7 @@ inline u32 decode5A3(u16 val)
g=lut5to8[(val>>5 ) & 0x1f];
b=lut5to8[(val ) & 0x1f];
a=0xFF;
}
}
else
{
a=lut3to8[(val>>12) & 0x7];
@ -274,13 +274,6 @@ inline void decodebytesIA4(u32 *dst, const u8 *src)
}
}
//inline void decodebytesIA8(u32 *dst, const u16 *src, int numpixels)
inline void decodebytesIA8(u32 *dst, const u16 *src)
{
for (int x = 0; x < 4; x++)
dst[x] = decodeIA8(Common::swap16(src[x]));
}
//inline void decodebytesRGB5A3(u32 *dst, const u16 *src, int numpixels)
inline void decodebytesRGB5A3(u32 *dst, const u16 *src)
{
@ -412,13 +405,17 @@ PC_TexFormat TexDecoder_Decode(u8 *dst, const u8 *src, int width, int height, in
return PC_TEX_FMT_BGRA32;
case GX_TF_IA8:
{
for (int y = 0; y < height; y += 4)
for (int x = 0; x < width; x += 4)
for (int iy = 0; iy < 4; iy++, src += 8)
//decodebytesIA8((u32*)dst+(y+iy)*width+x, (u16*)src, 4);
decodebytesIA8((u32*)dst+(y+iy)*width+x, (u16*)src);
for (int y = 0; y < height; y += 4)
for (int x = 0; x < width; x += 4)
for (int iy = 0; iy < 4; iy++, src += 8) {
u16 *ptr = (u16 *)dst+(y+iy)*width+x;
u16 *s = (u16 *)src;
for(int j = 0; j < 4; j++)
*ptr++ = Common::swap16(*s++);
}
}
return PC_TEX_FMT_BGRA32;
return PC_TEX_FMT_IA8;
case GX_TF_C14X2:
{
for (int y = 0; y < height; y += 4)
@ -463,7 +460,7 @@ PC_TexFormat TexDecoder_Decode(u8 *dst, const u8 *src, int width, int height, in
}
return PC_TEX_FMT_BGRA32;
case GX_TF_CMPR: // speed critical
{
{
// TODO: Shuffle to PC S3TC (DXTC) format instead of converting
// 11111111 22222222 55555555 66666666
// 33333333 44444444 77777777 88888888