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

Fix CRC calculation for 32bit textures.

Browse Source
This commit is contained in:
Sergey Lipskiy 2017-12-16 15:14:46 +07:00
parent 4bdc44ce4e
commit 2e53bf19a0
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Textures.cpp
View File

@ -1264,16 +1264,19 @@ struct TextureParams
static static
u32 _calculateCRC(u32 _t, const TextureParams & _params, u32 _bytes) u32 _calculateCRC(u32 _t, const TextureParams & _params, u32 _bytes)
{ {
const bool rgba32 = gSP.textureTile[_t]->size == G_IM_SIZ_32b;
if (_bytes == 0) { if (_bytes == 0) {
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 u32 tMemMask = gDP.otherMode.textureLUT == G_TT_NONE ? 0x1FF : 0xFF; if (rgba32)
_bytes >>= 1;
const u32 tMemMask = (gDP.otherMode.textureLUT == G_TT_NONE && !rgba32) ? 0x1FF : 0xFF;
const u64 *src = (u64*)&TMEM[gSP.textureTile[_t]->tmem & tMemMask]; 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);
if (gSP.textureTile[_t]->size == G_IM_SIZ_32b) { if (rgba32) {
src = (u64*)&TMEM[gSP.textureTile[_t]->tmem + 256]; src = (u64*)&TMEM[gSP.textureTile[_t]->tmem + 256];
crc = CRC_Calculate(crc, src, _bytes); crc = CRC_Calculate(crc, src, _bytes);
} }