From dce0019e9a898acadf61afdd86c24a401a84e53c Mon Sep 17 00:00:00 2001 From: Sergey Lipskiy Date: Sat, 20 Dec 2014 22:49:03 +0600 Subject: [PATCH] Correct tile width and height masking. Fix for commit 474398be. Fixed Pokemon Snap: missing/black texture on beach #203 --- Textures.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Textures.cpp b/Textures.cpp index 0fc6dde6..1caee615 100644 --- a/Textures.cpp +++ b/Textures.cpp @@ -537,16 +537,16 @@ void _calcTileSizes(u32 _t, TileSizes & _sizes, gDPTile * _pLoadTile) const TextureLoadParameters & loadParams = imageFormat[gDP.otherMode.textureLUT][pTile->size][pTile->format]; const u32 maxTexels = loadParams.maxTexels; - const u32 tileWidth = (pTile->lrs - pTile->uls + 1) & 0x03FF; - const u32 tileHeight = (pTile->lrt - pTile->ult + 1) & 0x03FF; + const u32 tileWidth = ((pTile->lrs - pTile->uls) & 0x03FF) + 1; + const u32 tileHeight = ((pTile->lrt - pTile->ult) & 0x03FF) + 1; const bool bUseLoadSizes = _pLoadTile != NULL && _pLoadTile->loadType == LOADTYPE_TILE && (pTile->tmem == _pLoadTile->tmem); u32 loadWidth = 0, loadHeight = 0; if (bUseLoadSizes) { - loadWidth = (_pLoadTile->lrs - _pLoadTile->uls + 1) & 0x03FF; - loadHeight = (_pLoadTile->lrt - _pLoadTile->ult + 1) & 0x03FF; + loadWidth = ((_pLoadTile->lrs - _pLoadTile->uls) & 0x03FF) + 1; + loadHeight = ((_pLoadTile->lrt - _pLoadTile->ult) & 0x03FF) + 1; } const u32 lineWidth = pTile->line << loadParams.lineShift;