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

finish de-hardcoding it. also, code 4x variant (not that I guarantee it to be fast, but hey, it's here)

This commit is contained in:
Arisotura 2019-05-12 15:58:12 +02:00
parent 2a0bc4e700
commit a32c5c99bb
2 changed files with 108 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
src/GPU2D.cpp
View File

@ -82,6 +82,7 @@
GPU2D::GPU2D(u32 num)
{
Num = num;
SetScale(0);
}
GPU2D::~GPU2D()
@ -215,6 +216,16 @@ void GPU2D::SetFramebuffer(u32* buf)
Framebuffer = buf;
}
void GPU2D::SetScale(int scale)
{
LineScale = scale;
LineStride = 256 << (scale*2);
if (scale == 1) DrawPixel = DrawPixel_2x;
else if (scale == 2) DrawPixel = DrawPixel_4x;
else DrawPixel = DrawPixel_1x;
}
u8 GPU2D::Read8(u32 addr)
{
@ -612,12 +623,7 @@ u32 GPU2D::ColorBrightnessDown(u32 val, u32 factor)
void GPU2D::DrawScanline(u32 line)
{
u32* dst = &Framebuffer[256*4*line];
// HAX
LineScale = 1;
LineStride = 1024;
DrawPixel = DrawPixel_2x;
u32* dst = &Framebuffer[LineStride * line];
int n3dline = line;
line = GPU::VCount;
@ -691,6 +697,24 @@ void GPU2D::DrawScanline(u32 line)
dst[d+512] = dst[d];
dst[d+513] = dst[d];
}
else if (LineScale == 2)
{
dst[d+1] = dst[d];
dst[d+2] = dst[d];
dst[d+3] = dst[d];
dst[d+1024] = dst[d];
dst[d+1024+1] = dst[d];
dst[d+1024+2] = dst[d];
dst[d+1024+3] = dst[d];
dst[d+2048] = dst[d];
dst[d+2048+1] = dst[d];
dst[d+2048+2] = dst[d];
dst[d+2048+3] = dst[d];
dst[d+3072] = dst[d];
dst[d+3072+1] = dst[d];
dst[d+3072+2] = dst[d];
dst[d+3072+3] = dst[d];
}
}
}
else
@ -720,6 +744,24 @@ void GPU2D::DrawScanline(u32 line)
dst[d+512] = dst[d];
dst[d+513] = dst[d];
}
else if (LineScale == 2)
{
dst[d+1] = dst[d];
dst[d+2] = dst[d];
dst[d+3] = dst[d];
dst[d+1024] = dst[d];
dst[d+1024+1] = dst[d];
dst[d+1024+2] = dst[d];
dst[d+1024+3] = dst[d];
dst[d+2048] = dst[d];
dst[d+2048+1] = dst[d];
dst[d+2048+2] = dst[d];
dst[d+2048+3] = dst[d];
dst[d+3072] = dst[d];
dst[d+3072+1] = dst[d];
dst[d+3072+2] = dst[d];
dst[d+3072+3] = dst[d];
}
}
}
break;
@ -1359,6 +1401,34 @@ void GPU2D::DrawPixel_2x(u32* dst, u16 color, u32 flag)
*(u64*)(dst+512) = val;
}
void GPU2D::DrawPixel_4x(u32* dst, u16 color, u32 flag)
{
u8 r = (color & 0x001F) << 1;
u8 g = (color & 0x03E0) >> 4;
u8 b = (color & 0x7C00) >> 9;
u64 val = r | (g << 8) | (b << 16) | flag;
val |= (val << 32);
*(u64*)(dst+4096) = *(u64*)dst;
*(u64*)(dst+4096+2) = *(u64*)(dst+2);
*(u64*)(dst+4096+1024) = *(u64*)(dst+1024);
*(u64*)(dst+4096+1024+2) = *(u64*)(dst+1024+2);
*(u64*)(dst+4096+2048) = *(u64*)(dst+2048);
*(u64*)(dst+4096+2048+2) = *(u64*)(dst+2048+2);
*(u64*)(dst+4096+3072) = *(u64*)(dst+3072);
*(u64*)(dst+4096+3072+2) = *(u64*)(dst+3072+2);
*(u64*)dst = val;
*(u64*)(dst+2) = val;
*(u64*)(dst+1024) = val;
*(u64*)(dst+1024+2) = val;
*(u64*)(dst+2048) = val;
*(u64*)(dst+2048+2) = val;
*(u64*)(dst+3072) = val;
*(u64*)(dst+3072+2) = val;
}
void GPU2D::DrawBG_3D()
{
u16 xoff = BGXPos[0];
@ -1415,6 +1485,37 @@ void GPU2D::DrawBG_3D()
}
}
}
else if (LineScale == 2)
{
for (; i < iend; i++)
{
int is = i << 1;
int xs = xoff << 1;
u32 c;
xoff++;
if (!(WindowMask[i] & 0x01)) continue;
for (int by = 0; by < 4; by++)
{
for (int bx = 0; bx < 4; bx++)
{
c = _3DLine[xs];
if ((c >> 24) != 0)
{
BGOBJLine[is+4096] = BGOBJLine[is];
BGOBJLine[is] = c | 0x40000000;
}
is++;
xs++;
}
is += 1021;
xs += 1021;
}
}
}
else
{
for (; i < iend; i++)

1
src/GPU2D.h
View File

@ -135,6 +135,7 @@ private:
static void DrawPixel_1x(u32* dst, u16 color, u32 flag);
static void DrawPixel_2x(u32* dst, u16 color, u32 flag);
static void DrawPixel_4x(u32* dst, u16 color, u32 flag);
void (*DrawPixel)(u32* dst, u16 color, u32 flag);
void DrawBG_3D();