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

gpu: clean up use of scroll registers to make sure that the correct &0x1FF is done everywhere

This commit is contained in:
zeromus 2009-11-23 00:53:46 +00:00
parent e5f90aaaa9
commit f9e8e9c862
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
desmume/src/GPU.cpp
View File

@ -868,10 +868,9 @@ template<bool MOSAIC> void lineLarge8bpp(GPU * gpu)
return; return;
} }
BGxOFS * ofs = &gpu->dispx_st->dispx_BGxOFS[gpu->currBgNum];
u8 num = gpu->currBgNum; u8 num = gpu->currBgNum;
u16 XBG = T1ReadWord((u8 *)&ofs->BGxHOFS, 0); u16 XBG = gpu->getHOFS(gpu->currBgNum);
u16 YBG = gpu->currLine + T1ReadWord((u8 *)&ofs->BGxVOFS, 0); u16 YBG = gpu->currLine + gpu->getVOFS(gpu->currBgNum);
u16 lg = gpu->BGSize[num][0]; u16 lg = gpu->BGSize[num][0];
u16 ht = gpu->BGSize[num][1]; u16 ht = gpu->BGSize[num][1];
u16 wmask = (lg-1); u16 wmask = (lg-1);
@ -1214,10 +1213,6 @@ static void lineNull(GPU * gpu)
template<bool MOSAIC> void lineText(GPU * gpu) template<bool MOSAIC> void lineText(GPU * gpu)
{ {
BGxOFS * ofs = &gpu->dispx_st->dispx_BGxOFS[gpu->currBgNum];
if(gpu->debug) if(gpu->debug)
{ {
const s32 wh = gpu->BGSize[gpu->currBgNum][0]; const s32 wh = gpu->BGSize[gpu->currBgNum][0];
@ -1225,8 +1220,8 @@ template<bool MOSAIC> void lineText(GPU * gpu)
} }
else else
{ {
const u16 vofs = T1ReadWord((u8 *)&ofs->BGxVOFS,0); const u16 vofs = gpu->getVOFS(gpu->currBgNum);
const u16 hofs = T1ReadWord((u8 *)&ofs->BGxHOFS,0); const u16 hofs = gpu->getHOFS(gpu->currBgNum);
renderline_textBG<MOSAIC>(gpu, hofs, gpu->currLine + vofs, 256); renderline_textBG<MOSAIC>(gpu, hofs, gpu->currLine + vofs, 256);
} }
} }
@ -2115,8 +2110,7 @@ static void GPU_RenderLine_layer(NDS_Screen * screen, u16 l)
{ {
gpu->currBgNum = 0; gpu->currBgNum = 0;
BGxOFS *bgofs = &gpu->dispx_st->dispx_BGxOFS[i16]; const u16 hofs = gpu->getHOFS(i16);
u16 hofs = (T1ReadWord((u8*)&bgofs->BGxHOFS, 0) & 0x1FF);
gfx3d_GetLineData(l, &gpu->_3dColorLine); gfx3d_GetLineData(l, &gpu->_3dColorLine);
u8* colorLine = gpu->_3dColorLine; u8* colorLine = gpu->_3dColorLine;

3
desmume/src/GPU.h
View File

@ -844,6 +844,9 @@ struct GPU
updateBLDALPHA(); updateBLDALPHA();
} }
u32 getHOFS(int bg) { return T1ReadWord(&dispx_st->dispx_BGxOFS[bg].BGxHOFS,0) & 0x1FF; }
u32 getVOFS(int bg) { return T1ReadWord(&dispx_st->dispx_BGxOFS[bg].BGxVOFS,0) & 0x1FF; }
typedef u8 TBlendTable[32][32]; typedef u8 TBlendTable[32][32];
TBlendTable *blendTable; TBlendTable *blendTable;