MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-06-30 08:24:05 +00:00
Code Issues Projects Releases Wiki Activity

Fix crash in Mario Tennis, caused by wrong tile size calculation.

Browse Source 
Regressions in S2DEX games are possible, but not found yet.
Also make sure that size of mip-map tile is not greater than possible.
This commit is contained in:
Sergey Lipskiy 2021-12-18 23:46:47 +07:00
parent 223a6b757b
commit 2c8533661b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Textures.cpp
View File

@ -637,8 +637,9 @@ void _calcTileSizes(u32 _t, TileSizes & _sizes, gDPTile * _pLoadTile)
// 32 bit texture loaded into lower and upper half of TMEM, thus actual bytes doubled.
info.bytes *= 2;
}
gDP.loadTile->loadWidth = gDP.loadTile->loadHeight = 0;
}
gDP.loadTile->loadWidth = gDP.loadTile->loadHeight = 0;
_sizes.bytes = info.bytes;
if (tileWidth == 1 && tileHeight == 1 &&
@ -1447,8 +1448,8 @@ void TextureCache::_loadAccurate(u32 _tile, CachedTexture *_pTexture)
tmptex.size = mipTile.size;
TileSizes sizes;
_calcTileSizes(tileMipLevel, sizes, nullptr);
tmptex.width = sizes.width;
tmptex.height = sizes.height;
tmptex.width = std::min(tmptex.width, static_cast<u16>(sizes.width));
tmptex.height = std::min(tmptex.height, static_cast<u16>(sizes.height));
tmptex.clampWidth = sizes.clampWidth;
tmptex.clampHeight = sizes.clampHeight;
_pTexture->textureBytes += (tmptex.width * tmptex.height) << sizeShift;