piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-15 05:47:56 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Better tlut hash for fixing MPs font. Didn't notice any slowdown for now.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1402 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
memberTwo.mb2 2008-12-04 22:55:17 +00:00
parent 83e4bd2e5f
commit bc3a7bdce3
3 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,6 +62,15 @@ int TexDecoder_GetTextureSizeInBytes(int width, int height, int format)
return (width * height * TexDecoder_GetTexelSizeInNibbles(format)) / 2;
}
u32 TexDecoder_GetTlutHash(const u16 *src, int len)
{
u32 hash = 0xbeefbabe;
for (int i = 0; i < len / 2; i += 2) {
hash = _rotl(hash, 17) ^ ((u32 *)src)[i];
}
return hash;
}
u32 TexDecoder_GetSafeTextureHash(const u8 *src, int width, int height, int texformat, u32 seed)
{
int sz = TexDecoder_GetTextureSizeInBytes(width, height, texformat);

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

@ -77,8 +77,8 @@ enum PC_TexFormat
PC_TexFormat TexDecoder_Decode(u8 *dst, const u8 *src, int width, int height, int texformat, int tlutaddr, int tlutfmt);
//u32 TexDecoder_GetSafeTextureHash(const u8 *src, int width, int height, int texformat);
u32 TexDecoder_GetSafeTextureHash(const u8 *src, int width, int height, int texformat, u32 seed=0);
u32 TexDecoder_GetTlutHash(const u16 *src, int len);
void TexDecoder_SetTexFmtOverlayOptions(bool enable, bool center);

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

@ -203,12 +203,22 @@ TextureMngr::TCacheEntry* TextureMngr::Load(int texstage, u32 address, int width
TexMode0 &tm0 = bpmem.tex[texstage > 3].texMode0[texstage & 3];
u8 *ptr = g_VideoInitialize.pGetMemoryPointer(address);
// not very robust but this is a fast fix for MPs font issue.
// GX_TF_C4, GX_TF_C8, GX_TF_C14X2 use tlutaddr.
// So the other cases could be needed later.
u32 hashseed = format!=GX_TF_C4 ? 0 : *(u32*)(u16*)(texMem + tlutaddr);
// Needed for texture format using tlut.
// TODO: Slower == Safer. Recalculate tlut lenght for each cases just to be sure.
u32 hashseed = 0;
switch (format) {
case GX_TF_C4:
hashseed = TexDecoder_GetTlutHash((u16*)(texMem + tlutaddr), 128);
break;
case GX_TF_C8:
hashseed = TexDecoder_GetTlutHash((u16*)(texMem + tlutaddr), 256);
break;
case GX_TF_C14X2:
hashseed = TexDecoder_GetTlutHash((u16*)(texMem + tlutaddr), 384);
break;
}
int palSize = TexDecoder_GetPaletteSize(format);
int palSize = TexDecoder_GetPaletteSize(format);
u32 palhash = 0xc0debabe;
if (palSize) {