piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-21 05:09:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Refactor the GPU to be object-oriented (#1873)

Browse Source 
* Refactor GPU3D to be an object

- Who has two thumbs and is the sworn enemy of global state? This guy!

* Refactor GPU itself to be an object

- Wow, it's used in a lot of places
- Also introduce a new `Melon` namespace for a few classes
- I expect other classes will be moved into `Melon` over time

* Change signature of Renderer3D::SetRenderSettings

- Make it noexcept, and its argument const

* Remove some stray whitespace
This commit is contained in:
Jesse Talavera-Greenberg
2023-11-09 15:54:51 -05:00
committed by GitHub
parent 88072a02c5
commit 4558be0d8e
25 changed files with 1513 additions and 1490 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/DSi.cpp
View File

@ -105,14 +105,14 @@ bool Init()
NWRAM_C = new u8[NWRAMSize];
#endif
NDMAs[0] = new DSi_NDMA(0, 0);
NDMAs[1] = new DSi_NDMA(0, 1);
NDMAs[2] = new DSi_NDMA(0, 2);
NDMAs[3] = new DSi_NDMA(0, 3);
NDMAs[4] = new DSi_NDMA(1, 0);
NDMAs[5] = new DSi_NDMA(1, 1);
NDMAs[6] = new DSi_NDMA(1, 2);
NDMAs[7] = new DSi_NDMA(1, 3);
NDMAs[0] = new DSi_NDMA(0, 0, *NDS::GPU);
NDMAs[1] = new DSi_NDMA(0, 1, *NDS::GPU);
NDMAs[2] = new DSi_NDMA(0, 2, *NDS::GPU);
NDMAs[3] = new DSi_NDMA(0, 3, *NDS::GPU);
NDMAs[4] = new DSi_NDMA(1, 0, *NDS::GPU);
NDMAs[5] = new DSi_NDMA(1, 1, *NDS::GPU);
NDMAs[6] = new DSi_NDMA(1, 2, *NDS::GPU);
NDMAs[7] = new DSi_NDMA(1, 3, *NDS::GPU);
SDMMC = new DSi_SDHost(0);
SDIO = new DSi_SDHost(1);
@ -205,8 +205,8 @@ void Reset()
GPIO_WiFi = 0;
// LCD init flag
GPU::DispStat[0] |= (1<<6);
GPU::DispStat[1] |= (1<<6);
NDS::GPU->DispStat[0] |= (1<<6);
NDS::GPU->DispStat[1] |= (1<<6);
}
void Stop()
@ -730,8 +730,8 @@ void SoftReset()
// LCD init flag
GPU::DispStat[0] |= (1<<6);
GPU::DispStat[1] |= (1<<6);
NDS::GPU->DispStat[0] |= (1<<6);
NDS::GPU->DispStat[1] |= (1<<6);
}
bool LoadNAND()
@ -1528,11 +1528,11 @@ void ARM9Write8(u32 addr, u8 val)
#endif
switch (addr & 0x00E00000)
{
case 0x00000000: GPU::WriteVRAM_ABG<u8>(addr, val); return;
case 0x00200000: GPU::WriteVRAM_BBG<u8>(addr, val); return;
case 0x00400000: GPU::WriteVRAM_AOBJ<u8>(addr, val); return;
case 0x00600000: GPU::WriteVRAM_BOBJ<u8>(addr, val); return;
default: GPU::WriteVRAM_LCDC<u8>(addr, val); return;
case 0x00000000: NDS::GPU->WriteVRAM_ABG<u8>(addr, val); return;
case 0x00200000: NDS::GPU->WriteVRAM_BBG<u8>(addr, val); return;
case 0x00400000: NDS::GPU->WriteVRAM_AOBJ<u8>(addr, val); return;
case 0x00600000: NDS::GPU->WriteVRAM_BOBJ<u8>(addr, val); return;
default: NDS::GPU->WriteVRAM_LCDC<u8>(addr, val); return;
}
case 0x08000000: