From e7025abcdc81f558706204375b753aad77490147 Mon Sep 17 00:00:00 2001
From: Arisotura <thetotalworm@gmail.com>
Date: Mon, 24 Aug 2020 19:32:07 +0200
Subject: * fix build error * make betterer polygon splitting an option * add
 GL_LEQUAL depth test for 'equal' mode, might help

---
 src/frontend/qt_sdl/PlatformConfig.cpp      |  4 ++--
 src/frontend/qt_sdl/PlatformConfig.h        |  2 +-
 src/frontend/qt_sdl/VideoSettingsDialog.cpp |  7 +++++++
 src/frontend/qt_sdl/VideoSettingsDialog.h   |  1 +
 src/frontend/qt_sdl/VideoSettingsDialog.ui  | 12 +++++++++++-
 src/frontend/qt_sdl/main.cpp                |  3 +++
 6 files changed, 25 insertions(+), 4 deletions(-)

(limited to 'src/frontend/qt_sdl')

diff --git a/src/frontend/qt_sdl/PlatformConfig.cpp b/src/frontend/qt_sdl/PlatformConfig.cpp
index 76c5f4b..0628eaa 100644
--- a/src/frontend/qt_sdl/PlatformConfig.cpp
+++ b/src/frontend/qt_sdl/PlatformConfig.cpp
@@ -51,7 +51,7 @@ int _3DRenderer;
 int Threaded3D;
 
 int GL_ScaleFactor;
-int GL_Antialias;
+int GL_BetterPolygons;
 
 int LimitFPS;
 int AudioSync;
@@ -143,7 +143,7 @@ ConfigEntry PlatformConfigFile[] =
     {"Threaded3D", 0, &Threaded3D, 1, NULL, 0},
 
     {"GL_ScaleFactor", 0, &GL_ScaleFactor, 1, NULL, 0},
-    {"GL_Antialias", 0, &GL_Antialias, 0, NULL, 0},
+    {"GL_BetterPolygons", 0, &GL_BetterPolygons, 0, NULL, 0},
 
     {"LimitFPS", 0, &LimitFPS, 0, NULL, 0},
     {"AudioSync", 0, &AudioSync, 1, NULL, 0},
diff --git a/src/frontend/qt_sdl/PlatformConfig.h b/src/frontend/qt_sdl/PlatformConfig.h
index bc9bba4..9deee7f 100644
--- a/src/frontend/qt_sdl/PlatformConfig.h
+++ b/src/frontend/qt_sdl/PlatformConfig.h
@@ -64,7 +64,7 @@ extern int _3DRenderer;
 extern int Threaded3D;
 
 extern int GL_ScaleFactor;
-extern int GL_Antialias;
+extern int GL_BetterPolygons;
 
 extern int LimitFPS;
 extern int AudioSync;
diff --git a/src/frontend/qt_sdl/VideoSettingsDialog.cpp b/src/frontend/qt_sdl/VideoSettingsDialog.cpp
index ba433c3..ac1ed7a 100644
--- a/src/frontend/qt_sdl/VideoSettingsDialog.cpp
+++ b/src/frontend/qt_sdl/VideoSettingsDialog.cpp
@@ -167,3 +167,10 @@ void VideoSettingsDialog::on_cbxGLResolution_currentIndexChanged(int idx)
 
     emit updateVideoSettings(false);
 }
+
+void VideoSettingsDialog::on_cbBetterPolygons_stateChanged(int state)
+{
+    Config::GL_BetterPolygons = (state != 0);
+
+    emit updateVideoSettings(false);
+}
diff --git a/src/frontend/qt_sdl/VideoSettingsDialog.h b/src/frontend/qt_sdl/VideoSettingsDialog.h
index 2311d4d..f18793c 100644
--- a/src/frontend/qt_sdl/VideoSettingsDialog.h
+++ b/src/frontend/qt_sdl/VideoSettingsDialog.h
@@ -64,6 +64,7 @@ private slots:
     void on_sbVSyncInterval_valueChanged(int val);
 
     void on_cbxGLResolution_currentIndexChanged(int idx);
+    void on_cbBetterPolygons_stateChanged(int state);
 
     void on_cbSoftwareThreaded_stateChanged(int state);
 
diff --git a/src/frontend/qt_sdl/VideoSettingsDialog.ui b/src/frontend/qt_sdl/VideoSettingsDialog.ui
index 6cdd5d8..6985304 100644
--- a/src/frontend/qt_sdl/VideoSettingsDialog.ui
+++ b/src/frontend/qt_sdl/VideoSettingsDialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>482</width>
-    <height>237</height>
+    <height>244</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -43,6 +43,16 @@
         </property>
        </widget>
       </item>
+      <item row="2" column="0">
+       <widget class="QCheckBox" name="cbBetterPolygons">
+        <property name="whatsThis">
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enabling this may help reduce distortion on quads and more complex polygons, but may also reduce performance.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
+        <property name="text">
+         <string>Improved polygon splitting</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
diff --git a/src/frontend/qt_sdl/main.cpp b/src/frontend/qt_sdl/main.cpp
index 0228399..1e7e4a6 100644
--- a/src/frontend/qt_sdl/main.cpp
+++ b/src/frontend/qt_sdl/main.cpp
@@ -405,8 +405,11 @@ void EmuThread::run()
                     videoRenderer = hasOGL ? Config::_3DRenderer : 0;
 
                 videoSettingsDirty = false;
+
                 videoSettings.Soft_Threaded = Config::Threaded3D != 0;
                 videoSettings.GL_ScaleFactor = Config::GL_ScaleFactor;
+                videoSettings.GL_BetterPolygons = Config::GL_BetterPolygons;
+
                 GPU::SetRenderSettings(videoRenderer, videoSettings);
             }
 
-- 
cgit v1.2.3