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

Fixed triple play 2000 wrong gfx in menu regression #1139

Browse Source
This commit is contained in:
Sergey Lipskiy 2016-09-28 17:31:35 +07:00
parent d5412d30e1
commit 2bdec6f412
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/RDP.cpp
View File

@ -231,12 +231,12 @@ void RDP_LoadSync( u32 w0, u32 w1 )
} }
static static
void _getTexRectParams(u32 & w2, u32 & w3) bool _getTexRectParams(u32 & w2, u32 & w3)
{ {
if (RSP.bLLE) { if (RSP.bLLE) {
w2 = RDP.w2; w2 = RDP.w2;
w3 = RDP.w3; w3 = RDP.w3;
return; return true;
} }
enum { enum {
@ -267,11 +267,12 @@ void _getTexRectParams(u32 & w2, u32 & w3)
RSP.PC[RSP.PCi] += 8; RSP.PC[RSP.PCi] += 8;
break; break;
case gdpTexRect: case gdpTexRect:
if ((config.generalEmulation.hacks & hack_WinBack) == 0) { if ((config.generalEmulation.hacks & hack_WinBack) != 0) {
w2 = *(u32*)&RDRAM[RSP.PC[RSP.PCi] + 0]; RSP.PC[RSP.PCi] += 8;
w3 = *(u32*)&RDRAM[RSP.PC[RSP.PCi] + 4]; return false;
} else }
w2 = w3 = 0; w2 = *(u32*)&RDRAM[RSP.PC[RSP.PCi] + 0];
w3 = *(u32*)&RDRAM[RSP.PC[RSP.PCi] + 4];
RSP.PC[RSP.PCi] += 8; RSP.PC[RSP.PCi] += 8;
break; break;
case halfTexRect: case halfTexRect:
@ -282,14 +283,14 @@ void _getTexRectParams(u32 & w2, u32 & w3)
default: default:
assert(false && "Unknown texrect mode"); assert(false && "Unknown texrect mode");
} }
return true;
} }
static static
void _TexRect( u32 w0, u32 w1, bool flip ) void _TexRect( u32 w0, u32 w1, bool flip )
{ {
u32 w2, w3; u32 w2, w3;
_getTexRectParams(w2, w3); if (!_getTexRectParams(w2, w3))
if (w3 == 0)
return; return;
const u32 ulx = _SHIFTR(w1, 12, 12); const u32 ulx = _SHIFTR(w1, 12, 12);
const u32 uly = _SHIFTR(w1, 0, 12); const u32 uly = _SHIFTR(w1, 0, 12);