File melonds_compatibility-fixes-for-HSR-and-CSR-reb... of Package melonds

Overview Repositories Revisions Requests Users Attributes Meta

File melonds_compatibility-fixes-for-HSR-and-CSR-rebase.patch of Package melonds (Revision 16619c5af35c5d59dc97df69bc9ecd0e)

Currently displaying revision 16619c5af35c5d59dc97df69bc9ecd0e , Show latest

From b4ba1c32f69fac200fcc59c75ae69dfc096412f6 Mon Sep 17 00:00:00 2001
From: v-fox <virtuousfox@gmail.com>
Date: Mon, 18 Sep 2023 01:58:58 +0500
Subject: [PATCH] compatibility fixes for HSR and CSR rebase

diff --git a/src/GPU2D_Soft.h b/src/GPU2D_Soft.h
index 6f0098c..878207b 100644
--- a/src/GPU2D_Soft.h
+++ b/src/GPU2D_Soft.h
@@ -32,6 +32,8 @@ public:
     void DrawScanline(u32 line, Unit* unit) override;
     void DrawSprites(u32 line, Unit* unit) override;
     void VBlankEnd(Unit* unitA, Unit* unitB) override;
+    
+    virtual void SetRenderSettings(int scale) override;
 private:
     u32* BGOBJLine;
     u32* _3DLine;
diff --git a/src/GPU3D.cpp b/src/GPU3D.cpp
index 57f20c1..6d17669 100644
--- a/src/GPU3D.cpp
+++ b/src/GPU3D.cpp
@@ -516,7 +516,7 @@ void DoSavestate(Savestate* file)
 
         file->Bool32(&vtx->Clipped);
 
-        if (file->IsAtleastVersion(7, 3))
+        if (file->IsAtLeastVersion(10, 3))
         {
             file->VarArray(vtx->HiresPosition, sizeof(s32)*2);
             vtx->FinalPosition[0] = (vtx->HiresPosition[0] * GPU::ScaleFactor) >> HD_SHIFT;
@@ -576,7 +576,7 @@ void DoSavestate(Savestate* file)
         else
             poly->Type = 0;
 
-        if (!file->IsAtleastVersion(10, 3))
+        if (!file->IsAtLeastVersion(10, 3))
         {
             poly->Degenerate = false;
             file->Var32(&poly->VTop);
@@ -2668,10 +2668,6 @@ u32* GetLine(int line)
             }
         }
     }
-    else
-    {
-        memset(ScrolledLine, 0, sizeof(ScrolledLine));
-    }
 
     return ScrolledLine.data();
 }
diff --git a/src/frontend/FrontendUtil.h b/src/frontend/FrontendUtil.h
index 5665497..539737e 100644
--- a/src/frontend/FrontendUtil.h
+++ b/src/frontend/FrontendUtil.h
@@ -70,6 +70,7 @@ void SetupScreenLayout(int screenWidth, int screenHeight,
     ScreenRotation rotation,
     ScreenSizing sizing,
     int screenGap,
+    int scaleFactor,
     bool integerScale,
     bool swapScreens,
     float topAspect, float botAspect);
@@ -117,4 +118,3 @@ void Mic_SetExternalBuffer(s16* buffer, u32 len);
 }
 
 #endif // FRONTENDUTIL_H
-    int scaleFactor,
diff --git a/src/frontend/qt_sdl/VideoSettingsDialog.cpp b/src/frontend/qt_sdl/VideoSettingsDialog.cpp
index a439c6d..422dd83 100644
--- a/src/frontend/qt_sdl/VideoSettingsDialog.cpp
+++ b/src/frontend/qt_sdl/VideoSettingsDialog.cpp
@@ -111,6 +111,7 @@ void VideoSettingsDialog::on_VideoSettingsDialog_accepted()
 void VideoSettingsDialog::on_VideoSettingsDialog_rejected()
 {
     bool old_gl = UsesGL();
+    int old_scale = Config::ScaleFactor;
 
     Config::_3DRenderer = oldRenderer;
     Config::ScreenUseGL = oldGLDisplay;
@@ -121,7 +122,7 @@ void VideoSettingsDialog::on_VideoSettingsDialog_rejected()
     Config::GL_BetterPolygons = oldGLBetterPolygons;
     Config::GL_HiresCoordinates = oldHiresCoordinates;
 
-    emit updateVideoSettings(old_gl != UsesGL || old_scale != Config::ScaleFactor);
+    emit updateVideoSettings(old_gl != UsesGL() || old_scale != Config::ScaleFactor);
 
     closeDlg();
 }
diff --git a/src/frontend/qt_sdl/VideoSettingsDialog.ui b/src/frontend/qt_sdl/VideoSettingsDialog.ui
index 973a55a..55704ad 100644
--- a/src/frontend/qt_sdl/VideoSettingsDialog.ui
+++ b/src/frontend/qt_sdl/VideoSettingsDialog.ui
@@ -32,28 +32,11 @@
       <string>OpenGL renderer</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_4">
-      <item row="0" column="0">
+      <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>
-       <widget class="QLabel" name="label_3">
-        <property name="text">
-         <string>Internal resolution:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-        <property name="text">
-         <string>Improved polygon splitting</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QComboBox" name="cbxResolution">
-        <property name="whatsThis">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The resolution at which the 3D graphics will be rendered. Higher resolutions improve graphics quality when the main window is enlarged, but may also cause glitches.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-        </property>
        </widget>
       </item>
       <item row="3" column="0">
@@ -115,38 +98,6 @@
         </property>
        </widget>
       </item>
-      <item row="7" column="0" colspan="2">
-       <spacer name="verticalSpacer">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Fixed</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="6" column="0">
-       <widget class="QLabel" name="label_2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="whatsThis">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The interval at which to synchronize to the monitor's refresh rate. Set to 1 for a 60Hz monitor, 2 for 120Hz, ...&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-        </property>
-        <property name="text">
-         <string>VSync interval:</string>
-        </property>
-       </widget>
-      </item>
       <item row="7" column="1">
        <widget class="QSpinBox" name="sbVSyncInterval">
         <property name="whatsThis">
diff --git a/src/frontend/qt_sdl/main.cpp b/src/frontend/qt_sdl/main.cpp
index 47c09d6..41f774e 100644
--- a/src/frontend/qt_sdl/main.cpp
+++ b/src/frontend/qt_sdl/main.cpp
@@ -287,7 +287,7 @@ void EmuThread::initOpenGL()
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, screenWidth, paddedHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
     // fill the padding
-    u8 zeroData[screenWidth*4*4];
+    u8* zeroData = new u8[screenWidth*4*4];
     memset(zeroData, 0, screenWidth*4*4);
     glTexSubImage2D(GL_TEXTURE_2D, 0, 0, screenHeight, screenWidth, 2, GL_RGBA, GL_UNSIGNED_BYTE, zeroData);
     delete[] zeroData;
@@ -1053,6 +1053,7 @@ void ScreenPanelNative::paintEvent(QPaintEvent* event)
     // fill background
     painter.fillRect(event->rect(), QColor::fromRgb(0, 0, 0));
 
+    bool locked = false;
     if (emuThread->emuIsActive())
     {
         emuThread->FrontBufferLock.lock(); locked = true;
diff --git a/src/frontend/qt_sdl/main.h b/src/frontend/qt_sdl/main.h
index 0ab2765..83fe30d 100644
--- a/src/frontend/qt_sdl/main.h
+++ b/src/frontend/qt_sdl/main.h
@@ -89,9 +89,6 @@ signals:
 
     void syncVolumeLevel();
 
-    bool hasOGL;
-
-    void updateDisplay(bool forceInit = false);
 private:
     void drawScreenGL();
     void initOpenGL();
@@ -122,6 +119,8 @@ private:
     std::atomic<ContextRequestKind> ContextRequest = contextRequest_None;
 
     GL::Context* oglContext = nullptr;
+    bool hasOGL;
+    void updateDisplay(bool forceInit = false);
     GLuint screenVertexBuffer, screenVertexArray;
     GLuint screenTexture;
     GLuint screenShaderProgram;
-- 
2.42.0

Places

File melonds_compatibility-fixes-for-HSR-and-CSR-rebase.patch of Package melonds (Revision 16619c5af35c5d59dc97df69bc9ecd0e)

Places