ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merged 1591 and 1592

This commit is contained in:
yabause 2009-02-03 21:42:57 +00:00
parent a4687aa20a
commit fdc0777487
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/MMU.cpp
View File

@ -1573,12 +1573,14 @@ static void FASTCALL _MMU_ARM9_write08(u32 adr, u8 val)
{
u32 &disp3dcnt = MainScreen.gpu->dispx_st->dispA_DISP3DCNT.val;
disp3dcnt = (disp3dcnt&0xFF00) | val;
gfx3d_Control(disp3dcnt);
break;
}
case REG_DISPA_DISP3DCNT+1:
{
u32 &disp3dcnt = MainScreen.gpu->dispx_st->dispA_DISP3DCNT.val;
disp3dcnt = (disp3dcnt&0x00FF) | (val<<8);
gfx3d_Control(disp3dcnt);
break;
}
@ -1797,6 +1799,7 @@ static void FASTCALL _MMU_ARM9_write16(u32 adr, u16 val)
case REG_DISPA_DISP3DCNT:
{
MainScreen.gpu->dispx_st->dispA_DISP3DCNT.val = val;
gfx3d_Control(val);
break;
}

6
src/gfx3d.cpp
View File

@ -1854,8 +1854,6 @@ void gfx3d_sendCommandToFIFO(u32 val)
void gfx3d_sendCommand(u32 cmd, u32 param)
{
u32 gxstat = ((u32 *)(MMU.MMU_MEM[ARMCPU_ARM9][0x40]))[0x600>>2];
cmd &= 0x0FFF;
#ifdef _3D_LOG
INFO("GFX FIFO: Send GFX 3D cmd 0x%02X to FIFO (0x%08X) - DIRECT\n", (cmd & 0x1FF)>>2, param);
@ -2071,7 +2069,7 @@ SFORMAT SF_GFX3D[]={
{ "GMTM", 4,16, mtxTemporal},
{ "GMCU", 4,64, mtxCurrent},
{ "GM0P", 4, 1, &mtxStack[0].position},
{ "GM1M", 4,16, mtxStack[0].matrix},
{ "GM0M", 4,16, mtxStack[0].matrix},
{ "GM1P", 4, 1, &mtxStack[1].position},
{ "GM1M", 4,496,mtxStack[1].matrix},
{ "GM2P", 4, 1, &mtxStack[2].position},
@ -2097,7 +2095,7 @@ SFORMAT SF_GFX3D[]={
{ "GLCM", 4, 1, &clCmd},
{ "GLIN", 4, 1, &clInd},
#ifdef USE_GEOMETRY_FIFO_EMULATION
{ "GLIN", 4, 1, &clInd2},
{ "GLI2", 4, 1, &clInd2},
#endif
{ "GLBT", 4, 1, &BTind},
{ "GLPT", 4, 1, &PTind},