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

D3d: safeTextureCache fix. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4250 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
rice1964 2009-09-11 05:05:00 +00:00
parent f0d1278eff
commit f46aab0d3f
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,7 +108,6 @@ TextureCache::TCacheEntry *TextureCache::Load(int stage, u32 address, int width,
if (address == 0) if (address == 0)
return NULL; return NULL;
TexCache::iterator iter = textures.find(address);
u8 *ptr = g_VideoInitialize.pGetMemoryPointer(address); u8 *ptr = g_VideoInitialize.pGetMemoryPointer(address);
@ -137,17 +136,21 @@ TextureCache::TCacheEntry *TextureCache::Load(int stage, u32 address, int width,
int expandedWidth = (width+bs) & (~bs); int expandedWidth = (width+bs) & (~bs);
u32 hash_value = TexDecoder_GetSafeTextureHash(ptr, expandedWidth, height, format, 0); u32 hash_value = TexDecoder_GetSafeTextureHash(ptr, expandedWidth, height, format, 0);
u32 tex_hash = 0; u32 tex_hash = 0;
u32 texID = address;
if (g_Config.bDumpTextures) if (g_Config.bDumpTextures || g_Config.bSafeTextureCache)
{ {
tex_hash = hash_value; tex_hash = hash_value;
if ((format == GX_TF_C4) || (format == GX_TF_C8) || (format == GX_TF_C14X2)) if ((format == GX_TF_C4) || (format == GX_TF_C8) || (format == GX_TF_C14X2))
{ {
u32 tlutHash = TexDecoder_GetTlutHash(&texMem[tlutaddr], (format == GX_TF_C4) ? 32 : 128); u32 tlutHash = TexDecoder_GetTlutHash(&texMem[tlutaddr], (format == GX_TF_C4) ? 32 : 128);
tex_hash ^= tlutHash; tex_hash ^= tlutHash;
if (g_Config.bSafeTextureCache)
texID ^= tlutHash;
} }
} }
TexCache::iterator iter = textures.find(texID);
if (iter != textures.end()) if (iter != textures.end())
{ {
TCacheEntry &entry = iter->second; TCacheEntry &entry = iter->second;
@ -210,7 +213,7 @@ TextureCache::TCacheEntry *TextureCache::Load(int stage, u32 address, int width,
} }
//Make an entry in the table //Make an entry in the table
TCacheEntry& entry = textures[address]; TCacheEntry& entry = textures[texID];
entry.hashoffset = 0; entry.hashoffset = 0;
entry.hash = hash_value; entry.hash = hash_value;