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

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

6 files changed, 209 insertions, 54 deletions

diff --git a/src/frontend/qt_sdl/AudioSettingsDialog.ui b/src/frontend/qt_sdl/AudioSettingsDialog.ui
index 9ae8baa..bcaf937 100644
--- a/src/frontend/qt_sdl/AudioSettingsDialog.ui
+++ b/src/frontend/qt_sdl/AudioSettingsDialog.ui
@@ -10,10 +10,19 @@
     <height>230</height>
    </rect>
   </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
   <property name="windowTitle">
    <string>Audio settings - melonDS</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="sizeConstraint">
+    <enum>QLayout::SetFixedSize</enum>
+   </property>
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
diff --git a/src/frontend/qt_sdl/VideoSettingsDialog.cpp b/src/frontend/qt_sdl/VideoSettingsDialog.cpp
index 0aeb154..09f1ab4 100644
--- a/src/frontend/qt_sdl/VideoSettingsDialog.cpp
+++ b/src/frontend/qt_sdl/VideoSettingsDialog.cpp
@@ -46,7 +46,7 @@ VideoSettingsDialog::VideoSettingsDialog(QWidget* parent) : QDialog(parent), ui(
     grp3DRenderer = new QButtonGroup(this);
     grp3DRenderer->addButton(ui->rb3DSoftware, 0);
     grp3DRenderer->addButton(ui->rb3DOpenGL,   1);
-    //connect(grp3DRenderer, SIGNAL(buttonClicked(int)), this, SLOT(onChange3DRenderer(int)));
+    connect(grp3DRenderer, SIGNAL(buttonClicked(int)), this, SLOT(onChange3DRenderer(int)));
     grp3DRenderer->button(Config::_3DRenderer)->setChecked(true);
 
     ui->cbGLDisplay->setChecked(Config::ScreenUseGL != 0);
@@ -57,8 +57,21 @@ VideoSettingsDialog::VideoSettingsDialog(QWidget* parent) : QDialog(parent), ui(
     ui->cbSoftwareThreaded->setChecked(Config::Threaded3D != 0);
 
     for (int i = 1; i <= 16; i++)
-        ui->cbxGLResolution->addItem(QString("%1x native (%2x%3)").arg(i).arg(256*i).arg(192*i), QVariant(i));
-    ui->cbxGLResolution->setCurrentIndex(Config::GL_ScaleFactor);
+        ui->cbxGLResolution->addItem(QString("%1x native (%2x%3)").arg(i).arg(256*i).arg(192*i));
+    ui->cbxGLResolution->setCurrentIndex(Config::GL_ScaleFactor-1);
+
+    if (Config::_3DRenderer == 0)
+    {
+        ui->cbGLDisplay->setEnabled(true);
+        ui->cbSoftwareThreaded->setEnabled(true);
+        ui->cbxGLResolution->setEnabled(false);
+    }
+    else
+    {
+        ui->cbGLDisplay->setEnabled(false);
+        ui->cbSoftwareThreaded->setEnabled(false);
+        ui->cbxGLResolution->setEnabled(true);
+    }
 }
 
 VideoSettingsDialog::~VideoSettingsDialog()
@@ -68,7 +81,6 @@ VideoSettingsDialog::~VideoSettingsDialog()
 
 void VideoSettingsDialog::on_VideoSettingsDialog_accepted()
 {
-    //
     Config::Save();
 
     closeDlg();
@@ -76,9 +88,64 @@ void VideoSettingsDialog::on_VideoSettingsDialog_accepted()
 
 void VideoSettingsDialog::on_VideoSettingsDialog_rejected()
 {
-    //
+    bool old_gl = (Config::ScreenUseGL != 0) || (Config::_3DRenderer != 0);
+
+    Config::_3DRenderer = oldRenderer;
+    Config::ScreenUseGL = oldGLDisplay;
+    Config::ScreenVSync = oldVSync;
+    Config::ScreenVSyncInterval = oldVSyncInterval;
+    Config::Threaded3D = oldSoftThreaded;
+    Config::GL_ScaleFactor = oldGLScale;
+
+    bool new_gl = (Config::ScreenUseGL != 0) || (Config::_3DRenderer != 0);
+    emit updateVideoSettings(old_gl != new_gl);
 
     closeDlg();
 }
 
-//
+void VideoSettingsDialog::onChange3DRenderer(int renderer)
+{
+    bool old_gl = (Config::ScreenUseGL != 0) || (Config::_3DRenderer != 0);
+
+    Config::_3DRenderer = renderer;
+
+    if (renderer == 0)
+    {
+        ui->cbGLDisplay->setEnabled(true);
+        ui->cbSoftwareThreaded->setEnabled(true);
+        ui->cbxGLResolution->setEnabled(false);
+    }
+    else
+    {
+        ui->cbGLDisplay->setEnabled(false);
+        ui->cbSoftwareThreaded->setEnabled(false);
+        ui->cbxGLResolution->setEnabled(true);
+    }
+
+    bool new_gl = (Config::ScreenUseGL != 0) || (Config::_3DRenderer != 0);
+    emit updateVideoSettings(old_gl != new_gl);
+}
+
+void VideoSettingsDialog::on_cbGLDisplay_stateChanged(int state)
+{
+    bool old_gl = (Config::ScreenUseGL != 0) || (Config::_3DRenderer != 0);
+
+    Config::ScreenUseGL = (state != 0);
+
+    bool new_gl = (Config::ScreenUseGL != 0) || (Config::_3DRenderer != 0);
+    emit updateVideoSettings(old_gl != new_gl);
+}
+
+void VideoSettingsDialog::on_cbSoftwareThreaded_stateChanged(int state)
+{
+    Config::Threaded3D = (state != 0);
+
+    emit updateVideoSettings(false);
+}
+
+void VideoSettingsDialog::on_cbxGLResolution_currentIndexChanged(int idx)
+{
+    Config::GL_ScaleFactor = idx+1;
+
+    emit updateVideoSettings(false);
+}
diff --git a/src/frontend/qt_sdl/VideoSettingsDialog.h b/src/frontend/qt_sdl/VideoSettingsDialog.h
index 05dfecb..2f6d17c 100644
--- a/src/frontend/qt_sdl/VideoSettingsDialog.h
+++ b/src/frontend/qt_sdl/VideoSettingsDialog.h
@@ -51,11 +51,18 @@ public:
         currentDlg = nullptr;
     }
 
+signals:
+    void updateVideoSettings(bool glchange);
+
 private slots:
     void on_VideoSettingsDialog_accepted();
     void on_VideoSettingsDialog_rejected();
 
-    //
+    void onChange3DRenderer(int renderer);
+    void on_cbGLDisplay_stateChanged(int state);
+    void on_cbxGLResolution_currentIndexChanged(int idx);
+
+    void on_cbSoftwareThreaded_stateChanged(int state);
 
 private:
     Ui::VideoSettingsDialog* ui;
diff --git a/src/frontend/qt_sdl/VideoSettingsDialog.ui b/src/frontend/qt_sdl/VideoSettingsDialog.ui
index 06670e5..6cdd5d8 100644
--- a/src/frontend/qt_sdl/VideoSettingsDialog.ui
+++ b/src/frontend/qt_sdl/VideoSettingsDialog.ui
@@ -10,10 +10,19 @@
     <height>237</height>
    </rect>
   </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
   <property name="windowTitle">
    <string>Video settings - melonDS</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <property name="sizeConstraint">
+    <enum>QLayout::SetFixedSize</enum>
+   </property>
    <item row="1" column="1">
     <widget class="QGroupBox" name="groupBox_3">
      <property name="title">
diff --git a/src/frontend/qt_sdl/main.cpp b/src/frontend/qt_sdl/main.cpp
index ae4bcf3..658ae8b 100644
--- a/src/frontend/qt_sdl/main.cpp
+++ b/src/frontend/qt_sdl/main.cpp
@@ -68,6 +68,10 @@ EmuThread* emuThread;
 
 int autoScreenSizing = 0;
 
+int videoRenderer;
+GPU::RenderSettings videoSettings;
+bool videoSettingsDirty;
+
 SDL_AudioDeviceID audioDevice;
 int audioFreq;
 SDL_cond* audioSync;
@@ -251,9 +255,7 @@ EmuThread::EmuThread(QObject* parent) : QThread(parent)
     EmuRunning = 2;
     RunningSomething = false;
 
-    //connect(this, SIGNAL(windowUpdate()), mainWindow, SLOT(update()));
     connect(this, SIGNAL(windowUpdate()), mainWindow->panel, SLOT(update()));
-    //connect(this, SIGNAL(windowUpdate()), mainWindow, SLOT(repaint()));
     connect(this, SIGNAL(windowTitleChange(QString)), mainWindow, SLOT(onTitleUpdate(QString)));
     connect(this, SIGNAL(windowEmuStart()), mainWindow, SLOT(onEmuStart()));
     connect(this, SIGNAL(windowEmuStop()), mainWindow, SLOT(onEmuStop()));
@@ -312,6 +314,7 @@ void* EmuThread::oglGetProcAddress(const char* proc)
 
 void EmuThread::run()
 {
+    bool hasOGL = mainWindow->hasOGL;
     u32 mainScreenPos[3];
 
     NDS::Init();
@@ -321,20 +324,20 @@ void EmuThread::run()
     mainScreenPos[2] = 0;
     autoScreenSizing = 0;
 
-    /*if (Screen_UseGL)
-    {
-        uiGLMakeContextCurrent(GLContext);
-        GPU3D::InitRenderer(true);
-        uiGLMakeContextCurrent(NULL);
-    }
-    else*/
+    videoSettingsDirty = false;
+    videoSettings.Soft_Threaded = Config::Threaded3D != 0;
+    videoSettings.GL_ScaleFactor = Config::GL_ScaleFactor;
+
+    if (hasOGL)
     {
-        //GPU3D::InitRenderer(false);
-        bool res = oglContext->makeCurrent(oglSurface);
-        printf("good? %d\n", res);
-        OpenGL::Init();
-        GPU3D::InitRenderer(res);
+        oglContext->makeCurrent(oglSurface);
+        videoRenderer = OpenGL::Init() ? Config::_3DRenderer : 0;
     }
+    else
+        videoRenderer = 0;
+
+    GPU::InitRenderer(videoRenderer);
+    GPU::SetRenderSettings(videoRenderer, videoSettings);
 
     Input::Init();
 
@@ -377,6 +380,29 @@ void EmuThread::run()
         {
             EmuStatus = 1;
 
+            // update render settings if needed
+            if (videoSettingsDirty)
+            {
+                if (hasOGL != mainWindow->hasOGL)
+                {
+                    hasOGL = mainWindow->hasOGL;
+                    if (hasOGL)
+                    {
+                        oglContext->makeCurrent(oglSurface);
+                        videoRenderer = OpenGL::Init() ? Config::_3DRenderer : 0;
+                    }
+                    else
+                        videoRenderer = 0;
+                }
+                else
+                    videoRenderer = hasOGL ? Config::_3DRenderer : 0;
+
+                videoSettingsDirty = false;
+                videoSettings.Soft_Threaded = Config::Threaded3D != 0;
+                videoSettings.GL_ScaleFactor = Config::GL_ScaleFactor;
+                GPU::SetRenderSettings(videoRenderer, videoSettings);
+            }
+
             // process input and hotkeys
             NDS::SetKeyMask(Input::InputMask);
 
@@ -390,12 +416,6 @@ void EmuThread::run()
             // microphone input
             micProcess();
 
-            /*if (Screen_UseGL)
-            {
-                uiGLBegin(GLContext);
-                uiGLMakeContextCurrent(GLContext);
-            }*/
-
             // auto screen layout
             if (Config::ScreenSizing == 3)
             {
@@ -435,12 +455,6 @@ void EmuThread::run()
 
             if (EmuRunning == 0) break;
 
-            /*if (Screen_UseGL)
-            {
-                GLScreen_DrawScreen();
-                uiGLEnd(GLContext);
-            }
-            uiAreaQueueRedrawAll(MainDrawArea);*/
             emit windowUpdate();
 
             bool fastforward = Input::HotkeyDown(HK_FastForward);
@@ -513,18 +527,8 @@ void EmuThread::run()
             lastmeasuretick = lasttick;
             fpslimitcount = 0;
 
-            /*if (Screen_UseGL)
-            {
-                uiGLBegin(GLContext);
-                uiGLMakeContextCurrent(GLContext);
-                GLScreen_DrawScreen();
-                uiGLEnd(GLContext);
-            }
-            uiAreaQueueRedrawAll(MainDrawArea);*/
             emit windowUpdate();
 
-            //if (Screen_UseGL) uiGLMakeContextCurrent(NULL);
-
             EmuStatus = EmuRunning;
 
             sprintf(melontitle, "melonDS " MELONDS_VERSION);
@@ -536,8 +540,7 @@ void EmuThread::run()
 
     EmuStatus = 0;
 
-    //if (Screen_UseGL) uiGLMakeContextCurrent(GLContext);
-
+    GPU::DeInitRenderer();
     NDS::DeInit();
     //Platform::LAN_DeInit();
 
@@ -549,7 +552,8 @@ void EmuThread::run()
     else
         OSD::DeInit(false);*/
 
-    //if (Screen_UseGL) uiGLMakeContextCurrent(NULL);
+    if (hasOGL)
+        oglContext->doneCurrent();
 }
 
 void EmuThread::changeWindowTitle(char* title)
@@ -794,6 +798,7 @@ ScreenPanelGL::ScreenPanelGL(QWidget* parent) : QOpenGLWidget(parent)
 ScreenPanelGL::~ScreenPanelGL()
 {
     // CHECKME!!!!
+    // ALSO TODO: CLEANUP
     delete screenShader;
 }
 
@@ -888,7 +893,7 @@ void ScreenPanelGL::paintGL()
     int frontbuf = GPU::FrontBuffer;
     glActiveTexture(GL_TEXTURE0);
 
-    if (true)
+    if (GPU::Renderer != 0)
     {
         // hardware-accelerated render
         GPU::GLCompositor::BindOutputTexture();
@@ -1162,11 +1167,8 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent)
     }
     setMenuBar(menubar);
 
-    //panel = new ScreenPanelNative(this);
-    panel = new ScreenPanelGL(this);
-    setCentralWidget(panel);
-    connect(this, SIGNAL(screenLayoutChange()), panel, SLOT(onScreenLayoutChanged()));
-    emit screenLayoutChange();
+    show();
+    createScreenPanel();
 
     resize(Config::WindowWidth, Config::WindowHeight);
 
@@ -1210,9 +1212,45 @@ MainWindow::~MainWindow()
 {
 }
 
+void MainWindow::createScreenPanel()
+{
+    hasOGL = (Config::ScreenUseGL != 0) || (Config::_3DRenderer != 0);
+
+    if (hasOGL)
+    {
+        ScreenPanelGL* panelGL = new ScreenPanelGL(this);
+        panelGL->show();
+
+        if (!panelGL->isValid())
+            hasOGL = false;
+        else
+        {
+            QSurfaceFormat fmt = panelGL->format();
+            if (fmt.majorVersion() < 3 || (fmt.majorVersion() == 3 && fmt.minorVersion() < 2))
+                hasOGL = false;
+        }
+
+        if (!hasOGL)
+            delete panelGL;
+        else
+            panel = panelGL;
+    }
+
+    if (!hasOGL)
+    {
+        panel = new ScreenPanelNative(this);
+        panel->show();
+    }
+
+    setCentralWidget(panel);
+    connect(this, SIGNAL(screenLayoutChange()), panel, SLOT(onScreenLayoutChanged()));
+    emit screenLayoutChange();
+}
+
 QOpenGLContext* MainWindow::getOGLContext()
 {
-    // TODO: check whether we can actually pull this!
+    if (!hasOGL) return nullptr;
+
     QOpenGLWidget* glpanel = (QOpenGLWidget*)panel;
     return glpanel->context();
 }
@@ -1575,6 +1613,7 @@ void MainWindow::onInputConfigFinished(int res)
 void MainWindow::onOpenVideoSettings()
 {
     VideoSettingsDialog* dlg = VideoSettingsDialog::openDlg(this);
+    connect(dlg, &VideoSettingsDialog::updateVideoSettings, this, &MainWindow::onUpdateVideoSettings);
 }
 
 void MainWindow::onOpenAudioSettings()
@@ -1745,6 +1784,23 @@ void MainWindow::onEmuStop()
     actStop->setEnabled(false);
 }
 
+void MainWindow::onUpdateVideoSettings(bool glchange)
+{
+    if (glchange)
+    {
+        emuThread->emuPause();
+
+        delete panel;
+        createScreenPanel();
+        connect(emuThread, SIGNAL(windowUpdate()), panel, SLOT(update()));
+    }
+
+    videoSettingsDirty = true;
+
+    if (glchange)
+        emuThread->emuUnpause();
+}
+
 
 void emuStop()
 {
@@ -1790,6 +1846,9 @@ int main(int argc, char** argv)
     Config::Load();
 
 #define SANITIZE(var, min, max)  { if (var < min) var = min; else if (var > max) var = max; }
+    SANITIZE(Config::_3DRenderer, 0, 1);
+    SANITIZE(Config::ScreenVSyncInterval, 1, 20);
+    SANITIZE(Config::GL_ScaleFactor, 1, 16);
     SANITIZE(Config::AudioVolume, 0, 256);
     SANITIZE(Config::MicInputType, 0, 3);
     SANITIZE(Config::ScreenRotation, 0, 3);
@@ -1900,7 +1959,6 @@ int main(int argc, char** argv)
     Input::OpenJoystick();
 
     mainWindow = new MainWindow();
-    mainWindow->show();
 
     emuThread = new EmuThread();
     emuThread->start();
diff --git a/src/frontend/qt_sdl/main.h b/src/frontend/qt_sdl/main.h
index 8759e95..ef51158 100644
--- a/src/frontend/qt_sdl/main.h
+++ b/src/frontend/qt_sdl/main.h
@@ -171,6 +171,7 @@ public:
     explicit MainWindow(QWidget* parent = nullptr);
     ~MainWindow();
 
+    bool hasOGL;
     QOpenGLContext* getOGLContext();
 
 protected:
@@ -221,7 +222,11 @@ private slots:
     void onEmuStart();
     void onEmuStop();
 
+    void onUpdateVideoSettings(bool glchange);
+
 private:
+    void createScreenPanel();
+
     QString loadErrorStr(int error);
 
 public: