lay base for multiple GPU2D backends

src/CMakeLists.txt

@@ -27,6 +27,7 @@ add_library(core STATIC
 	GBACart.cpp
 	GPU.cpp
 	GPU2D.cpp
+	GPU2DSoft.cpp
 	GPU3D.cpp
 	GPU3D_Soft.cpp
 	melonDLDI.h

src/GPU.cpp

@@ -144,8 +144,8 @@ u8 VRAMFlat_TexPal[128*1024];
 
 bool Init()
 {
-    GPU2D_A = new GPU2D(0);
+    GPU2D_A = new GPU2DSoft(0);
-    GPU2D_B = new GPU2D(1);
+    GPU2D_B = new GPU2DSoft(1);
     if (!GPU3D::Init()) return false;
 
     FrontBuffer = 0;

src/GPU2D.h

@@ -19,11 +19,14 @@
 #ifndef GPU2D_H
 #define GPU2D_H
 
+#include "types.h"
+#include "Savestate.h"
+
 class GPU2D
 {
 public:
     GPU2D(u32 num);
-    ~GPU2D();
+    virtual ~GPU2D() {}
 
     void Reset();
 
@@ -31,7 +34,7 @@ public:
 
     void SetEnabled(bool enable) { Enabled = enable; }
     void SetFramebuffer(u32* buf);
-    void SetRenderSettings(bool accel);
+    virtual void SetRenderSettings(bool accel) = 0;
 
     u8 Read8(u32 addr);
     u16 Read16(u32 addr);
@@ -52,33 +55,24 @@ public:
 
     void SampleFIFO(u32 offset, u32 num);
 
-    void DrawScanline(u32 line);
+    virtual void DrawScanline(u32 line) = 0;
-    void DrawSprites(u32 line);
+    virtual void DrawSprites(u32 line) = 0;
     void VBlank();
-    void VBlankEnd();
+    virtual void VBlankEnd();
 
     void CheckWindows(u32 line);
 
     u16* GetBGExtPal(u32 slot, u32 pal);
     u16* GetOBJExtPal();
 
-private:
+    void GetBGVRAM(u8*& data, u32& mask);
+    void GetOBJVRAM(u8*& data, u32& mask);
+
+protected:
     u32 Num;
     bool Enabled;
     u32* Framebuffer;
 
-    bool Accelerated;
-
-    u32 BGOBJLine[256*3] __attribute__((aligned (8)));
-    u32* _3DLine;
-
-    u8 WindowMask[256] __attribute__((aligned (8)));
-    u32 OBJLine[256] __attribute__((aligned (8)));
-    u8 OBJWindow[256] __attribute__((aligned (8)));
-    u8 OBJIndex[256] __attribute__((aligned (8)));
-
-    u32 NumSprites;
-
     u16 DispFIFO[16];
     u32 DispFIFOReadPtr;
     u32 DispFIFOWritePtr;
@@ -111,10 +105,6 @@ private:
     u8 BGMosaicY, BGMosaicYMax;
     u8 OBJMosaicYCount, OBJMosaicY, OBJMosaicYMax;
 
-    u8 MosaicTable[16][256];
-    u8* CurBGXMosaicTable;
-    u8* CurOBJXMosaicTable;
-
     u16 BlendCnt;
     u16 BlendAlpha;
     u8 EVA, EVB;
@@ -124,7 +114,44 @@ private:
 
     u16 MasterBrightness;
 
-    u16 BGExtPalCache[4][16*256];
+    u8 WindowMask[256] __attribute__((aligned (8)));
+    u8 OBJWindow[256] __attribute__((aligned (8)));
+
+    void UpdateMosaicCounters(u32 line);
+    void CalculateWindowMask(u32 line);
+
+    virtual void MosaicXSizeChanged() = 0;
+};
+
+class GPU2DSoft : public GPU2D
+{
+public:
+    GPU2DSoft(u32 num);
+    ~GPU2DSoft() override {}
+
+    void SetRenderSettings(bool accel) override;
+    
+    void DrawScanline(u32 line) override;
+    void DrawSprites(u32 line) override;
+    void VBlankEnd() override;
+
+protected:
+    void MosaicXSizeChanged() override;
+
+private:
+    bool Accelerated;
+
+    u32 BGOBJLine[256*3] __attribute__((aligned (8)));
+    u32* _3DLine;
+
+    u32 OBJLine[256] __attribute__((aligned (8)));
+    u8 OBJIndex[256] __attribute__((aligned (8)));
+
+    u32 NumSprites;
+
+    u8 MosaicTable[16][256];
+    u8* CurBGXMosaicTable;
+    u8* CurOBJXMosaicTable;
     
     u32 ColorBlend4(u32 val1, u32 val2, u32 eva, u32 evb);
     u32 ColorBlend5(u32 val1, u32 val2);
@@ -132,8 +159,6 @@ private:
     u32 ColorBrightnessDown(u32 val, u32 factor);
     u32 ColorComposite(int i, u32 val1, u32 val2);
 
-    void UpdateMosaicCounters(u32 line);
-
     template<u32 bgmode> void DrawScanlineBGMode(u32 line);
     void DrawScanlineBGMode6(u32 line);
     void DrawScanlineBGMode7(u32 line);
@@ -157,8 +182,6 @@ private:
     template<bool window> void DrawSprite_Normal(u32 num, u32 width, u32 height, s32 xpos, s32 ypos);
 
     void DoCapture(u32 line, u32 width);
-
-    void CalculateWindowMask(u32 line);
 };
 
 #endif