blackmagic3 - brand new OpenGL 2D renderer

cmake/MakeEmbed.cmake

@@ -0,0 +1,4 @@
+file(READ ${INPUT_FILE} EMBED_CONTENTS)
+file(WRITE ${OUTPUT_FILE}
+    "const char* k${VAR_NAME} = R\"(${EMBED_CONTENTS})\";\n"
+)

src/ARMJIT_Memory.cpp

@@ -1371,23 +1371,23 @@ void VRAMWrite(u32 addr, T val)
 {
     switch (addr & 0x00E00000)
     {
-    case 0x00000000: NDS::Current->GPU.WriteVRAM_ABG<T>(addr, val); return;
-    case 0x00200000: NDS::Current->GPU.WriteVRAM_BBG<T>(addr, val); return;
-    case 0x00400000: NDS::Current->GPU.WriteVRAM_AOBJ<T>(addr, val); return;
-    case 0x00600000: NDS::Current->GPU.WriteVRAM_BOBJ<T>(addr, val); return;
-    default: NDS::Current->GPU.WriteVRAM_LCDC<T>(addr, val); return;
+    case 0x00000000: NDS::Current->GPU.SyncVRAM_ABG(addr, true); NDS::Current->GPU.WriteVRAM_ABG<T>(addr, val); return;
+    case 0x00200000: NDS::Current->GPU.SyncVRAM_BBG(addr, true); NDS::Current->GPU.WriteVRAM_BBG<T>(addr, val); return;
+    case 0x00400000: NDS::Current->GPU.SyncVRAM_AOBJ(addr, true); NDS::Current->GPU.WriteVRAM_AOBJ<T>(addr, val); return;
+    case 0x00600000: NDS::Current->GPU.SyncVRAM_BOBJ(addr, true); NDS::Current->GPU.WriteVRAM_BOBJ<T>(addr, val); return;
+    default: NDS::Current->GPU.SyncVRAM_LCDC(addr, true); NDS::Current->GPU.WriteVRAM_LCDC<T>(addr, val); return;
     }
 }
 template <typename T>
 T VRAMRead(u32 addr)
 {
     switch (addr & 0x00E00000)
     {
-    case 0x00000000: return NDS::Current->GPU.ReadVRAM_ABG<T>(addr);
-    case 0x00200000: return NDS::Current->GPU.ReadVRAM_BBG<T>(addr);
-    case 0x00400000: return NDS::Current->GPU.ReadVRAM_AOBJ<T>(addr);
-    case 0x00600000: return NDS::Current->GPU.ReadVRAM_BOBJ<T>(addr);
-    default: return NDS::Current->GPU.ReadVRAM_LCDC<T>(addr);
+    case 0x00000000: NDS::Current->GPU.SyncVRAM_ABG(addr, false); return NDS::Current->GPU.ReadVRAM_ABG<T>(addr);
+    case 0x00200000: NDS::Current->GPU.SyncVRAM_BBG(addr, false); return NDS::Current->GPU.ReadVRAM_BBG<T>(addr);
+    case 0x00400000: NDS::Current->GPU.SyncVRAM_AOBJ(addr, false); return NDS::Current->GPU.ReadVRAM_AOBJ<T>(addr);
+    case 0x00600000: NDS::Current->GPU.SyncVRAM_BOBJ(addr, false); return NDS::Current->GPU.ReadVRAM_BOBJ<T>(addr);
+    default: NDS::Current->GPU.SyncVRAM_LCDC(addr, false); return NDS::Current->GPU.ReadVRAM_LCDC<T>(addr);
     }
 }
 

src/Args.h

@@ -30,7 +30,7 @@
 #include "DSi_NAND.h"
 #include "FATStorage.h"
 #include "FreeBIOS.h"
-#include "GPU3D_Soft.h"
+#include "GPU.h"
 #include "SPI_Firmware.h"
 #include "SPU.h"
 
@@ -116,7 +116,7 @@ struct NDSArgs
     /// The 3D renderer to initialize the DS with.
     /// Defaults to the software renderer.
     /// Can be changed later at any time.
-    std::unique_ptr<melonDS::Renderer3D> Renderer3D = std::make_unique<SoftRenderer>();
+    std::unique_ptr<melonDS::Renderer> Renderer = nullptr;
 };
 
 /// Arguments to pass into the DSi constructor.

src/CMakeLists.txt

@@ -34,6 +34,7 @@ add_library(core STATIC
     GBACart.cpp
     GBACartMotionPak.cpp
     GPU.cpp
+    GPU_Soft.cpp
     GPU2D.cpp
     GPU2D_Soft.cpp
     GPU3D.cpp
@@ -87,14 +88,14 @@ if (ENABLE_GDBSTUB)
 endif()
 
 if (ENABLE_OGLRENDERER)
+    add_subdirectory(OpenGL_shaders)
     target_sources(core PRIVATE
         GPU_OpenGL.cpp
-        GPU_OpenGL_shaders.h
+        GPU2D_OpenGL.cpp
         GPU3D_OpenGL.cpp
         GPU3D_Compute.cpp
         GPU3D_TexcacheOpenGL.cpp
         GPU3D_TexcacheOpenGL.h
-        GPU3D_OpenGL_shaders.h
         OpenGLSupport.cpp)
 
     target_compile_definitions(core PUBLIC OGLRENDERER_ENABLED)

src/DSi.cpp

@@ -1589,11 +1589,11 @@ void DSi::ARM9Write8(u32 addr, u8 val)
         JIT.CheckAndInvalidate<0, ARMJIT_Memory::memregion_VRAM>(addr);
         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: GPU.SyncVRAM_ABG(addr, true); GPU.WriteVRAM_ABG<u8>(addr, val); return;
+        case 0x00200000: GPU.SyncVRAM_BBG(addr, true); GPU.WriteVRAM_BBG<u8>(addr, val); return;
+        case 0x00400000: GPU.SyncVRAM_AOBJ(addr, true); GPU.WriteVRAM_AOBJ<u8>(addr, val); return;
+        case 0x00600000: GPU.SyncVRAM_BOBJ(addr, true); GPU.WriteVRAM_BOBJ<u8>(addr, val); return;
+        default: GPU.SyncVRAM_LCDC(addr, true); GPU.WriteVRAM_LCDC<u8>(addr, val); return;
         }
 
     case 0x08000000: