piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2024-11-14 13:27:41 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix up a few more things

Browse Source
This commit is contained in:
Jaklyy 2024-04-12 12:51:44 -04:00
parent a51747b253
commit cdc7b01701
3 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/GPU3D.cpp
View File

@ -237,7 +237,7 @@ void GPU3D::Reset() noexcept
TotalParams = 0; TotalParams = 0;
GeometryEnabled = false; GeometryEnabled = false;
RenderingEnabled = false; RenderingEnabled = 0;
DispCnt = 0; DispCnt = 0;
AlphaRefVal = 0; AlphaRefVal = 0;
@ -550,12 +550,16 @@ void GPU3D::DoSavestate(Savestate* file) noexcept
file->Bool32(&AbortFrame); file->Bool32(&AbortFrame);
file->Bool32(&GeometryEnabled); file->Bool32(&GeometryEnabled);
file->Bool32(&RenderingEnabled); file->Var8(&RenderingEnabled);
file->Var32(&PolygonMode); file->Var32(&PolygonMode);
file->Var32(&PolygonAttr); file->Var32(&PolygonAttr);
file->Var32(&CurPolygonAttr); file->Var32(&CurPolygonAttr);
file->Var32(&TexParam); file->Var32(&TexParam);
file->Var32(&TexPalette); file->Var32(&TexPalette);
file->Var8(&RDLines);
file->Var8(&RDLinesTemp);
RenderFrameIdentical = false; RenderFrameIdentical = false;
if (softRenderer && softRenderer->IsThreaded()) if (softRenderer && softRenderer->IsThreaded())
{ {
@ -568,10 +572,19 @@ void GPU3D::DoSavestate(Savestate* file) noexcept
void GPU3D::SetEnabled(bool geometry, bool rendering) noexcept void GPU3D::SetEnabled(bool geometry, bool rendering) noexcept
{ {
GeometryEnabled = geometry; GeometryEnabled = geometry;
RenderingEnabled = rendering; if (rendering)
{
if (!rendering) ResetRenderingState(); if (RenderingEnabled == 0)
else RDLinesTemp = 63; // resets to 63 when the rasterizer is toggled on {
RenderingEnabled = 1;
RDLinesTemp = 63; // CHECKME
}
}
else
{
ResetRenderingState();
RenderingEnabled = 0;
}
} }
@ -2438,11 +2451,11 @@ void GPU3D::VBlank() noexcept
if (GeometryEnabled) if (GeometryEnabled)
{ {
if (RenderingEnabled) if (RenderingEnabled >= 3)
{ {
RDLines = RDLinesTemp;
if (FlushRequest) if (FlushRequest)
{ {
swap:
if (NumPolygons) if (NumPolygons)
{ {
// separate translucent polygons from opaque ones // separate translucent polygons from opaque ones
@ -2496,6 +2509,15 @@ void GPU3D::VBlank() noexcept
RenderClearAttr1 = ClearAttr1; RenderClearAttr1 = ClearAttr1;
RenderClearAttr2 = ClearAttr2; RenderClearAttr2 = ClearAttr2;
} }
else if (RenderingEnabled != 0)
{
if (FlushRequest)
{
RenderingEnabled++;
if (RenderingEnabled >= 3)
goto swap;
}
}
if (FlushRequest) if (FlushRequest)
{ {

6
src/GPU3D.h
View File

@ -243,7 +243,11 @@ public:
u32 TotalParams = 0; u32 TotalParams = 0;
bool GeometryEnabled = false; bool GeometryEnabled = false;
bool RenderingEnabled = false; // 0 = powered off
// 1 = powered on, inactive
// 2 = one swap buffers, inactive
// 3 = two swap buffers, active;
u8 RenderingEnabled = 0;
u32 DispCnt = 0; u32 DispCnt = 0;

4
src/GPU3D_Soft.cpp
View File

@ -2024,7 +2024,7 @@ void SoftRenderer::RenderFrame(GPU& gpu)
//init internal buffer //init internal buffer
ClearBuffers(gpu); ClearBuffers(gpu);
if (gpu.GPU3D.RenderNumPolygons > 0) if (gpu.GPU3D.RenderingEnabled >= 3)
RenderPolygons(gpu, &gpu.GPU3D.RenderPolygonRAM[0], gpu.GPU3D.RenderNumPolygons); RenderPolygons(gpu, &gpu.GPU3D.RenderPolygonRAM[0], gpu.GPU3D.RenderNumPolygons);
else else
memcpy(FinalBuffer, ColorBuffer, sizeof(FinalBuffer)); memcpy(FinalBuffer, ColorBuffer, sizeof(FinalBuffer));
@ -2061,7 +2061,7 @@ void SoftRenderer::RenderThreadFunc(GPU& gpu)
//init internal buffer //init internal buffer
ClearBuffers(gpu); ClearBuffers(gpu);
if (gpu.GPU3D.RenderNumPolygons > 0) if (gpu.GPU3D.RenderingEnabled >= 3)
RenderPolygons(gpu, &gpu.GPU3D.RenderPolygonRAM[0], gpu.GPU3D.RenderNumPolygons); RenderPolygons(gpu, &gpu.GPU3D.RenderPolygonRAM[0], gpu.GPU3D.RenderNumPolygons);
else else
{ {