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

undid the last BG order change (sorry damoum, it was unable to run any nds file withou crashing, and gdb didnt even want to attach to it before desmume closed)

This commit is contained in:
mightymax 2007-01-11 18:46:19 +00:00
parent 540cc064eb
commit f778538093
2 changed files with 56 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
desmume/src/GPU.c
View File

@ -128,10 +128,8 @@ void GPU_resortBGs(GPU *gpu)
{
BOOL LayersEnable[5];
u16 WinBG=0;
u8 i, j, index;
u8 i, q, index;
struct _DISPCNT * cnt = &gpu->dispCnt.bits;
u8 priorities[16] = { 0xFF,0xFF,0xFF,0xFF, 0xFF,0xFF,0xFF,0xFF,
0xFF,0xFF,0xFF,0xFF, 0xFF,0xFF,0xFF,0xFF};
if (cnt->Win0_Enable || cnt->Win1_Enable)
{
@ -146,20 +144,42 @@ u16 WinBG=0;
LayersEnable[3] = gpu->dispBG[3] && (cnt->BG3_Enable || (WinBG & 0x8));
LayersEnable[4] = (cnt->OBJ_Enable || (WinBG & 0x10));
// KISS ! lower priority first, if same then lower num
for (i=0; i<4; i++) {
index = (gpu->bgCnt[i].bits.Priority << 2) | i;
priorities[index] = i;
/* first: place them all unsorted, just as they are */
for (i=0;i<4;i++)
{
gpu->ordre[i] = i ;
}
for (i=0,j=0; i<16; i++) {
if ((index=priorities[i])!=0xFF && LayersEnable[index]) {
gpu->ordre[j]=index;
gpu->BGIndex[index]=j;
j++;
/* sorting BGs by priority, keep same priorities ordered by their num */
/* selection sort*/
for (i=0;i<4;i++)
{
/* weighted priorities: first drawn/not drawm, then set priority bits, then the num */
/* the higher the value the lower the priority */
u8 curPrio = gpu->bgCnt[gpu->ordre[i]].bits.Priority*4 + (LayersEnable[gpu->ordre[i]]?16:0) + gpu->ordre[i] ;
for (q=i+1;q<4;q++)
{
u8 lookingPrio = gpu->bgCnt[gpu->ordre[q]].bits.Priority*4 + (LayersEnable[gpu->ordre[q]]?16:0) + gpu->ordre[q] ;
/* if the one we are looking for is of higher priority then the current selected, swap them */
/* note: higher value = lower priority */
if (lookingPrio > curPrio)
{
/* swap the order */
u8 savedIndex = gpu->ordre[i] ;
gpu->ordre[i] = gpu->ordre[q] ;
gpu->ordre[q] = savedIndex ;
/* update the current info */
curPrio = lookingPrio ;
} ;
}
}
gpu->nbBGActif = j;
if (1==1) return;
/* once we are done ordering, create the inverse table */
for (i=0;i<4;i++)
{
gpu->BGIndex[gpu->ordre[i]] = i ;
/* and remember the processed highest enabled BG */
if (LayersEnable[gpu->ordre[i]]) gpu->nbBGActif = i+1 ;
}
}

48
desmume/src/GPU.h
View File

@ -477,38 +477,34 @@ static INLINE void GPU_ligne(Screen * screen, u16 l)
}
}
// for all the pixels in the line
for(i= 0; i<256; i++) {
// assign them to the good priority table
p = sprPrio[i];
pixelsForPrio[p][nbPixelsForPrio[p]]=i;
nbPixelsForPrio[p]++;
}
// paint lower priorities fist
// then higher priorities on top
for(i8 = gpu->nbBGActif; i8 > 0; )
if(!gpu->nbBGActif)
{
i8--;
if (! ((gpu->ordre[i8]==0) && gpu->dispCnt.bits.BG0_3D && (gpu->core==0)) )
modeRender[gpu->dispCnt.bits.BG_Mode][gpu->ordre[i8]](gpu, gpu->ordre[i8], l, dst);
bgprio = gpu->bgCnt[gpu->ordre[i8]].bits.Priority;
if (gpu->sprEnable && gpu->dispOBJ)
if (gpu->sprEnable)
gpu->spriteRender(gpu, l, dst, sprPrio);
return;
}
if (gpu->sprEnable)
{
gpu->spriteRender(gpu, l, spr, sprPrio);
if(gpu->bgCnt[gpu->ordre[0]].bits.Priority !=3)
{
// there are sprite pixels on top of THAT layer
for (i=0; i<nbPixelsForPrio[bgprio]; i++) {
i16=pixelsForPrio[bgprio][i];
T2WriteWord(dst, i16 << 1, T2ReadWord(spr, i16 << 1));
for(i16 = 0; i16 < 128; ++i16) {
T2WriteLong(dst, i16 << 2, T2ReadLong(spr, i16 << 2));
}
}
}
if (gpu->sprEnable && gpu->dispOBJ)
for (; bgprio>0; ) {
bgprio--;
for (i=0; i<nbPixelsForPrio[bgprio]; i++) {
i16=pixelsForPrio[bgprio][i];
T2WriteWord(dst, i16 << 1, T2ReadWord(spr, i16 << 1));
for(i8 = 0; i8 < gpu->nbBGActif; ++i8)
{
if (! ((gpu->ordre[i8]==0) && gpu->dispCnt.bits.BG0_3D && (gpu->core==0)) )
modeRender[gpu->dispCnt.bits.BG_Mode][gpu->ordre[i8]](gpu, gpu->ordre[i8], l, dst);
bgprio = gpu->bgCnt[gpu->ordre[i8]].bits.Priority;
if (gpu->sprEnable)
{
for(i16 = 0; i16 < 256; ++i16)
if(bgprio>=sprPrio[i16])
T2WriteWord(dst, i16 << 1, T2ReadWord(spr, i16 << 1));
}
}