* rework GPU's settings interface, make it config-agnostic

* make video settings dialog functional, sorta
* fix dialogs that were resizable

src/GPU.cpp

@@ -78,6 +78,7 @@ u8* VRAMPtr_BOBJ[0x8];
 
 int FrontBuffer;
 u32* Framebuffer[2][2];
+int Renderer;
 bool Accelerated;
 
 GPU2D* GPU2D_A;
@@ -93,8 +94,8 @@ bool Init()
     FrontBuffer = 0;
     Framebuffer[0][0] = NULL; Framebuffer[0][1] = NULL;
     Framebuffer[1][0] = NULL; Framebuffer[1][1] = NULL;
+    Renderer = 0;
     Accelerated = false;
-    SetDisplaySettings(false);
 
     return true;
 }
@@ -182,6 +183,8 @@ void Reset()
     int backbuf = FrontBuffer ? 0 : 1;
     GPU2D_A->SetFramebuffer(Framebuffer[backbuf][1]);
     GPU2D_B->SetFramebuffer(Framebuffer[backbuf][0]);
+
+    ResetRenderer();
 }
 
 void Stop()
@@ -274,8 +277,65 @@ void AssignFramebuffers()
     }
 }
 
-void SetDisplaySettings(bool accel)
+void InitRenderer(int renderer)
+{
+    if (renderer == 1)
+    {
+        if (!GLCompositor::Init())
+        {
+            renderer = 0;
+        }
+        else if (!GPU3D::GLRenderer::Init())
+        {
+            GLCompositor::DeInit();
+            renderer = 0;
+        }
+    }
+
+    if (renderer == 0)
+    {
+        GPU3D::SoftRenderer::Init();
+    }
+
+    Renderer = renderer;
+    Accelerated = renderer != 0;
+}
+
+void DeInitRenderer()
+{
+    if (Renderer == 0)
+    {
+        GPU3D::SoftRenderer::DeInit();
+    }
+    else
+    {
+        GPU3D::GLRenderer::DeInit();
+        GLCompositor::DeInit();
+    }
+}
+
+void ResetRenderer()
 {
+    if (Renderer == 0)
+    {
+        GPU3D::SoftRenderer::Reset();
+    }
+    else
+    {
+        GLCompositor::Reset();
+        GPU3D::GLRenderer::Reset();
+    }
+}
+
+void SetRenderSettings(int renderer, RenderSettings& settings)
+{
+    if (renderer != Renderer)
+    {
+        DeInitRenderer();
+        InitRenderer(renderer);
+    }
+
+    bool accel = Accelerated;
     int fbsize;
     if (accel) fbsize = (256*3 + 1) * 192;
     else       fbsize = 256 * 192;
@@ -296,10 +356,18 @@ void SetDisplaySettings(bool accel)
 
     AssignFramebuffers();
 
-    GPU2D_A->SetDisplaySettings(accel);
-    GPU2D_B->SetDisplaySettings(accel);
+    GPU2D_A->SetRenderSettings(accel);
+    GPU2D_B->SetRenderSettings(accel);
 
-    Accelerated = accel;
+    if (Renderer == 0)
+    {
+        GPU3D::SoftRenderer::SetRenderSettings(settings);
+    }
+    else
+    {
+        GLCompositor::SetRenderSettings(settings);
+        GPU3D::GLRenderer::SetRenderSettings(settings);
+    }
 }
 
 

src/GPU.h

@@ -20,7 +20,6 @@
 #define GPU_H
 
 #include "GPU2D.h"
-#include "GPU3D.h"
 
 namespace GPU
 {
@@ -72,6 +71,17 @@ extern u32* Framebuffer[2][2];
 extern GPU2D* GPU2D_A;
 extern GPU2D* GPU2D_B;
 
+extern int Renderer;
+
+
+typedef struct
+{
+    bool Soft_Threaded;
+
+    int GL_ScaleFactor;
+
+} RenderSettings;
+
 
 bool Init();
 void DeInit();
@@ -80,7 +90,11 @@ void Stop();
 
 void DoSavestate(Savestate* file);
 
-void SetDisplaySettings(bool accel);
+void InitRenderer(int renderer);
+void DeInitRenderer();
+void ResetRenderer();
+
+void SetRenderSettings(int renderer, RenderSettings& settings);
 
 
 u8* GetUniqueBankPtr(u32 mask, u32 offset);
@@ -429,7 +443,7 @@ bool Init();
 void DeInit();
 void Reset();
 
-void UpdateDisplaySettings();
+void SetRenderSettings(RenderSettings& settings);
 
 void RenderFrame();
 void BindOutputTexture();
@@ -438,4 +452,6 @@ void BindOutputTexture();
 
 }
 
+#include "GPU3D.h"
+
 #endif

src/GPU2D.cpp

@@ -202,16 +202,8 @@ void GPU2D::DoSavestate(Savestate* file)
         file->Var32(&CaptureCnt);
     }
 
-    if (file->IsAtleastVersion(2, 1))
-    {
-        file->Var32(&Win0Active);
-        file->Var32(&Win1Active);
-    }
-    else
-    {
-        Win0Active = 0;
-        Win1Active = 0;
-    }
+    file->Var32(&Win0Active);
+    file->Var32(&Win1Active);
 
     if (!file->Saving)
     {
@@ -232,7 +224,7 @@ void GPU2D::SetFramebuffer(u32* buf)
     Framebuffer = buf;
 }
 
-void GPU2D::SetDisplaySettings(bool accel)
+void GPU2D::SetRenderSettings(bool accel)
 {
     Accelerated = accel;
 

src/GPU2D.h

@@ -31,7 +31,7 @@ class GPU2D
 
     void SetEnabled(bool enable) { Enabled = enable; }
     void SetFramebuffer(u32* buf);
-    void SetDisplaySettings(bool accel);
+    void SetRenderSettings(bool accel);
 
     u8 Read8(u32 addr);
     u16 Read16(u32 addr);

src/GPU3D.cpp

@@ -157,8 +157,6 @@ u32 NumCommands, CurCommand, ParamCount, TotalParams;
 bool GeometryEnabled;
 bool RenderingEnabled;
 
-int Renderer;
-
 u32 DispCnt;
 u8 AlphaRefVal, AlphaRef;
 
@@ -280,17 +278,11 @@ bool Init()
 
     CmdStallQueue = new FIFO<CmdFIFOEntry>(64);
 
-    Renderer = -1;
-    // SetRenderer() will be called to set it up later
-
     return true;
 }
 
 void DeInit()
 {
-    if (Renderer == 0) SoftRenderer::DeInit();
-    else               GLRenderer::DeInit();
-
     delete CmdFIFO;
     delete CmdPIPE;
 
@@ -391,8 +383,6 @@ void Reset()
     FlushAttributes = 0;
 
     ResetRenderingState();
-    if (Renderer == 0) SoftRenderer::Reset();
-    else               GLRenderer::Reset();
 }
 
 void DoSavestate(Savestate* file)
@@ -607,43 +597,6 @@ void SetEnabled(bool geometry, bool rendering)
 }
 
 
-int InitRenderer(bool hasGL)
-{
-    int renderer = hasGL ? Config::_3DRenderer : 0;
-
-    if (renderer == 1)
-    {
-        if (!GLRenderer::Init())
-            renderer = 0;
-    }
-printf("renderer: %d\n", renderer);
-    if (renderer == 0) SoftRenderer::Init();
-
-    Renderer = renderer;
-    UpdateRendererConfig();
-    GPU::SetDisplaySettings(Renderer != 0);
-    return renderer;
-}
-
-void DeInitRenderer()
-{
-    if (Renderer == 0) SoftRenderer::DeInit();
-    else               GLRenderer::DeInit();
-}
-
-void UpdateRendererConfig()
-{
-    if (Renderer == 0)
-    {
-        SoftRenderer::SetupRenderThread();
-    }
-    else
-    {
-        GLRenderer::UpdateDisplaySettings();
-    }
-}
-
-
 
 void MatrixLoadIdentity(s32* m)
 {
@@ -2470,7 +2423,7 @@ void CheckFIFODMA()
 
 void VCount144()
 {
-    if (Renderer == 0) SoftRenderer::VCount144();
+    if (GPU::Renderer == 0) SoftRenderer::VCount144();
 }
 
 
@@ -2552,14 +2505,14 @@ void VBlank()
 
 void VCount215()
 {
-    if (Renderer == 0) SoftRenderer::RenderFrame();
-    else               GLRenderer::RenderFrame();
+    if (GPU::Renderer == 0) SoftRenderer::RenderFrame();
+    else                    GLRenderer::RenderFrame();
 }
 
 u32* GetLine(int line)
 {
-    if (Renderer == 0) return SoftRenderer::GetLine(line);
-    else               return GLRenderer::GetLine(line);
+    if (GPU::Renderer == 0) return SoftRenderer::GetLine(line);
+    else                    return GLRenderer::GetLine(line);
 }
 
 

src/GPU3D.h

@@ -102,10 +102,6 @@ void DoSavestate(Savestate* file);
 
 void SetEnabled(bool geometry, bool rendering);
 
-int InitRenderer(bool hasGL);
-void DeInitRenderer();
-void UpdateRendererConfig();
-
 void ExecuteCommand();
 
 s32 CyclesToRunFor();
@@ -134,6 +130,7 @@ bool Init();
 void DeInit();
 void Reset();
 
+void SetRenderSettings(GPU::RenderSettings& settings);
 void SetupRenderThread();
 
 void VCount144();
@@ -149,7 +146,7 @@ bool Init();
 void DeInit();
 void Reset();
 
-void UpdateDisplaySettings();
+void SetRenderSettings(GPU::RenderSettings& settings);
 
 void RenderFrame();
 void PrepareCaptureFrame();

src/GPU3D_OpenGL.cpp

@@ -372,19 +372,11 @@ bool Init()
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB5_A1, 1024, 48, 0, GL_RGBA, GL_UNSIGNED_SHORT_1_5_5_5_REV, NULL);
 
-    if (!GPU::GLCompositor::Init())
-    {
-        // TODO: clean up things? fail more gracefully??
-        return false;
-    }
-
     return true;
 }
 
 void DeInit()
 {
-    GPU::GLCompositor::DeInit();
-
     glDeleteTextures(1, &TexMemID);
     glDeleteTextures(1, &TexPalMemID);
 
@@ -407,13 +399,12 @@ void DeInit()
 
 void Reset()
 {
-    GPU::GLCompositor::Reset();
 }
 
-void UpdateDisplaySettings()
+void SetRenderSettings(GPU::RenderSettings& settings)
 {
-    int scale = Config::GL_ScaleFactor;
-    bool antialias = false; //Config::GL_Antialias;
+    int scale = settings.GL_ScaleFactor;
+    bool antialias = false; // REMOVE ME!
 
     if (antialias) scale *= 2;
 
@@ -490,8 +481,6 @@ void UpdateDisplaySettings()
 
     //glLineWidth(scale);
     //glLineWidth(1.5);
-
-    GPU::GLCompositor::UpdateDisplaySettings();
 }