MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-04 10:03:36 +00:00
Code Issues Projects Releases Wiki Activity

Correct checksum calculation for CI textures.

Browse Source 
Fixed Mischief Makers incorrect textures #1175
This commit is contained in:
Sergey Lipskiy 2016-10-15 12:52:34 +07:00
parent bce335fc4f
commit 354327b3f9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Textures.cpp
View File

@ -615,7 +615,8 @@ void _calcTileSizes(u32 _t, TileSizes & _sizes, gDPTile * _pLoadTile)
u32 maskHeight = 1 << pTile->maskt; u32 maskHeight = 1 << pTile->maskt;
u32 width, height; u32 width, height;
gDPLoadTileInfo &info = gDP.loadInfo[pTile->tmem]; const u32 tMemMask = gDP.otherMode.textureLUT == G_TT_NONE ? 0x1FF : 0xFF;
gDPLoadTileInfo &info = gDP.loadInfo[pTile->tmem & tMemMask];
_sizes.bytes = info.bytes; _sizes.bytes = info.bytes;
if (info.loadType == LOADTYPE_TILE) { if (info.loadType == LOADTYPE_TILE) {
if (pTile->masks && ((maskWidth * maskHeight) <= maxTexels)) if (pTile->masks && ((maskWidth * maskHeight) <= maxTexels))
@ -1176,7 +1177,8 @@ u32 _calculateCRC(u32 _t, const TextureParams & _params, u32 _bytes)
const u32 lineBytes = gSP.textureTile[_t]->line << 3; const u32 lineBytes = gSP.textureTile[_t]->line << 3;
_bytes = _params.height*lineBytes; _bytes = _params.height*lineBytes;
} }
const u64 *src = (u64*)&TMEM[gSP.textureTile[_t]->tmem]; const u32 tMemMask = gDP.otherMode.textureLUT == G_TT_NONE ? 0x1FF : 0xFF;
const u64 *src = (u64*)&TMEM[gSP.textureTile[_t]->tmem & tMemMask];
u32 crc = 0xFFFFFFFF; u32 crc = 0xFFFFFFFF;
crc = CRC_Calculate(crc, src, _bytes); crc = CRC_Calculate(crc, src, _bytes);