ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TextureDecoder now indicates I4 and IA4 texture formats. It also decodes paletted textures more efficiently. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3213 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Nolan Check 2009-05-13 02:06:02 +00:00
parent 7c75b01dbf
commit dcad8a779d
4 changed files with 102 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -185,82 +185,71 @@ struct DXTBlock
}; };
//inline void decodebytesC4(u32 *dst, const u8 *src, int numbytes, int tlutaddr, int tlutfmt) //inline void decodebytesC4(u32 *dst, const u8 *src, int numbytes, int tlutaddr, int tlutfmt)
inline void decodebytesC4(u32 *dst, const u8 *src, int tlutaddr, int tlutfmt) inline void decodebytesC4_5A3_To_BGRA32(u32 *dst, const u8 *src, int tlutaddr)
{ {
u16 *tlut = (u16*)(texMem + tlutaddr); u16 *tlut = (u16*)(texMem + tlutaddr);
for (int x = 0; x < 4; x++) for (int x = 0; x < 4; x++)
{ {
int val = src[x]; u8 val = src[x];
switch (tlutfmt) { *dst++ = decode5A3(Common::swap16(tlut[val >> 4]));
case 0: *dst++ = decode5A3(Common::swap16(tlut[val & 0xF]));
*dst++ = decodeIA8(Common::swap16(tlut[val >> 4]));
*dst++ = decodeIA8(Common::swap16(tlut[val & 15]));
break;
case 1:
*dst++ = decode565(Common::swap16(tlut[val >> 4]));
*dst++ = decode565(Common::swap16(tlut[val & 15]));
break;
case 2:
*dst++ = decode5A3(Common::swap16(tlut[val >> 4]));
*dst++ = decode5A3(Common::swap16(tlut[val & 15]));
break;
case 3: //ERROR
*dst++ = 0xFFFF00FF;
*dst++ = 0xFFFF00FF;
break;
}
} }
} }
inline void decodebytesC4_To_Raw16(u16* dst, const u8* src, int tlutaddr)
{
u16* tlut = (u16*)(texMem+tlutaddr);
for (int x = 0; x < 4; x++)
{
u8 val = src[x];
*dst++ = Common::swap16(tlut[val >> 4]);
*dst++ = Common::swap16(tlut[val & 0xF]);
}
}
//inline void decodebytesC8(u32 *dst, const u8 *src, int numbytes, int tlutaddr, int tlutfmt) //inline void decodebytesC8(u32 *dst, const u8 *src, int numbytes, int tlutaddr, int tlutfmt)
inline void decodebytesC8(u32 *dst, const u8 *src, int tlutaddr, int tlutfmt) inline void decodebytesC8_5A3_To_BGRA32(u32 *dst, const u8 *src, int tlutaddr)
{ {
u16 *tlut = (u16*)(texMem+tlutaddr); u16 *tlut = (u16*)(texMem+tlutaddr);
for (int x = 0; x < 8; x++) for (int x = 0; x < 8; x++)
{ {
int val = src[x]; u8 val = src[x];
switch (tlutfmt) { *dst++ = decode5A3(Common::swap16(tlut[val]));
case 0:
*dst++ = decodeIA8(Common::swap16(tlut[val]));
break;
case 1:
*dst++ = decode565(Common::swap16(tlut[val]));
break;
case 2:
*dst++ = decode5A3(Common::swap16(tlut[val]));
break;
case 3: //ERROR
*dst++ = 0xFFFF00FF;
break;
}
} }
} }
inline void decodebytesC8_To_Raw16(u16* dst, const u8* src, int tlutaddr)
{
u16* tlut = (u16*)(texMem+tlutaddr);
for (int x = 0; x < 8; x++)
{
u8 val = src[x];
*dst++ = Common::swap16(tlut[val]);
}
}
//inline void decodebytesC14X2(u32 *dst, const u16 *src, int numpixels, int tlutaddr, int tlutfmt) //inline void decodebytesC14X2(u32 *dst, const u16 *src, int numpixels, int tlutaddr, int tlutfmt)
inline void decodebytesC14X2(u32 *dst, const u16 *src, int tlutaddr, int tlutfmt) inline void decodebytesC14X2_5A3_To_BGRA32(u32 *dst, const u16 *src, int tlutaddr)
{ {
u16 *tlut = (u16*)(texMem+tlutaddr); u16 *tlut = (u16*)(texMem+tlutaddr);
for (int x = 0; x < 4; x++) for (int x = 0; x < 4; x++)
{ {
int val = Common::swap16(src[x]); u16 val = Common::swap16(src[x]);
switch (tlutfmt) { *dst++ = decode5A3(Common::swap16(tlut[(val&0x3FFF)]));
case 0:
*dst++ = decodeIA8(Common::swap16(tlut[(val&0x3FFF)]));
break;
case 1:
*dst++ = decode565(Common::swap16(tlut[(val&0x3FFF)]));
break;
case 2:
*dst++ = decode5A3(Common::swap16(tlut[(val&0x3FFF)]));
break;
case 3: //ERROR
*dst++ = 0xFFFF00FF;
break;
}
} }
} }
inline void decodebytesC14X2_To_Raw16(u16* dst, const u16* src, int tlutaddr)
{
u16* tlut = (u16*)(texMem+tlutaddr);
for (int x = 0; x < 4; x++)
{
u16 val = Common::swap16(src[x]);
*dst++ = Common::swap16(tlut[(val&0x3FFF)]);
}
}
//inline void decodebytesIA4(u16 *dst, const u8 *src, int numbytes) //inline void decodebytesIA4(u16 *dst, const u8 *src, int numbytes)
inline void decodebytesIA4(u16 *dst, const u8 *src) inline void decodebytesIA4(u16 *dst, const u8 *src)
{ {
@ -355,6 +344,18 @@ static void copyDXTBlock(u8* dst, const u8* src)
((u32*)dst)[1] = pixels; ((u32*)dst)[1] = pixels;
} }
static PC_TexFormat GetPCFormatFromTLUTFormat(int tlutfmt)
{
switch (tlutfmt)
{
case 0: return PC_TEX_FMT_IA8; // IA8
case 1: return PC_TEX_FMT_RGB565; // RGB565
case 2: return PC_TEX_FMT_BGRA32; // RGB5A3: This TLUT format requires
// extra work to decode.
}
return PC_TEX_FMT_NONE; // Error
}
//switch endianness, unswizzle //switch endianness, unswizzle
//TODO: to save memory, don't blindly convert everything to argb8888 //TODO: to save memory, don't blindly convert everything to argb8888
@ -365,14 +366,22 @@ PC_TexFormat TexDecoder_Decode_real(u8 *dst, const u8 *src, int width, int heigh
switch (texformat) switch (texformat)
{ {
case GX_TF_C4: case GX_TF_C4:
if (tlutfmt == 2)
{ {
// Special decoding is required for TLUT format 5A3
for (int y = 0; y < height; y += 8) for (int y = 0; y < height; y += 8)
for (int x = 0; x < width; x += 8) for (int x = 0; x < width; x += 8)
for (int iy = 0; iy < 8; iy++, src += 4) for (int iy = 0; iy < 8; iy++, src += 4)
//decodebytesC4((u32*)dst+(y+iy)*width+x, src, 4, tlutaddr, tlutfmt); decodebytesC4_5A3_To_BGRA32((u32*)dst+(y+iy)*width+x, src, tlutaddr);
decodebytesC4((u32*)dst+(y+iy)*width+x, src, tlutaddr, tlutfmt);
} }
return PC_TEX_FMT_BGRA32; else
{
for (int y = 0; y < height; y += 8)
for (int x = 0; x < width; x += 8)
for (int iy = 0; iy < 8; iy++, src += 4)
decodebytesC4_To_Raw16((u16*)dst+(y+iy)*width+x, src, tlutaddr);
}
return GetPCFormatFromTLUTFormat(tlutfmt);
case GX_TF_I4: case GX_TF_I4:
{ {
for (int y = 0; y < height; y += 8) for (int y = 0; y < height; y += 8)
@ -385,7 +394,7 @@ PC_TexFormat TexDecoder_Decode_real(u8 *dst, const u8 *src, int width, int heigh
dst[(y+iy)*width+x+ix*2+1] = lut4to8[val&15]; dst[(y+iy)*width+x+ix*2+1] = lut4to8[val&15];
} }
} }
return PC_TEX_FMT_I8; return PC_TEX_FMT_I4_AS_I8;
case GX_TF_I8: // speed critical case GX_TF_I8: // speed critical
{ {
for (int y = 0; y < height; y += 4) for (int y = 0; y < height; y += 4)
@ -395,14 +404,22 @@ PC_TexFormat TexDecoder_Decode_real(u8 *dst, const u8 *src, int width, int heigh
} }
return PC_TEX_FMT_I8; return PC_TEX_FMT_I8;
case GX_TF_C8: case GX_TF_C8:
if (tlutfmt == 2)
{ {
// Special decoding is required for TLUT format 5A3
for (int y = 0; y < height; y += 4) for (int y = 0; y < height; y += 4)
for (int x = 0; x < width; x += 8) for (int x = 0; x < width; x += 8)
for (int iy = 0; iy < 4; iy++, src += 8) for (int iy = 0; iy < 4; iy++, src += 8)
//decodebytesC8((u32*)dst+(y+iy)*width+x, src, 8, tlutaddr, tlutfmt); decodebytesC8_5A3_To_BGRA32((u32*)dst+(y+iy)*width+x, src, tlutaddr);
decodebytesC8((u32*)dst+(y+iy)*width+x, src, tlutaddr, tlutfmt);
} }
return PC_TEX_FMT_BGRA32; else
{
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)
decodebytesC8_To_Raw16((u16*)dst+(y+iy)*width+x, src, tlutaddr);
}
return GetPCFormatFromTLUTFormat(tlutfmt);
case GX_TF_IA4: case GX_TF_IA4:
{ {
for (int y = 0; y < height; y += 4) for (int y = 0; y < height; y += 4)
@ -412,7 +429,7 @@ PC_TexFormat TexDecoder_Decode_real(u8 *dst, const u8 *src, int width, int heigh
decodebytesIA4((u16*)dst+(y+iy)*width+x, src); decodebytesIA4((u16*)dst+(y+iy)*width+x, src);
} }
} }
return PC_TEX_FMT_IA8; return PC_TEX_FMT_IA4_AS_IA8;
case GX_TF_IA8: case GX_TF_IA8:
{ {
for (int y = 0; y < height; y += 4) for (int y = 0; y < height; y += 4)
@ -427,14 +444,22 @@ PC_TexFormat TexDecoder_Decode_real(u8 *dst, const u8 *src, int width, int heigh
} }
return PC_TEX_FMT_IA8; return PC_TEX_FMT_IA8;
case GX_TF_C14X2: case GX_TF_C14X2:
if (tlutfmt == 2)
{ {
// Special decoding is required for TLUT format 5A3
for (int y = 0; y < height; y += 4) for (int y = 0; y < height; y += 4)
for (int x = 0; x < width; x += 4) for (int x = 0; x < width; x += 4)
for (int iy = 0; iy < 4; iy++, src += 8) for (int iy = 0; iy < 4; iy++, src += 8)
//decodebytesC14X2((u32*)dst+(y+iy)*width+x, (u16*)src, 4, tlutaddr, tlutfmt); decodebytesC14X2_5A3_To_BGRA32((u32*)dst+(y+iy)*width+x, (u16*)src, tlutaddr);
decodebytesC14X2((u32*)dst+(y+iy)*width+x, (u16*)src, tlutaddr, tlutfmt);
} }
return PC_TEX_FMT_BGRA32; else
{
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)
decodebytesC14X2_To_Raw16((u16*)dst+(y+iy)*width+x, (u16*)src, tlutaddr);
}
return GetPCFormatFromTLUTFormat(tlutfmt);
case GX_TF_RGB565: case GX_TF_RGB565:
{ {
for (int y = 0; y < height; y += 4) for (int y = 0; y < height; y += 4)
@ -565,7 +590,7 @@ PC_TexFormat TexDecoder_Decode(u8 *dst, const u8 *src, int width, int height, in
break; break;
} }
case PC_TEX_FMT_IA8: case PC_TEX_FMT_IA8:
case PC_TEX_FMT_IA4: case PC_TEX_FMT_IA4_AS_IA8:
{ {
u16 *dtp = (u16*)dst; u16 *dtp = (u16*)dst;
dtp[(y+yoff)*width + x+xoff] = ptr[x]?0xFFFF:0xFF00; dtp[(y+yoff)*width + x+xoff] = ptr[x]?0xFFFF:0xFF00;

3
Source/Core/VideoCommon/Src/TextureDecoder.h
View File

@ -75,7 +75,8 @@ enum PC_TexFormat
PC_TEX_FMT_NONE = 0, PC_TEX_FMT_NONE = 0,
PC_TEX_FMT_BGRA32, PC_TEX_FMT_BGRA32,
PC_TEX_FMT_RGBA32, PC_TEX_FMT_RGBA32,
PC_TEX_FMT_IA4, PC_TEX_FMT_I4_AS_I8,
PC_TEX_FMT_IA4_AS_IA8,
PC_TEX_FMT_I8, PC_TEX_FMT_I8,
PC_TEX_FMT_IA8, PC_TEX_FMT_IA8,
PC_TEX_FMT_RGB565, PC_TEX_FMT_RGB565,

2
Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp
View File

@ -179,7 +179,7 @@ TextureCache::TCacheEntry *TextureCache::Load(int stage, u32 address, int width,
case PC_TEX_FMT_RGB565: case PC_TEX_FMT_RGB565:
d3d_fmt = D3DFMT_R5G6B5; d3d_fmt = D3DFMT_R5G6B5;
break; break;
case PC_TEX_FMT_IA4: case PC_TEX_FMT_IA4_AS_IA8:
d3d_fmt = D3DFMT_A4L4; d3d_fmt = D3DFMT_A4L4;
break; break;
case PC_TEX_FMT_I8: case PC_TEX_FMT_I8:

10
Source/Plugins/Plugin_VideoOGL/Src/TextureMngr.cpp
View File

@ -422,6 +422,16 @@ TextureMngr::TCacheEntry* TextureMngr::Load(int texstage, u32 address, int width
gl_iformat = 4; gl_iformat = 4;
gl_type = GL_UNSIGNED_BYTE; gl_type = GL_UNSIGNED_BYTE;
break; break;
case PC_TEX_FMT_I4_AS_I8:
gl_format = GL_LUMINANCE;
gl_iformat = GL_INTENSITY4;
gl_type = GL_UNSIGNED_BYTE;
break;
case PC_TEX_FMT_IA4_AS_IA8:
gl_format = GL_LUMINANCE_ALPHA;
gl_iformat = GL_LUMINANCE4_ALPHA4;
gl_type = GL_UNSIGNED_BYTE;
break;
case PC_TEX_FMT_I8: case PC_TEX_FMT_I8:
gl_format = GL_LUMINANCE; gl_format = GL_LUMINANCE;
gl_iformat = GL_INTENSITY; gl_iformat = GL_INTENSITY;