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

normalize W values in both directions (0123-0157 -> 1230-1570)

This commit is contained in:
StapleButter 2017-07-06 18:54:51 +02:00
parent 3aa83ae641
commit 8f031f698b
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/GPU3D.cpp
View File

@ -823,13 +823,13 @@ void SubmitPolygon()
// determine bounds of the polygon // determine bounds of the polygon
// also determine the W shift and normalize W // also determine the W shift and normalize W
// TODO: normalization works both ways // normalization works both ways
// (ie two W's that span 12 bits or less will be brought to 16 bits) // (ie two W's that span 12 bits or less will be brought to 16 bits)
u32 vtop = 0, vbot = 0; u32 vtop = 0, vbot = 0;
s32 ytop = 192, ybot = 0; s32 ytop = 192, ybot = 0;
s32 xtop = 256, xbot = 0; s32 xtop = 256, xbot = 0;
u32 wshift = 0; u32 wsize = 0;
for (int i = 0; i < nverts; i++) for (int i = 0; i < nverts; i++)
{ {
@ -849,8 +849,8 @@ void SubmitPolygon()
} }
u32 w = (u32)vtx->Position[3]; u32 w = (u32)vtx->Position[3];
while ((w >> wshift) & 0xFFFF0000) while (w >> wsize)
wshift += 4; wsize += 4;
} }
poly->VTop = vtop; poly->VBottom = vbot; poly->VTop = vtop; poly->VBottom = vbot;
@ -860,20 +860,32 @@ void SubmitPolygon()
poly->SortKey = (ybot << 8) | ytop; poly->SortKey = (ybot << 8) | ytop;
if (poly->Translucent) poly->SortKey |= 0x10000; if (poly->Translucent) poly->SortKey |= 0x10000;
poly->WShift = wshift;
poly->WBuffer = (FlushAttributes & 0x2); poly->WBuffer = (FlushAttributes & 0x2);
for (int i = 0; i < nverts; i++) for (int i = 0; i < nverts; i++)
{ {
Vertex* vtx = poly->Vertices[i]; Vertex* vtx = poly->Vertices[i];
s32 w = vtx->Position[3] >> wshift; s32 w, wshifted;
if (wsize < 16)
{
w = vtx->Position[3] << (16 - wsize);
wshifted = w >> (16 - wsize);
}
else
{
w = vtx->Position[3] >> (wsize - 16);
wshifted = w << (wsize - 16);
}
s32 z; s32 z;
if (FlushAttributes & 0x2) if (FlushAttributes & 0x2)
z = w << wshift; z = wshifted;
else if (wshifted)
z = (((s64)vtx->Position[2] * 0x800000) / wshifted) + 0x7FFEFF;
else else
z = (((s64)vtx->Position[2] * 0x800000) / (w << wshift)) + 0x7FFEFF; z = 0x7FFEFF;
//printf("poly%d v%d: %d %d Z=%08X (%08X %08X)\n", NumPolygons-1, i, vtx->FinalPosition[0], vtx->FinalPosition[1], z, vtx->Position[2], vtx->Position[3]);
// checkme // checkme
if (z < 0) z = 0; if (z < 0) z = 0;
else if (z > 0xFFFFFF) z = 0xFFFFFF; else if (z > 0xFFFFFF) z = 0xFFFFFF;

1
src/GPU3D.h
View File

@ -47,7 +47,6 @@ typedef struct
s32 FinalZ[10]; s32 FinalZ[10];
s32 FinalW[10]; s32 FinalW[10];
u8 WShift;
bool WBuffer; bool WBuffer;
u32 Attr; u32 Attr;