The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-16 12:58:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

New compact texture type for OGL/D3D: RGB565

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2225 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
XTra.KrazzY
2009-02-12 22:32:33 +00:00
parent 57c4620902
commit e557e090dd
5 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -436,14 +436,17 @@ PC_TexFormat TexDecoder_Decode(u8 *dst, const u8 *src, int width, int height, in
} }
return PC_TEX_FMT_BGRA32; return PC_TEX_FMT_BGRA32;
case GX_TF_RGB565: case GX_TF_RGB565:
{ {
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) {
//decodebytesRGB565((u32*)dst+(y+iy)*width+x, (u16*)src, 4); u16 *ptr = (u16 *)dst+(y+iy)*width+x;
decodebytesRGB565((u32*)dst+(y+iy)*width+x, (u16*)src); u16 *s = (u16 *)src;
} for(int j = 0; j < 4; j++)
return PC_TEX_FMT_BGRA32; *ptr++ = Common::swap16(*s++);
}
}
return PC_TEX_FMT_RGB565;
case GX_TF_RGB5A3: case GX_TF_RGB5A3:
{ {
for (int y = 0; y < height; y += 4) for (int y = 0; y < height; y += 4)

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

@ -74,6 +74,7 @@ enum PC_TexFormat
PC_TEX_FMT_NONE = 0, PC_TEX_FMT_NONE = 0,
PC_TEX_FMT_BGRA32, PC_TEX_FMT_BGRA32,
PC_TEX_FMT_I8, PC_TEX_FMT_I8,
PC_TEX_FMT_RGB565,
}; };
PC_TexFormat TexDecoder_Decode(u8 *dst, const u8 *src, int width, int height, int texformat, int tlutaddr, int tlutfmt); PC_TexFormat TexDecoder_Decode(u8 *dst, const u8 *src, int width, int height, int texformat, int tlutaddr, int tlutfmt);

11
Source/Plugins/Plugin_VideoDX9/Src/D3DTexture.cpp
View File

@ -58,6 +58,17 @@ LPDIRECT3DTEXTURE9 CreateTexture2D(const u8* buffer, const int width, const int
} }
} }
break; break;
case D3DFMT_R5G6B5:
{
const u16 *pIn = (u16*)buffer;
for (int y = 0; y < height; y++)
{
u16* pBits = (u16*)((u8*)Lock.pBits + (y * Lock.Pitch));
memcpy(pBits, pIn, width * 2);
pIn += pitch;
}
}
break;
case D3DFMT_A8L8: case D3DFMT_A8L8:
{ {
const u8 *pIn = buffer; const u8 *pIn = buffer;

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

@ -176,9 +176,9 @@ void TextureCache::Load(int stage, u32 address, int width, int height, int forma
case PC_TEX_FMT_BGRA32: case PC_TEX_FMT_BGRA32:
d3d_fmt = D3DFMT_A8R8G8B8; d3d_fmt = D3DFMT_A8R8G8B8;
break; break;
/*case PC_TEX_FMT_BGRA16: is this of any use? case PC_TEX_FMT_RGB565:
d3d_fmt = D3DFMT_A4R4G4B4; d3d_fmt = D3DFMT_R5G6B5;
break;*/ break;
case PC_TEX_FMT_I8: case PC_TEX_FMT_I8:
d3d_fmt = D3DFMT_A8L8; d3d_fmt = D3DFMT_A8L8;
break; break;

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

@ -358,6 +358,11 @@ TextureMngr::TCacheEntry* TextureMngr::Load(int texstage, u32 address, int width
gl_iformat = GL_INTENSITY; gl_iformat = GL_INTENSITY;
gl_type = GL_UNSIGNED_BYTE; gl_type = GL_UNSIGNED_BYTE;
break; break;
case PC_TEX_FMT_RGB565:
gl_format = GL_RGB;
gl_iformat = GL_RGB;
gl_type = GL_UNSIGNED_SHORT_5_6_5;
break;
} }
if (!entry.isNonPow2 && ((tm0.min_filter & 3) == 1 || (tm0.min_filter & 3) == 2)) { if (!entry.isNonPow2 && ((tm0.min_filter & 3) == 1 || (tm0.min_filter & 3) == 2)) {
glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE); glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);