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

forgot to checkin a file. also, add some little gpu speedups

This commit is contained in:
zeromus 2010-02-01 05:34:43 +00:00
parent a440388cda
commit d042d84840
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
desmume/src/GPU.cpp
View File

@ -1000,8 +1000,9 @@ template<bool MOSAIC> INLINE void renderline_textBG(GPU * gpu, u16 XBG, u16 YBG,
}
yoff = ((YBG&7)<<3);
u8* tilePal;
xfin = 8 - (xoff&7);
u32 extPalMask = -dispCnt->ExBGxPalette_Enable;
for(x = 0; x < LG; xfin = std::min<u16>(x+8, LG))
{
tmp = (xoff & (lg-1))>>3;
@ -1009,6 +1010,8 @@ template<bool MOSAIC> INLINE void renderline_textBG(GPU * gpu, u16 XBG, u16 YBG,
if(tmp > 31) mapinfo += 32*32*2;
tileentry.val = T1ReadWord(MMU_gpu_map(mapinfo), 0);
tilePal = pal + ((tileentry.bits.Palette<<8) & extPalMask);
line = (u8*)MMU_gpu_map(tile + (tileentry.bits.TileNum*0x40) + ((tileentry.bits.VFlip) ? (7*8)-yoff : yoff));
if(tileentry.bits.HFlip)
@ -1021,10 +1024,7 @@ template<bool MOSAIC> INLINE void renderline_textBG(GPU * gpu, u16 XBG, u16 YBG,
}
for(; x < xfin; )
{
if(dispCnt->ExBGxPalette_Enable)
color = T1ReadWord(pal, ((*line) + (tileentry.bits.Palette<<8)) << 1);
else
color = T1ReadWord(pal, (*line) << 1);
color = T1ReadWord(tilePal, (*line) << 1);
gpu->__setFinalColorBck<MOSAIC,false>(color,x,*line);

3
desmume/src/cp15.cpp
View File

@ -447,7 +447,8 @@ BOOL armcp15_moveARM2CP(armcp15_t *armcp15, u32 val, u8 CRn, u8 CRm, u8 opcode1,
{
armcp15->ctrl = val;
MMU.ARM9_RW_MODE = BIT7(val);
armcp15->cpu->intVector = 0x0FFF0000 * (BIT13(val));
//zero 31-jan-2010: change from 0x0FFF0000 to 0xFFFF0000 per gbatek
armcp15->cpu->intVector = 0xFFFF0000 * (BIT13(val));
armcp15->cpu->LDTBit = !BIT15(val); //TBit
/*if(BIT17(val))
{