iMMI: Unbreak PMSUBW, PMULTW, and PMADDUW

Fixes: 9c61053fe0

.clang-format

@@ -86,5 +86,5 @@ SpacesInParentheses: false
 SpacesInSquareBrackets: false
 Standard:        Cpp11
 TabWidth:        4
-UseTab:          ForContinuationAndIndentation
+UseTab:          AlignWithSpaces
 ...

.github/workflows/cron_update_base_translation.yml

@@ -11,7 +11,7 @@ jobs:
     name: "Update Base Translation"
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Update Base Translation
         run: ./.github/workflows/scripts/common/update_base_translation.sh

.github/workflows/cron_update_controller_db.yml

@@ -9,7 +9,7 @@ jobs:
     if: github.repository == 'PCSX2/pcsx2'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Get Latest DB and Prepare DB File
         run: |

.github/workflows/lint_gamedb.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Install Packages
         run: |

.github/workflows/linux_build_flatpak.yml

@@ -51,7 +51,7 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           set-safe-directory: ${{ env.GITHUB_WORKSPACE }}
           # 10 here, since the odds of having 10 untagged commits in a row should be slim to none

.github/workflows/linux_build_qt.yml

@@ -59,7 +59,7 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
            fetch-depth: 0
 

.github/workflows/macos_build.yml

@@ -48,7 +48,7 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       # actions/checkout elides tags, fetch them primarily for releases
       - name: Fetch Tags

.github/workflows/release_cut_new.yml

@@ -35,7 +35,7 @@ jobs:
     outputs:
       new_tag: ${{ steps.tag_version.outputs.new_tag }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       # Docs - https://github.com/mathieudutour/github-tag-action
       - name: Bump Version and Push Tag
@@ -163,12 +163,12 @@ jobs:
     name: "Upload Artifacts"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Prepare Artifact Folder
         run: mkdir ./ci-artifacts/
 
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
         name: Download all Artifacts
         with:
           path: ./ci-artifacts/

.github/workflows/scripts/linux/appimage-qt.sh

@@ -41,8 +41,13 @@ BINARY=pcsx2-qt
 APPDIRNAME=PCSX2.AppDir
 STRIP=strip
 
+# Need both libharfbuzz.so and libharfbuzz.so.0 for bundled libs
+
 declare -a MANUAL_LIBS=(
 	"libshaderc_shared.so.1"
+	"libharfbuzz.so.0"
+	"libharfbuzz.so"
+	"libfreetype.so.6"
 )
 
 declare -a REMOVE_LIBS=(
@@ -75,22 +80,29 @@ fi
 OUTDIR=$(realpath "./$APPDIRNAME")
 rm -fr "$OUTDIR"
 
+# Our deps build dosn't create libharfbuzz.so.0, so we have to symlink it here
+hbpath=$(find "$DEPSDIR" -name "libharfbuzz.so")
+if [ ! -f "$hbpath" ]; then
+	echo "Missing harfbuzz. Exiting."
+	exit 1
+fi
+
+if [ ! -f "$hbpath.0" ]; then
+	echo "Symlinking libharfbuzz.so.0"
+	ln -s "$hbpath" "$hbpath.0"
+fi
+
 echo "Locating extra libraries..."
-EXTRA_LIBS_ARGS=""
+EXTRA_LIBS_ARGS=()
 for lib in "${MANUAL_LIBS[@]}"; do
 	srcpath=$(find "$DEPSDIR" -name "$lib")
 	if [ ! -f "$srcpath" ]; then
-		echo "Missinge extra library $lib. Exiting."
+		echo "Missing extra library $lib. Exiting."
 		exit 1
 	fi
 
 	echo "Found $lib at $srcpath."
-
-	if [ "$EXTRA_LIBS_ARGS" == "" ]; then
-		EXTRA_LIBS_ARGS="--library=$srcpath"
-	else
-		EXTRA_LIBS_ARGS="$EXTRA_LIBS_ARGS,$srcpath"
-	fi
+	EXTRA_LIBS_ARGS+=( "--library=$srcpath" )
 done
 
 # Why the nastyness? linuxdeploy strips our main binary, and there's no option to turn it off.
@@ -122,7 +134,7 @@ EXTRA_PLATFORM_PLUGINS="libqwayland-egl.so;libqwayland-generic.so" \
 DEPLOY_PLATFORM_THEMES="1" \
 QMAKE="$DEPSDIR/bin/qmake" \
 NO_STRIP="1" \
-$LINUXDEPLOY --plugin qt --appdir="$OUTDIR" --executable="$BUILDDIR/bin/pcsx2-qt" $EXTRA_LIBS_ARGS \
+$LINUXDEPLOY --plugin qt --appdir="$OUTDIR" --executable="$BUILDDIR/bin/pcsx2-qt" ${EXTRA_LIBS_ARGS[@]} \
 --desktop-file="net.pcsx2.PCSX2.desktop" --icon-file="PCSX2.png"
 
 echo "Copying resources into AppDir..."

.github/workflows/scripts/linux/build-dependencies-qt.sh

@@ -14,16 +14,18 @@ if [ "${INSTALLDIR:0:1}" != "/" ]; then
 	INSTALLDIR="$PWD/$INSTALLDIR"
 fi
 
+FREETYPE=2.13.3
+HARFBUZZ=11.2.0
 LIBBACKTRACE=ad106d5fdd5d960bd33fae1c48a351af567fd075
 LIBJPEGTURBO=3.1.1
 LIBPNG=1.6.50
-LIBWEBP=1.5.0
-SDL=SDL3-3.2.18
+LIBWEBP=1.6.0
+SDL=SDL3-3.2.20
 QT=6.9.1
 LZ4=1.10.0
 ZSTD=1.5.7
 KDDOCKWIDGETS=2.2.3
-PLUTOVG=1.1.0
+PLUTOVG=1.3.0
 PLUTOSVG=0.0.7
 
 SHADERC=2025.3
@@ -35,11 +37,13 @@ mkdir -p deps-build
 cd deps-build
 
 cat > SHASUMS <<EOF
+0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289  freetype-$FREETYPE.tar.xz
+16c0204704f3ebeed057aba100fe7db18d71035505cb10e595ea33d346457fc8  harfbuzz-$HARFBUZZ.tar.gz
 fd6f417fe9e3a071cf1424a5152d926a34c4a3c5070745470be6cf12a404ed79  $LIBBACKTRACE.zip
 aadc97ea91f6ef078b0ae3a62bba69e008d9a7db19b34e4ac973b19b71b4217c  libjpeg-turbo-$LIBJPEGTURBO.tar.gz
 4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307  libpng-$LIBPNG.tar.xz
-7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c  libwebp-$LIBWEBP.tar.gz
-1a775bde924397a8e0c08bfda198926c17be859d0288ad0dec1dea1b2ee04f8f  $SDL.tar.gz
+e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564  libwebp-$LIBWEBP.tar.gz
+467600ae090dd28616fa37369faf4e3143198ff1da37729b552137e47f751a67  $SDL.tar.gz
 537512904744b35e232912055ccf8ec66d768639ff3abe5788d90d792ec5f48b  lz4-$LZ4.tar.gz
 eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3  zstd-$ZSTD.tar.gz
 40caedbf83cc9a1959610830563565889878bc95f115868bbf545d1914acf28e  qtbase-everywhere-src-$QT.tar.xz
@@ -53,11 +57,13 @@ a8e4a25e5c2686fd36981e527ed05e451fcfc226bddf350f4e76181371190937  shaderc-$SHADE
 c2225a49c3d7efa5c4f4ce4a6b42081e6ea3daca376f3353d9d7c2722d77a28a  shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz
 44d1005880c583fc00a0fb41c839214c68214b000ea8dcb54d352732fee600ff  shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz
 b8529755b2d54205341766ae168e83177c6120660539f9afba71af6bca4b81ec  KDDockWidgets-$KDDOCKWIDGETS.tar.gz
-8aa9860519c407890668c29998e8bb88896ef6a2e6d7ce5ac1e57f18d79e1525  plutovg-$PLUTOVG.tar.gz
+4b08587d782f6858e6cb815b455fd7238f45190a57094857a3123883ecb595eb  plutovg-$PLUTOVG.tar.gz
 78561b571ac224030cdc450ca2986b4de915c2ba7616004a6d71a379bffd15f3  plutosvg-$PLUTOSVG.tar.gz
 EOF
 
 curl -L \
+	-o "freetype-$FREETYPE.tar.xz" "https://sourceforge.net/projects/freetype/files/freetype2/$FREETYPE/freetype-$FREETYPE.tar.xz/download" \
+	-o "harfbuzz-$HARFBUZZ.tar.gz" "https://github.com/harfbuzz/harfbuzz/archive/refs/tags/$HARFBUZZ.tar.gz" \
 	-O "https://github.com/ianlancetaylor/libbacktrace/archive/$LIBBACKTRACE.zip" \
 	-O "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/$LIBJPEGTURBO/libjpeg-turbo-$LIBJPEGTURBO.tar.gz" \
 	-O "https://downloads.sourceforge.net/project/libpng/libpng16/$LIBPNG/libpng-$LIBPNG.tar.xz" \
@@ -137,6 +143,33 @@ cmake --build build --parallel
 ninja -C build install
 cd ..
 
+echo "Building FreeType without HarfBuzz..."
+rm -fr "freetype-$FREETYPE"
+tar xf "freetype-$FREETYPE.tar.xz"
+cd "freetype-$FREETYPE"
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DFT_REQUIRE_ZLIB=ON -DFT_REQUIRE_PNG=ON -DFT_DISABLE_BZIP2=TRUE -DFT_DISABLE_BROTLI=TRUE -DFT_DISABLE_HARFBUZZ=TRUE -B build -G Ninja
+cmake --build build --parallel
+ninja -C build install
+cd ..
+
+echo "Building HarfBuzz..."
+rm -fr "harfbuzz-$HARFBUZZ"
+tar xf "harfbuzz-$HARFBUZZ.tar.gz"
+cd "harfbuzz-$HARFBUZZ"
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DHB_BUILD_UTILS=OFF -DHB_HAVE_FREETYPE=ON -B build -G Ninja
+cmake --build build --parallel
+ninja -C build install
+cd ..
+
+echo "Building FreeType with HarfBuzz..."
+rm -fr "freetype-$FREETYPE"
+tar xf "freetype-$FREETYPE.tar.xz"
+cd "freetype-$FREETYPE"
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DFT_REQUIRE_ZLIB=ON -DFT_REQUIRE_PNG=ON -DFT_DISABLE_BZIP2=TRUE -DFT_DISABLE_BROTLI=TRUE -DFT_REQUIRE_HARFBUZZ=TRUE -B build -G Ninja
+cmake --build build --parallel
+ninja -C build install
+cd ..
+
 echo "Building SDL..."
 rm -fr "$SDL"
 tar xf "$SDL.tar.gz"
@@ -240,7 +273,7 @@ echo "Building PlutoSVG..."
 rm -fr "plutosvg-$PLUTOSVG"
 tar xf "plutosvg-$PLUTOSVG.tar.gz"
 cd "plutosvg-$PLUTOSVG"
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DPLUTOSVG_ENABLE_FREETYPE=OFF -DPLUTOSVG_BUILD_EXAMPLES=OFF -B build -G Ninja
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DPLUTOSVG_ENABLE_FREETYPE=ON -DPLUTOSVG_BUILD_EXAMPLES=OFF -B build -G Ninja
 cmake --build build --parallel
 ninja -C build install
 cd ..

.github/workflows/scripts/linux/flatpak/modules/20-sdl3.json

@@ -14,8 +14,8 @@
   "sources": [
     {
       "type": "archive",
-      "url": "https://libsdl.org/release/SDL3-3.2.18.tar.gz",
-      "sha256": "1a775bde924397a8e0c08bfda198926c17be859d0288ad0dec1dea1b2ee04f8f"
+      "url": "https://libsdl.org/release/SDL3-3.2.20.tar.gz",
+      "sha256": "467600ae090dd28616fa37369faf4e3143198ff1da37729b552137e47f751a67"
     }
   ],
   "cleanup": [

.github/workflows/scripts/linux/flatpak/modules/24-plutovg.json

@@ -13,8 +13,8 @@
     {
       "type": "git",
       "url": "https://github.com/sammycage/plutovg.git",
-      "tag": "v1.1.0",
-      "commit": "1a8412d0574c4345dd7ef8a91ce7b58c7dcfe253"
+      "tag": "v1.3.0",
+      "commit": "1596f459d6796b37f3f6d610ce598de2403350b5"
     }
   ],
   "cleanup": [

.github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.json

@@ -1,7 +1,7 @@
 {
   "app-id": "net.pcsx2.PCSX2",
   "runtime": "org.kde.Platform",
-  "runtime-version": "6.8",
+  "runtime-version": "6.9",
   "sdk": "org.kde.Sdk",
   "sdk-extensions": [
     "org.freedesktop.Sdk.Extension.llvm18"

.github/workflows/scripts/macos/build-dependencies-universal.sh

@@ -40,17 +40,17 @@ fi
 
 FREETYPE=2.13.3
 HARFBUZZ=11.2.0
-SDL=SDL3-3.2.18
+SDL=SDL3-3.2.20
 ZSTD=1.5.7
 LZ4=1.10.0
 LIBPNG=1.6.50
 LIBJPEGTURBO=3.1.1
-LIBWEBP=1.5.0
+LIBWEBP=1.6.0
 FFMPEG=6.0
 MOLTENVK=1.2.9
 QT=6.7.3
 KDDOCKWIDGETS=2.2.3
-PLUTOVG=1.1.0
+PLUTOVG=1.3.0
 PLUTOSVG=0.0.7
 
 SHADERC=2025.3
@@ -79,11 +79,11 @@ CMAKE_ARCH_UNIVERSAL=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"
 cat > SHASUMS <<EOF
 0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289  freetype-$FREETYPE.tar.xz
 16c0204704f3ebeed057aba100fe7db18d71035505cb10e595ea33d346457fc8  harfbuzz-$HARFBUZZ.tar.gz
-1a775bde924397a8e0c08bfda198926c17be859d0288ad0dec1dea1b2ee04f8f  $SDL.tar.gz
+467600ae090dd28616fa37369faf4e3143198ff1da37729b552137e47f751a67  $SDL.tar.gz
 eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3  zstd-$ZSTD.tar.gz
 537512904744b35e232912055ccf8ec66d768639ff3abe5788d90d792ec5f48b  lz4-$LZ4.tar.gz
 4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307  libpng-$LIBPNG.tar.xz
-7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c  libwebp-$LIBWEBP.tar.gz
+e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564  libwebp-$LIBWEBP.tar.gz
 aadc97ea91f6ef078b0ae3a62bba69e008d9a7db19b34e4ac973b19b71b4217c  libjpeg-turbo-$LIBJPEGTURBO.tar.gz
 57be87c22d9b49c112b6d24bc67d42508660e6b718b3db89c44e47e289137082  ffmpeg-$FFMPEG.tar.xz
 f415a09385030c6510a936155ce211f617c31506db5fbc563e804345f1ecf56e  v$MOLTENVK.tar.gz
@@ -97,7 +97,7 @@ a8e4a25e5c2686fd36981e527ed05e451fcfc226bddf350f4e76181371190937  shaderc-$SHADE
 c2225a49c3d7efa5c4f4ce4a6b42081e6ea3daca376f3353d9d7c2722d77a28a  shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz
 44d1005880c583fc00a0fb41c839214c68214b000ea8dcb54d352732fee600ff  shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz
 b8529755b2d54205341766ae168e83177c6120660539f9afba71af6bca4b81ec  KDDockWidgets-$KDDOCKWIDGETS.tar.gz
-8aa9860519c407890668c29998e8bb88896ef6a2e6d7ce5ac1e57f18d79e1525  plutovg-$PLUTOVG.tar.gz
+4b08587d782f6858e6cb815b455fd7238f45190a57094857a3123883ecb595eb  plutovg-$PLUTOVG.tar.gz
 78561b571ac224030cdc450ca2986b4de915c2ba7616004a6d71a379bffd15f3  plutosvg-$PLUTOSVG.tar.gz
 EOF
 

.github/workflows/scripts/macos/build-dependencies.sh

@@ -22,17 +22,17 @@ fi
 
 FREETYPE=2.13.3
 HARFBUZZ=11.2.0
-SDL=SDL3-3.2.18
+SDL=SDL3-3.2.20
 ZSTD=1.5.7
 LZ4=1.10.0
 LIBPNG=1.6.50
 LIBJPEGTURBO=3.1.1
-LIBWEBP=1.5.0
+LIBWEBP=1.6.0
 FFMPEG=6.0
 MOLTENVK=1.2.9
 QT=6.7.3
 KDDOCKWIDGETS=2.2.3
-PLUTOVG=1.1.0
+PLUTOVG=1.3.0
 PLUTOSVG=0.0.7
 
 SHADERC=2025.3
@@ -59,11 +59,11 @@ CMAKE_COMMON=(
 cat > SHASUMS <<EOF
 0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289  freetype-$FREETYPE.tar.xz
 16c0204704f3ebeed057aba100fe7db18d71035505cb10e595ea33d346457fc8  harfbuzz-$HARFBUZZ.tar.gz
-1a775bde924397a8e0c08bfda198926c17be859d0288ad0dec1dea1b2ee04f8f  $SDL.tar.gz
+467600ae090dd28616fa37369faf4e3143198ff1da37729b552137e47f751a67  $SDL.tar.gz
 eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3  zstd-$ZSTD.tar.gz
 537512904744b35e232912055ccf8ec66d768639ff3abe5788d90d792ec5f48b  lz4-$LZ4.tar.gz
 4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307  libpng-$LIBPNG.tar.xz
-7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c  libwebp-$LIBWEBP.tar.gz
+e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564  libwebp-$LIBWEBP.tar.gz
 aadc97ea91f6ef078b0ae3a62bba69e008d9a7db19b34e4ac973b19b71b4217c  libjpeg-turbo-$LIBJPEGTURBO.tar.gz
 57be87c22d9b49c112b6d24bc67d42508660e6b718b3db89c44e47e289137082  ffmpeg-$FFMPEG.tar.xz
 f415a09385030c6510a936155ce211f617c31506db5fbc563e804345f1ecf56e  v$MOLTENVK.tar.gz
@@ -77,7 +77,7 @@ a8e4a25e5c2686fd36981e527ed05e451fcfc226bddf350f4e76181371190937  shaderc-$SHADE
 c2225a49c3d7efa5c4f4ce4a6b42081e6ea3daca376f3353d9d7c2722d77a28a  shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz
 44d1005880c583fc00a0fb41c839214c68214b000ea8dcb54d352732fee600ff  shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz
 b8529755b2d54205341766ae168e83177c6120660539f9afba71af6bca4b81ec  KDDockWidgets-$KDDOCKWIDGETS.tar.gz
-8aa9860519c407890668c29998e8bb88896ef6a2e6d7ce5ac1e57f18d79e1525  plutovg-$PLUTOVG.tar.gz
+4b08587d782f6858e6cb815b455fd7238f45190a57094857a3123883ecb595eb  plutovg-$PLUTOVG.tar.gz
 78561b571ac224030cdc450ca2986b4de915c2ba7616004a6d71a379bffd15f3  plutosvg-$PLUTOSVG.tar.gz
 EOF
 

.github/workflows/scripts/windows/build-dependencies-arm64.bat

@@ -46,16 +46,16 @@ set FREETYPE=2.13.3
 set HARFBUZZ=11.2.0
 set LIBJPEGTURBO=3.1.1
 set LIBPNG=1650
-set SDL=SDL3-3.2.18
+set SDL=SDL3-3.2.20
 set QT=6.9.1
 set QTMINOR=6.9
 set LZ4=1.10.0
-set WEBP=1.5.0
+set WEBP=1.6.0
 set ZLIB=1.3.1
 set ZLIBSHORT=131
 set ZSTD=1.5.7
 set KDDOCKWIDGETS=2.2.3
-set PLUTOVG=1.1.0
+set PLUTOVG=1.3.0
 set PLUTOSVG=0.0.7
 
 set SHADERC=2025.3
@@ -67,8 +67,8 @@ call :downloadfile "freetype-%FREETYPE%.tar.gz" https://sourceforge.net/projects
 call :downloadfile "harfbuzz-%HARFBUZZ%.zip" https://github.com/harfbuzz/harfbuzz/archive/refs/tags/%HARFBUZZ%.zip 850cb5e38e21106c0abba86c5b73f8f74b9a32d7725505901d081080b0d3f0b3 || goto error
 call :downloadfile "lpng%LIBPNG%.zip" https://download.sourceforge.net/libpng/lpng1650.zip 4be6938313b08d5921f9dede13f2789b653c96f4f8595d92ff3f09c9320e51c7 || goto error
 call :downloadfile "libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/%LIBJPEGTURBO%/libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" aadc97ea91f6ef078b0ae3a62bba69e008d9a7db19b34e4ac973b19b71b4217c || goto error
-call :downloadfile "libwebp-%WEBP%.tar.gz" "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-%WEBP%.tar.gz" 7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c || goto error
-call :downloadfile "%SDL%.zip" "https://libsdl.org/release/%SDL%.zip" 208028b3b6225b3c9eae3942e50ed243d8798b4b3a56b98a59b3f7e37baa55fd || goto error
+call :downloadfile "libwebp-%WEBP%.tar.gz" "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-%WEBP%.tar.gz" e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564 || goto error
+call :downloadfile "%SDL%.zip" "https://libsdl.org/release/%SDL%.zip" d76454913ea6f5f38856fbf00578d8e39daf842887f3396c95608414680250f7 || goto error
 call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" efa6d8ef9f7ae0fd9f7d280fbff574d71882b60a357ae639e516dc173cf26986 || goto error
 call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" 8439d3394bc380fd17a920ee96df1d2272bf8d3490871d948ef750f95e0ded06 || goto error
 call :downloadfile "qtsvg-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtsvg-everywhere-src-%QT%.zip" a8f90c768b54e28d61e02c1229b74a2b834e9852af523e5c70bcd2ae4c34a772 || goto error
@@ -78,7 +78,7 @@ call :downloadfile "lz4-%LZ4%.zip" "https://github.com/lz4/lz4/archive/refs/tags
 call :downloadfile "zlib%ZLIBSHORT%.zip" "https://zlib.net/zlib%ZLIBSHORT%.zip" 72af66d44fcc14c22013b46b814d5d2514673dda3d115e64b690c1ad636e7b17 || goto error
 call :downloadfile "zstd-%ZSTD%.zip" "https://github.com/facebook/zstd/archive/refs/tags/v%ZSTD%.zip" 7897bc5d620580d9b7cd3539c44b59d78f3657d33663fe97a145e07b4ebd69a4 || goto error
 call :downloadfile "KDDockWidgets-%KDDOCKWIDGETS%.zip" "https://github.com/KDAB/KDDockWidgets/archive/v%KDDOCKWIDGETS%.zip" 1ba8e5b48f3b4d47d2de7121529d448532200fa36d9ed21f93909f6eb03f61cb || goto error
-call :downloadfile "plutovg-%PLUTOVG%.zip" "https://github.com/sammycage/plutovg/archive/v%PLUTOVG%.zip" 83b2cd6230909a8d586518f49e79e4a1b1e9fab3847db6a678ec9d2dacab052a || goto error
+call :downloadfile "plutovg-%PLUTOVG%.zip" "https://github.com/sammycage/plutovg/archive/v%PLUTOVG%.zip" 5153e6b3603a253e6f86dc0b1eb5b80d1dce849ceef628369942587e86582cbb || goto error
 call :downloadfile "plutosvg-%PLUTOSVG%.zip" "https://github.com/sammycage/plutosvg/archive/v%PLUTOSVG%.zip" 82dee2c57ad712bdd6d6d81d3e76249d89caa4b5a4214353660fd5adff12201a || goto error
 
 call :downloadfile "shaderc-%SHADERC%.zip" "https://github.com/google/shaderc/archive/refs/tags/v%SHADERC%.zip" 77d2425458bca62c16b1ed49ed02de4c4114a113781bd94c1961b273bdca00fb || goto error

.github/workflows/scripts/windows/build-dependencies.bat

@@ -44,16 +44,16 @@ set FREETYPE=2.13.3
 set HARFBUZZ=11.2.0
 set LIBJPEGTURBO=3.1.1
 set LIBPNG=1650
-set SDL=SDL3-3.2.18
+set SDL=SDL3-3.2.20
 set QT=6.9.1
 set QTMINOR=6.9
 set LZ4=1.10.0
-set WEBP=1.5.0
+set WEBP=1.6.0
 set ZLIB=1.3.1
 set ZLIBSHORT=131
 set ZSTD=1.5.7
 set KDDOCKWIDGETS=2.2.3
-set PLUTOVG=1.1.0
+set PLUTOVG=1.3.0
 set PLUTOSVG=0.0.7
 
 set SHADERC=2025.3
@@ -65,8 +65,8 @@ call :downloadfile "freetype-%FREETYPE%.tar.gz" https://sourceforge.net/projects
 call :downloadfile "harfbuzz-%HARFBUZZ%.zip" https://github.com/harfbuzz/harfbuzz/archive/refs/tags/%HARFBUZZ%.zip 850cb5e38e21106c0abba86c5b73f8f74b9a32d7725505901d081080b0d3f0b3 || goto error
 call :downloadfile "lpng%LIBPNG%.zip" https://download.sourceforge.net/libpng/lpng1650.zip 4be6938313b08d5921f9dede13f2789b653c96f4f8595d92ff3f09c9320e51c7 || goto error
 call :downloadfile "libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/%LIBJPEGTURBO%/libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" aadc97ea91f6ef078b0ae3a62bba69e008d9a7db19b34e4ac973b19b71b4217c || goto error
-call :downloadfile "libwebp-%WEBP%.tar.gz" "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-%WEBP%.tar.gz" 7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c || goto error
-call :downloadfile "%SDL%.zip" "https://libsdl.org/release/%SDL%.zip" 208028b3b6225b3c9eae3942e50ed243d8798b4b3a56b98a59b3f7e37baa55fd || goto error
+call :downloadfile "libwebp-%WEBP%.tar.gz" "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-%WEBP%.tar.gz" e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564 || goto error
+call :downloadfile "%SDL%.zip" "https://libsdl.org/release/%SDL%.zip" d76454913ea6f5f38856fbf00578d8e39daf842887f3396c95608414680250f7 || goto error
 call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" efa6d8ef9f7ae0fd9f7d280fbff574d71882b60a357ae639e516dc173cf26986 || goto error
 call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" 8439d3394bc380fd17a920ee96df1d2272bf8d3490871d948ef750f95e0ded06 || goto error
 call :downloadfile "qtsvg-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtsvg-everywhere-src-%QT%.zip" a8f90c768b54e28d61e02c1229b74a2b834e9852af523e5c70bcd2ae4c34a772 || goto error
@@ -76,7 +76,7 @@ call :downloadfile "lz4-%LZ4%.zip" "https://github.com/lz4/lz4/archive/refs/tags
 call :downloadfile "zlib%ZLIBSHORT%.zip" "https://zlib.net/zlib%ZLIBSHORT%.zip" 72af66d44fcc14c22013b46b814d5d2514673dda3d115e64b690c1ad636e7b17 || goto error
 call :downloadfile "zstd-%ZSTD%.zip" "https://github.com/facebook/zstd/archive/refs/tags/v%ZSTD%.zip" 7897bc5d620580d9b7cd3539c44b59d78f3657d33663fe97a145e07b4ebd69a4 || goto error
 call :downloadfile "KDDockWidgets-%KDDOCKWIDGETS%.zip" "https://github.com/KDAB/KDDockWidgets/archive/v%KDDOCKWIDGETS%.zip" 1ba8e5b48f3b4d47d2de7121529d448532200fa36d9ed21f93909f6eb03f61cb || goto error
-call :downloadfile "plutovg-%PLUTOVG%.zip" "https://github.com/sammycage/plutovg/archive/v%PLUTOVG%.zip" 83b2cd6230909a8d586518f49e79e4a1b1e9fab3847db6a678ec9d2dacab052a || goto error
+call :downloadfile "plutovg-%PLUTOVG%.zip" "https://github.com/sammycage/plutovg/archive/v%PLUTOVG%.zip" 5153e6b3603a253e6f86dc0b1eb5b80d1dce849ceef628369942587e86582cbb || goto error
 call :downloadfile "plutosvg-%PLUTOSVG%.zip" "https://github.com/sammycage/plutosvg/archive/v%PLUTOSVG%.zip" 82dee2c57ad712bdd6d6d81d3e76249d89caa4b5a4214353660fd5adff12201a || goto error
 
 call :downloadfile "shaderc-%SHADERC%.zip" "https://github.com/google/shaderc/archive/refs/tags/v%SHADERC%.zip" 77d2425458bca62c16b1ed49ed02de4c4114a113781bd94c1961b273bdca00fb || goto error

.github/workflows/windows_build_matrix.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: windows-2025
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Verify VS Project Files
         run: .github\workflows\scripts\windows\validate-vs-filters.ps1
 

.github/workflows/windows_build_qt.yml

@@ -56,7 +56,7 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Configure MSBuild Clang Version
         if: inputs.configuration != 'CMake'

3rdparty/imgui/include/imconfig.h

@@ -66,7 +66,7 @@
 //#define IMGUI_USE_LEGACY_CRC32_ADLER
 
 //---- Use 32-bit for ImWchar (default is 16-bit) to support Unicode planes 1-16. (e.g. point beyond 0xFFFF like emoticons, dingbats, symbols, shapes, ancient languages, etc...)
-//#define IMGUI_USE_WCHAR32
+#define IMGUI_USE_WCHAR32
 
 //---- Avoid multiple STB libraries implementations, or redefine path/filenames to prioritize another version
 // By default the embedded implementations are declared static and not available outside of Dear ImGui sources files.
@@ -91,7 +91,7 @@
 // - plutosvg is currently easier to install, as e.g. it is part of vcpkg. It will support more fonts and may load them faster. See misc/freetype/README for instructions.
 // - Both require headers to be available in the include path + program to be linked with the library code (not provided).
 // - (note: lunasvg implementation is based on Freetype's rsvg-port.c which is licensed under CeCILL-C Free Software License Agreement)
-//#define IMGUI_ENABLE_FREETYPE_PLUTOSVG
+#define IMGUI_ENABLE_FREETYPE_PLUTOSVG
 //#define IMGUI_ENABLE_FREETYPE_LUNASVG
 
 //---- Use stb_truetype to build and rasterize the font atlas (default)

bin/resources/GameIndex.yaml

@@ -1701,6 +1701,8 @@ SCAJ-20074:
 SCAJ-20075:
   name: "Dragon Quest V - Bride of the Sky"
   region: "NTSC-Unk"
+  roundModes:
+    eeDivRoundMode: 3 # Fixes camera issues at the top of mount evil.
 SCAJ-20076:
   name: "Armored Core - Nexus [Disc 1]"
   region: "NTSC-Unk"
@@ -2402,6 +2404,7 @@ SCAJ-20177:
     textureInsideRT: 1 # Required for swirl battle transition.
     nativeScaling: 2 # Fixes depth of field effects and bloom.
     roundSprite: 1 # Fixes lines in transitions.
+    autoFlush: 2 # Fixes shadow rendering in certain scenarios when using DirectX.
 SCAJ-20178:
   name: "Ape Escape - Million Monkeys"
   region: "NTSC-Unk"
@@ -2521,6 +2524,7 @@ SCAJ-20197:
     textureInsideRT: 1 # Required for swirl battle transition.
     nativeScaling: 2 # Fixes depth of field effects and bloom.
     roundSprite: 1 # Fixes lines in transitions.
+    autoFlush: 2 # Fixes shadow rendering in certain scenarios when using DirectX.
 SCAJ-20198:
   name: "Everybody's Tennis [PlayStation2 the Best]"
   region: "NTSC-Unk"
@@ -2983,6 +2987,7 @@ SCED-50642:
     recommendedBlendingLevel: 4 # Fixes missing effect on the magus sisters.
     roundSprite: 2 # Fixes font artifacts.
     autoFlush: 1 # Fixes blur effect on attacks.
+    preloadFrameData: 1 # Fixes an issue that causes FMVs to flicker black when subtitles appear on screen.
 SCED-50660:
   name: "Dropship - United Peace Force"
   region: "PAL-A"
@@ -3798,8 +3803,11 @@ SCED-52461:
 SCED-52491:
   name: "Athens 2004"
   region: "PAL-M6"
+SCED-52496:
+  name: "This Is Football 2004 [Demo]"
+  region: "PAL-M4"
 SCED-52497:
-  name: "This is Football 2004"
+  name: "This Is Football 2004 [Demo]"
   region: "PAL-M4"
 SCED-52549:
   name: "Official PlayStation 2 Magazine Demo 47"
@@ -4852,6 +4860,7 @@ SCES-50490:
     recommendedBlendingLevel: 4 # Fixes missing effect on the magus sisters.
     roundSprite: 2 # Fixes font artifacts.
     autoFlush: 1 # Fixes blur effect on attacks.
+    preloadFrameData: 1 # Fixes an issue that causes FMVs to flicker black when subtitles appear on screen.
 SCES-50491:
   name: "Final Fantasy X"
   region: "PAL-F"
@@ -4866,12 +4875,13 @@ SCES-50491:
     recommendedBlendingLevel: 4 # Fixes missing effect on the magus sisters.
     roundSprite: 2 # Fixes font artifacts.
     autoFlush: 1 # Fixes blur effect on attacks.
+    preloadFrameData: 1 # Fixes an issue that causes FMVs to flicker black when subtitles appear on screen.
 SCES-50492:
   name: "Final Fantasy X"
   region: "PAL-G"
-  compat: 5
   gameFixes:
     - SoftwareRendererFMVHack # Fixes interlacing.
+  compat: 5
   roundModes:
     eeRoundMode: 2 # Fixes cutscene animations while slightly dislocating a few select meshes. Setting round mode to Chop/Zero or Nearest fixes the issues with meshes at the cost of breaking important cutscenes.
   clampModes:
@@ -4881,6 +4891,7 @@ SCES-50492:
     recommendedBlendingLevel: 4 # Fixes missing effect on the magus sisters.
     roundSprite: 2 # Fixes font artifacts.
     autoFlush: 1 # Fixes blur effect on attacks.
+    preloadFrameData: 1 # Fixes an issue that causes FMVs to flicker black when subtitles appear on screen.
 SCES-50493:
   name: "Final Fantasy X"
   region: "PAL-I"
@@ -4895,6 +4906,7 @@ SCES-50493:
     recommendedBlendingLevel: 4 # Fixes missing effect on the magus sisters.
     roundSprite: 2 # Fixes font artifacts.
     autoFlush: 1 # Fixes blur effect on attacks.
+    preloadFrameData: 1 # Fixes an issue that causes FMVs to flicker black when subtitles appear on screen.
 SCES-50494:
   name: "Final Fantasy X"
   region: "PAL-S"
@@ -4909,6 +4921,7 @@ SCES-50494:
     recommendedBlendingLevel: 4 # Fixes missing effect on the magus sisters.
     roundSprite: 2 # Fixes font artifacts.
     autoFlush: 1 # Fixes blur effect on attacks.
+    preloadFrameData: 1 # Fixes an issue that causes FMVs to flicker black when subtitles appear on screen.
 SCES-50499:
   name: "Ecco the Dolphin - Defender of the Future"
   region: "PAL-M5"
@@ -7639,6 +7652,7 @@ SCKA-20079:
     textureInsideRT: 1 # Required for swirl battle transition.
     nativeScaling: 2 # Fixes depth of field effects and bloom.
     roundSprite: 1 # Fixes lines in transitions.
+    autoFlush: 2 # Fixes shadow rendering in certain scenarios when using DirectX.
 SCKA-20081:
   name: "Tekken 5 [PlayStation 2 Big Hit Series]"
   region: "NTSC-K"
@@ -7677,14 +7691,18 @@ SCKA-20086:
   name: "Shin Onimusha - Dawn of Dreams [Disc 1 of 2]"
   region: "NTSC-K"
   gsHWFixes:
-    halfPixelOffset: 4 # Mostly aligns post-processing.
+    recommendedBlendingLevel: 2 # Improves brightness.
+    halfPixelOffset: 5 # Mostly aligns post-processing.
     nativeScaling: 2 # Fixes post-processing smoothness and position.
+    bilinearUpscale: 2 # Attempts to sharpen blurry text in menus.
 SCKA-20087:
   name: "Shin Onimusha - Dawn of Dreams [Disc 2 of 2]"
   region: "NTSC-K"
   gsHWFixes:
-    halfPixelOffset: 4 # Mostly aligns post-processing.
+    recommendedBlendingLevel: 2 # Improves brightness.
+    halfPixelOffset: 5 # Mostly aligns post-processing.
     nativeScaling: 2 # Fixes post-processing smoothness and position.
+    bilinearUpscale: 2 # Attempts to sharpen blurry text in menus.
   memcardFilters:
     - "SCKA-20086"
 SCKA-20088:
@@ -13854,7 +13872,7 @@ SLED-53731:
   name: "Battlefield 2 - Modern Combat [Demo]"
   region: "PAL-E"
   gsHWFixes:
-    minimumBlendingLevel: 4 # Fixes ground texture rendering.
+    recommendedBlendingLevel: 4 # Fixes ground texture rendering.
     autoFlush: 1 # Post-processing.
     halfPixelOffset: 2 # Offset post-processing.
     texturePreloading: 1 # Improves performance.
@@ -24102,7 +24120,7 @@ SLES-53729:
   name: "Battlefield 2 - Modern Combat"
   region: "PAL-M4"
   gsHWFixes:
-    minimumBlendingLevel: 4 # Fixes ground texture rendering.
+    recommendedBlendingLevel: 4 # Fixes ground texture rendering.
     autoFlush: 1 # Post-processing.
     halfPixelOffset: 2 # Offset post-processing.
     texturePreloading: 1 # Improves performance.
@@ -24112,7 +24130,7 @@ SLES-53730:
   name: "Battlefield 2 - Modern Combat"
   region: "PAL-M3"
   gsHWFixes:
-    minimumBlendingLevel: 4 # Fixes ground texture rendering.
+    recommendedBlendingLevel: 4 # Fixes ground texture rendering.
     autoFlush: 1 # Post-processing.
     halfPixelOffset: 2 # Offset post-processing.
     texturePreloading: 1 # Improves performance.
@@ -24864,6 +24882,12 @@ SLES-53996:
   name: "Army Men - Major Malfunction"
   region: "PAL-E"
   compat: 5
+  gsHWFixes:
+    recommendedBlendingLevel: 4 # Fixes missing text glow.
+    halfPixelOffset: 5 # Fixes misaligned bloom.
+    nativeScaling: 1 # Fixes misaligned bloom.
+    textureInsideRT: 1 # Fixes bottom half rendering and corrupted shadows.
+    PCRTCOverscan: 1 # Adjusts image upwards to center it correctly.
 SLES-53998:
   name: "OutRun 2006 - Coast 2 Coast"
   region: "PAL-M5"
@@ -26209,7 +26233,7 @@ SLES-54434:
   name: "Babe"
   region: "PAL-A"
 SLES-54435:
-  name: "Babe"
+  name: "Casper and the Ghostly Trio"
   region: "PAL-A"
 SLES-54436:
   name: "Jumanji"
@@ -26498,8 +26522,11 @@ SLES-54508:
   name: "National Geographic - Safari Adventures Africa"
   region: "PAL-M6"
 SLES-54510:
-  name: "Meet the Robinsons"
+  name: "Walt Disney Pictures Presents Meet the Robinsons"
   region: "PAL-M3"
+  gsHWFixes:
+    halfPixelOffset: 5 # Fixes bloom alignment.
+    nativeScaling: 1 # Fixes bloom effects.
 SLES-54511:
   name: "UEFA Champions League 2006-2007"
   region: "PAL-E"
@@ -26712,7 +26739,8 @@ SLES-54584:
   name: "Pac-Man Rally"
   region: "PAL-M5"
   gsHWFixes:
-    halfPixelOffset: 2 # Fixes depth line.
+    textureInsideRT: 1 # Fixes Half blackscreen on the splitscreen couch co-op mode.
+    halfPixelOffset: 5 # Fixes depth line.
   clampModes:
     vuClampMode: 3 # Fixes bad geometry.
 SLES-54586:
@@ -26876,6 +26904,7 @@ SLES-54644:
     textureInsideRT: 1 # Required for swirl battle transition.
     nativeScaling: 2 # Fixes depth of field effects and bloom.
     roundSprite: 1 # Fixes lines in transitions.
+    autoFlush: 2 # Fixes shadow rendering in certain scenarios when using DirectX.
 SLES-54645:
   name: "Valkyrie Profile 2 - Silmeria"
   region: "PAL-F"
@@ -26886,6 +26915,7 @@ SLES-54645:
     textureInsideRT: 1 # Required for swirl battle transition.
     nativeScaling: 2 # Fixes depth of field effects and bloom.
     roundSprite: 1 # Fixes lines in transitions.
+    autoFlush: 2 # Fixes shadow rendering in certain scenarios when using DirectX.
 SLES-54646:
   name: "Valkyrie Profile 2 - Silmeria"
   region: "PAL-G"
@@ -26897,6 +26927,7 @@ SLES-54646:
     textureInsideRT: 1 # Required for swirl battle transition.
     nativeScaling: 2 # Fixes depth of field effects and bloom.
     roundSprite: 1 # Fixes lines in transitions.
+    autoFlush: 2 # Fixes shadow rendering in certain scenarios when using DirectX.
 SLES-54647:
   name: "Valkyrie Profile 2 - Silmeria"
   region: "PAL-I"
@@ -26908,6 +26939,7 @@ SLES-54647:
     textureInsideRT: 1 # Required for swirl battle transition.
     nativeScaling: 2 # Fixes depth of field effects and bloom.
     roundSprite: 1 # Fixes lines in transitions.
+    autoFlush: 2 # Fixes shadow rendering in certain scenarios when using DirectX.
 SLES-54648:
   name: "Valkyrie Profile 2 - Silmeria"
   region: "PAL-S"
@@ -26918,6 +26950,7 @@ SLES-54648:
     textureInsideRT: 1 # Required for swirl battle transition.
     nativeScaling: 2 # Fixes depth of field effects and bloom.
     roundSprite: 1 # Fixes lines in transitions.
+    autoFlush: 2 # Fixes shadow rendering in certain scenarios when using DirectX.
 SLES-54653:
   name: "Freak Out - Extreme Freeride"
   region: "PAL-M5"
@@ -27016,8 +27049,11 @@ SLES-54677:
   region: "PAL-E"
   compat: 5
 SLES-54679:
-  name: "Metal Slug - Anthology"
+  name: "Walt Disney Pictures Presents Meet the Robinsons"
   region: "PAL-M3"
+  gsHWFixes:
+    halfPixelOffset: 5 # Fixes bloom alignment.
+    nativeScaling: 1 # Fixes bloom effects.
 SLES-54681:
   name: "Burnout Dominator"
   region: "PAL-E"
@@ -30052,13 +30088,19 @@ SLES-55676:
 SLES-82001:
   name: "Summoner"
   region: "PAL-E"
+  clampModes:
+    eeClampMode: 2 # Fixes missing shadows and indicators.
 SLES-82003:
   name: "Summoner"
   region: "PAL-F"
+  clampModes:
+    eeClampMode: 2 # Fixes missing shadows and indicators.
 SLES-82005:
   name: "Summoner"
   region: "PAL-G"
   compat: 5
+  clampModes:
+    eeClampMode: 2 # Fixes missing shadows and indicators.
 SLES-82009:
   name: "Metal Gear Solid 2 - Substance"
   region: "PAL-M5"
@@ -30215,15 +30257,19 @@ SLES-82038:
   region: "PAL-M5"
   compat: 5
   gsHWFixes:
-    halfPixelOffset: 4 # Mostly aligns post-processing.
+    recommendedBlendingLevel: 2 # Improves brightness.
+    halfPixelOffset: 5 # Mostly aligns post-processing.
     nativeScaling: 2 # Fixes post-processing smoothness and position.
+    bilinearUpscale: 2 # Attempts to sharpen blurry text in menus.
 SLES-82039:
   name: "Onimusha - Dawn of Dreams [Disc 2 of 2]"
   region: "PAL-M5"
   compat: 5
   gsHWFixes:
-    halfPixelOffset: 4 # Mostly aligns post-processing.
+    recommendedBlendingLevel: 2 # Improves brightness.
+    halfPixelOffset: 5 # Mostly aligns post-processing.
     nativeScaling: 2 # Fixes post-processing smoothness and position.
+    bilinearUpscale: 2 # Attempts to sharpen blurry text in menus.
   memcardFilters:
     - "SLES-82038"
 SLES-82042:
@@ -31403,6 +31449,7 @@ SLKA-25214:
     recommendedBlendingLevel: 4 # Fixes missing effect on the magus sisters.
     roundSprite: 2 # Fixes font artifacts.
     autoFlush: 1 # Fixes blur effect on attacks.
+    preloadFrameData: 1 # Fixes an issue that causes FMVs to flicker black when subtitles appear on screen.
 SLKA-25215:
   name: "Shining Wind"
   region: "NTSC-K"
@@ -32851,7 +32898,7 @@ SLPM-55034:
   name-en: "Battlefield 2 - Modern Combat [EA:SY! 1980]"
   region: "NTSC-J"
   gsHWFixes:
-    minimumBlendingLevel: 4 # Fixes ground texture rendering.
+    recommendedBlendingLevel: 4 # Fixes ground texture rendering.
     autoFlush: 1 # Post-processing.
     halfPixelOffset: 2 # Offset post-processing.
     texturePreloading: 1 # Improves performance.
@@ -40674,6 +40721,7 @@ SLPM-65115:
     recommendedBlendingLevel: 4 # Fixes missing effect on the magus sisters.
     roundSprite: 2 # Fixes font artifacts.
     autoFlush: 1 # Fixes blur effect on attacks.
+    preloadFrameData: 1 # Fixes an issue that causes FMVs to flicker black when subtitles appear on screen.
 SLPM-65116:
   name: "リリーのアトリエ プラス ～ザールブルグの錬金術士3～"
   name-sort: "りりーのあとりえ ぷらす ～ざーるぶるぐのれんきんじゅつし3～"
@@ -43192,6 +43240,8 @@ SLPM-65555:
   name-en: "Dragon Quest V - Tenkuu no Hanayome"
   region: "NTSC-J"
   compat: 5
+  roundModes:
+    eeDivRoundMode: 3 # Fixes camera issues at the top of mount evil.
 SLPM-65556:
   name: "信長の野望・天下創世"
   name-sort: "のぶながのやぼう てんかそうせい"
@@ -46569,6 +46619,7 @@ SLPM-66124:
     recommendedBlendingLevel: 4 # Fixes missing effect on the magus sisters.
     roundSprite: 2 # Fixes font artifacts.
     autoFlush: 1 # Fixes blur effect on attacks.
+    preloadFrameData: 1 # Fixes an issue that causes FMVs to flicker black when subtitles appear on screen.
 SLPM-66125:
   name: "ファイナルファンタジーⅩ-2 [Ultimate Hits]"
   name-sort: "ふぁいなるふぁんたじー10-2 [Ultimate Hits]"
@@ -47075,7 +47126,7 @@ SLPM-66206:
   name-en: "Battlefield 2 - Modern Combat"
   region: "NTSC-J"
   gsHWFixes:
-    minimumBlendingLevel: 4 # Fixes ground texture rendering.
+    recommendedBlendingLevel: 4 # Fixes ground texture rendering.
     autoFlush: 1 # Post-processing.
     halfPixelOffset: 2 # Offset post-processing.
     texturePreloading: 1 # Improves performance.
@@ -47550,8 +47601,10 @@ SLPM-66275:
   region: "NTSC-J"
   compat: 5
   gsHWFixes:
-    halfPixelOffset: 4 # Mostly aligns post-processing.
+    recommendedBlendingLevel: 2 # Improves brightness.
+    halfPixelOffset: 5 # Mostly aligns post-processing.
     nativeScaling: 2 # Fixes post-processing smoothness and position.
+    bilinearUpscale: 2 # Attempts to sharpen blurry text in menus.
 SLPM-66276:
   name: "新 鬼武者 DAWN OF DREAMS [ディスク2/2]"
   name-sort: "しん おにむしゃ DAWN OF DREAMS [でぃすく2/2]"
@@ -47559,8 +47612,10 @@ SLPM-66276:
   region: "NTSC-J"
   compat: 5
   gsHWFixes:
-    halfPixelOffset: 4 # Mostly aligns post-processing.
+    recommendedBlendingLevel: 2 # Improves brightness.
+    halfPixelOffset: 5 # Mostly aligns post-processing.
     nativeScaling: 2 # Fixes post-processing smoothness and position.
+    bilinearUpscale: 2 # Attempts to sharpen blurry text in menus.
   memcardFilters:
     - "SLPM-66275"
 SLPM-66277:
@@ -48427,6 +48482,7 @@ SLPM-66419:
     textureInsideRT: 1 # Required for swirl battle transition.
     nativeScaling: 2 # Fixes depth of field effects and bloom.
     roundSprite: 1 # Fixes lines in transitions.
+    autoFlush: 2 # Fixes shadow rendering in certain scenarios when using DirectX.
 SLPM-66420:
   name: "フロントミッション4 [Ultimate Hits]"
   name-sort: "ふろんとみっしょん4 [Ultimate Hits]"
@@ -48850,6 +48906,8 @@ SLPM-66480:
   name-en: "Dragon Quest V - Tenkuu no Hanayome [Ultimate Hits]"
   region: "NTSC-J"
   compat: 5
+  roundModes:
+    eeDivRoundMode: 3 # Fixes camera issues at the top of mount evil.
 SLPM-66481:
   name: "ドラゴンクエストⅧ 空と海と大地と呪われし姫君 [Ultimate Hits]"
   name-sort: "どらごんくえすと8 そらとうみとだいちとのろわれしひめぎみ [Ultimate Hits]"
@@ -49885,7 +49943,7 @@ SLPM-66651:
   name-en: "Battlefield 2 - Modern Combat [EA Best Hits]"
   region: "NTSC-J"
   gsHWFixes:
-    minimumBlendingLevel: 4 # Fixes ground texture rendering.
+    recommendedBlendingLevel: 4 # Fixes ground texture rendering.
     autoFlush: 1 # Post-processing.
     halfPixelOffset: 2 # Offset post-processing.
     texturePreloading: 1 # Improves performance.
@@ -50087,6 +50145,7 @@ SLPM-66677:
     recommendedBlendingLevel: 4 # Fixes missing effect on the magus sisters.
     roundSprite: 2 # Fixes font artifacts.
     autoFlush: 1 # Fixes blur effect on attacks.
+    preloadFrameData: 1 # Fixes an issue that causes FMVs to flicker black when subtitles appear on screen.
 SLPM-66678:
   name: "ファイナルファンタジーⅩ-2 インターナショナル+ラストミッション [Ultimate Hits]"
   name-sort: "ふぁいなるふぁんたじー10-2 いんたーなしょなる+らすとみっしょん [Ultimate Hits]"
@@ -50742,6 +50801,7 @@ SLPM-66782:
     textureInsideRT: 1 # Required for swirl battle transition.
     nativeScaling: 2 # Fixes depth of field effects and bloom.
     roundSprite: 1 # Fixes lines in transitions.
+    autoFlush: 2 # Fixes shadow rendering in certain scenarios when using DirectX.
 SLPM-66783:
   name: "アイドル雀士 スーチーパイⅣ 「完全限定版・コレクターズエディション」"
   name-sort: "あいどるじゃんし すーちーぱい4 [かんぜんげんていばん・これくたーずえでぃしょん]"
@@ -51024,8 +51084,11 @@ SLPM-66829:
 SLPM-66830:
   name: "ルイスと未来泥棒"
   name-sort: "るいすとみらいどろぼう"
-  name-en: "Lewis and the Future Thief"
+  name-en: "Walt Disney Pictures Presents Lewis to Mirai Dorobou - Wilbur no Kiken na Jikan Ryokou"
   region: "NTSC-J"
+  gsHWFixes:
+    halfPixelOffset: 5 # Fixes bloom alignment.
+    nativeScaling: 1 # Fixes bloom effects.
 SLPM-66832:
   name: "テニスの王子様 ドキドキサバイバル 海辺のSecret [KONAMI The Best]"
   name-sort: "てにすのおうじさま どきどきさばいばる うみべのしーくれっと [KONAMI The Best]"
@@ -52148,6 +52211,7 @@ SLPM-67513:
     recommendedBlendingLevel: 4 # Fixes missing effect on the magus sisters.
     roundSprite: 2 # Fixes font artifacts.
     autoFlush: 1 # Fixes blur effect on attacks.
+    preloadFrameData: 1 # Fixes an issue that causes FMVs to flicker black when subtitles appear on screen.
 SLPM-67514:
   name: "Kessen"
   region: "NTSC-K"
@@ -52764,8 +52828,10 @@ SLPM-74232:
   gameFixes:
     - SoftwareRendererFMVHack # Wrong white textures in FMV.
   gsHWFixes:
-    halfPixelOffset: 4 # Mostly aligns post-processing.
+    recommendedBlendingLevel: 2 # Improves brightness.
+    halfPixelOffset: 5 # Mostly aligns post-processing.
     nativeScaling: 2 # Fixes post-processing smoothness and position.
+    bilinearUpscale: 2 # Attempts to sharpen blurry text in menus.
   memcardFilters:
     - "SLPM-66275"
 SLPM-74233:
@@ -52774,8 +52840,10 @@ SLPM-74233:
   name-en: "Shin Onimusha - Dawn of Dreams [PlayStation2 the Best] [Disc 2 of 2]"
   region: "NTSC-J"
   gsHWFixes:
-    halfPixelOffset: 4 # Mostly aligns post-processing.
+    recommendedBlendingLevel: 2 # Improves brightness.
+    halfPixelOffset: 5 # Mostly aligns post-processing.
     nativeScaling: 2 # Fixes post-processing smoothness and position.
+    bilinearUpscale: 2 # Attempts to sharpen blurry text in menus.
   memcardFilters:
     - "SLPM-74232"
 SLPM-74234:
@@ -52923,8 +52991,10 @@ SLPM-74251:
   name-en: "Shin Onimusha - Dawn of Dreams [PlayStation 2 the Best - Reprint Disc 1]"
   region: "NTSC-J"
   gsHWFixes:
-    halfPixelOffset: 4 # Mostly aligns post-processing.
+    recommendedBlendingLevel: 2 # Improves brightness.
+    halfPixelOffset: 5 # Mostly aligns post-processing.
     nativeScaling: 2 # Fixes post-processing smoothness and position.
+    bilinearUpscale: 2 # Attempts to sharpen blurry text in menus.
   memcardFilters:
     - "SLPM-66275"
 SLPM-74252:
@@ -52933,8 +53003,10 @@ SLPM-74252:
   name-en: "Shin Onimusha - Dawn of Dreams [PlayStation 2 the Best - Reprint Disc 2]"
   region: "NTSC-J"
   gsHWFixes:
-    halfPixelOffset: 4 # Mostly aligns post-processing.
+    recommendedBlendingLevel: 2 # Improves brightness.
+    halfPixelOffset: 5 # Mostly aligns post-processing.
     nativeScaling: 2 # Fixes post-processing smoothness and position.
+    bilinearUpscale: 2 # Attempts to sharpen blurry text in menus.
   memcardFilters:
     - "SLPM-74251"
 SLPM-74253:
@@ -56186,6 +56258,7 @@ SLPS-25050:
     recommendedBlendingLevel: 4 # Fixes missing effect on the magus sisters.
     roundSprite: 2 # Fixes font artifacts.
     autoFlush: 1 # Fixes blur effect on attacks.
+    preloadFrameData: 1 # Fixes an issue that causes FMVs to flicker black when subtitles appear on screen.
 SLPS-25051:
   name: "Missing Blue [通常版]"
   name-sort: "みっしんぐ ぶるー [つうじょうばん]"
@@ -56256,11 +56329,15 @@ SLPS-25060:
   name-sort: "きどうせんしがんだむ めぐりあいそら [げんていばん]"
   name-en: "Mobile Suit Gundam - Meguriai Sora [Limited Edition]"
   region: "NTSC-J"
+  memcardFilters:
+    - "SLPS-25062"
 SLPS-25061:
   name: "機動戦士ガンダムVer.1.5 [限定版]"
   name-sort: "きどうせんしがんだむVer.1.5 [げんていばん]"
   name-en: "Mobile Suit Gundam Ver.1.5 [Limited Edition]"
   region: "NTSC-J"
+  memcardFilters:
+    - "SLPS-25063"
 SLPS-25062:
   name: "機動戦士ガンダム めぐりあい宇宙 [DVD同梱版]"
   name-sort: "きどうせんしがんだむ めぐりあいそら [DVDどうこんばん]"
@@ -56414,6 +56491,7 @@ SLPS-25088:
     recommendedBlendingLevel: 4 # Fixes missing effect on the magus sisters.
     roundSprite: 2 # Fixes font artifacts.
     autoFlush: 1 # Fixes blur effect on attacks.
+    preloadFrameData: 1 # Fixes an issue that causes FMVs to flicker black when subtitles appear on screen.
 SLPS-25089:
   name: "SALT LAKE 2002"
   name-sort: "そるとれいく 2002"
@@ -61839,6 +61917,7 @@ SLPS-72501:
     recommendedBlendingLevel: 4 # Fixes missing effect on the magus sisters.
     roundSprite: 2 # Fixes font artifacts.
     autoFlush: 1 # Fixes blur effect on attacks.
+    preloadFrameData: 1 # Fixes an issue that causes FMVs to flicker black when subtitles appear on screen.
 SLPS-72502:
   name: "テイルズ オブ デスティニー2 [MEGA HITS!]"
   name-sort: "ているず おぶ ですてぃにー2 [MEGA HITS!]"
@@ -63028,6 +63107,8 @@ SLUS-20074:
   name: "Summoner"
   region: "NTSC-U"
   compat: 5
+  clampModes:
+    eeClampMode: 2 # Fixes missing shadows and indicators.
 SLUS-20075:
   name: "Disney's Jungle Book - Rhythm & Groove"
   region: "NTSC-U"
@@ -64064,6 +64145,7 @@ SLUS-20312:
     recommendedBlendingLevel: 4 # Fixes missing effect on the magus sisters.
     roundSprite: 2 # Fixes font artifacts.
     autoFlush: 1 # Fixes blur effect on attacks.
+    preloadFrameData: 1 # Fixes an issue that causes FMVs to flicker black when subtitles appear on screen.
 SLUS-20313:
   name: "Wave Rally"
   region: "NTSC-U"
@@ -68058,7 +68140,7 @@ SLUS-21026:
   region: "NTSC-U"
   compat: 5
   gsHWFixes:
-    minimumBlendingLevel: 4 # Fixes ground texture rendering.
+    recommendedBlendingLevel: 4 # Fixes ground texture rendering.
     autoFlush: 1 # Post-processing.
     halfPixelOffset: 2 # Offset post-processing.
     texturePreloading: 1 # Improves performance.
@@ -68947,8 +69029,10 @@ SLUS-21180:
   region: "NTSC-U"
   compat: 5
   gsHWFixes:
-    halfPixelOffset: 4 # Mostly aligns post-processing.
+    recommendedBlendingLevel: 2 # Improves brightness.
+    halfPixelOffset: 5 # Mostly aligns post-processing.
     nativeScaling: 2 # Fixes post-processing smoothness and position.
+    bilinearUpscale: 2 # Attempts to sharpen blurry text in menus.
 SLUS-21181:
   name: "D.I.C.E. - DNA Integrated Cybernetic Enterprises"
   region: "NTSC-U"
@@ -70039,7 +70123,7 @@ SLUS-21328:
   clampModes:
     vuClampMode: 3 # Fixes bad geometry.
   gsHWFixes:
-    halfPixelOffset: 2 # Fixes depth line.
+    halfPixelOffset: 5 # Fixes depth line.
   patches:
     default:
       content: |-
@@ -70295,8 +70379,10 @@ SLUS-21362:
   region: "NTSC-U"
   compat: 5
   gsHWFixes:
-    halfPixelOffset: 4 # Mostly aligns post-processing.
+    recommendedBlendingLevel: 2 # Improves brightness.
+    halfPixelOffset: 5 # Mostly aligns post-processing.
     nativeScaling: 2 # Fixes post-processing smoothness and position.
+    bilinearUpscale: 2 # Attempts to sharpen blurry text in menus.
   memcardFilters:
     - "SLUS-21180"
 SLUS-21363:
@@ -70909,10 +70995,14 @@ SLUS-21452:
     textureInsideRT: 1 # Required for swirl battle transition.
     nativeScaling: 2 # Fixes depth of field effects and bloom.
     roundSprite: 1 # Fixes lines in transitions.
+    autoFlush: 2 # Fixes shadow rendering in certain scenarios when using DirectX.
 SLUS-21453:
-  name: "Meet the Robinsons"
+  name: "Walt Disney Pictures Presents Meet the Robinsons"
   region: "NTSC-U"
   compat: 5
+  gsHWFixes:
+    halfPixelOffset: 5 # Fixes bloom alignment.
+    nativeScaling: 1 # Fixes bloom effects.
 SLUS-21454:
   name: "DreamWorks Shrek the Third"
   region: "NTSC-U"
@@ -74138,7 +74228,7 @@ SLUS-29117:
   name: "Battlefield 2 - Modern Combat [Public Beta Vol.1.0]"
   region: "NTSC-U"
   gsHWFixes:
-    minimumBlendingLevel: 4 # Fixes ground texture rendering.
+    recommendedBlendingLevel: 4 # Fixes ground texture rendering.
     autoFlush: 1 # Post-processing.
     halfPixelOffset: 2 # Offset post-processing.
     texturePreloading: 1 # Improves performance.
@@ -74294,7 +74384,7 @@ SLUS-29152:
   name: "Battlefield 2 - Modern Combat [Regular Demo]"
   region: "NTSC-U"
   gsHWFixes:
-    minimumBlendingLevel: 4 # Fixes ground texture rendering.
+    recommendedBlendingLevel: 4 # Fixes ground texture rendering.
     autoFlush: 1 # Post-processing.
     halfPixelOffset: 2 # Offset post-processing.
     texturePreloading: 1 # Improves performance.
@@ -74411,7 +74501,7 @@ SLUS-29172:
   name: "Battlefield 2 - Modern Combat [Demo]"
   region: "NTSC-U"
   gsHWFixes:
-    minimumBlendingLevel: 4 # Fixes ground texture rendering.
+    recommendedBlendingLevel: 4 # Fixes ground texture rendering.
     autoFlush: 1 # Post-processing.
     halfPixelOffset: 2 # Offset post-processing.
     texturePreloading: 1 # Improves performance.

bin/resources/fonts/NotoColorEmoji-Regular-license

@@ -0,0 +1,93 @@
+Copyright 2021 Google Inc. All Rights Reserved.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+https://openfontlicense.org
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

bin/resources/game_controller_db.txt

@@ -10,6 +10,7 @@
 03000000d0160000060d000000000000,4Play Adapter,a:b1,b:b3,back:b4,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,leftshoulder:b6,leftstick:b14,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b15,righttrigger:b9,rightx:a3,righty:a4,start:b5,x:b0,y:b2,platform:Windows,
 03000000d0160000070d000000000000,4Play Adapter,a:b1,b:b3,back:b4,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,leftshoulder:b6,leftstick:b14,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b15,righttrigger:b9,rightx:a3,righty:a4,start:b5,x:b0,y:b2,platform:Windows,
 03000000d0160000600a000000000000,4Play Adapter,a:b1,b:b3,back:b4,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,leftshoulder:b6,leftstick:b14,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b15,righttrigger:b9,rightx:a3,righty:a4,start:b5,x:b0,y:b2,platform:Windows,
+03000000c82d00001930000000000000,8BitDo 64,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a3,righty:a4,start:b11,platform:Windows,
 03000000c82d00000031000000000000,8BitDo Adapter,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
 03000000c82d00000531000000000000,8BitDo Adapter 2,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
 03000000c82d00000951000000000000,8BitDo Dogbone,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a2,rightx:a3,righty:a5,start:b11,platform:Windows,
@@ -50,6 +51,7 @@
 03000000c82d00000360000000000000,8BitDo Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
 03000000c82d00000361000000000000,8BitDo Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
 03000000c82d00000660000000000000,8BitDo Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000960000000000000,8BitDo Pro 3,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,paddle1:b17,paddle2:b16,paddle3:b2,paddle4:b5,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
 03000000c82d00000131000000000000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
 03000000c82d00000231000000000000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
 03000000c82d00000331000000000000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
@@ -822,7 +824,7 @@
 030000005e040000e302000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
 030000005e040000ea02000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:+a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:-a2,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
 030000005e040000fd02000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
-030000005e040000ff02000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:+a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:-a2,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000005e040000ff02000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
 030000006f0e0000a802000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
 030000006f0e0000c802000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
 03000000c62400003a54000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
@@ -843,6 +845,8 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 
 # Mac OS X
 030000008f0e00000300000009010000,2 In 1 Joystick,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Mac OS X,
+03000000c82d00001930000000020000,8BitDo 64,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a3,start:b11,platform:Mac OS X,
+03000000c82d00001930000001000000,8BitDo 64,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a3,start:b11,platform:Mac OS X,
 03000000c82d00000031000001000000,8BitDo Adapter,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
 03000000c82d00000531000000020000,8BitDo Adapter 2,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
 03000000c82d00000951000000010000,8BitDo Dogbone,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,rightx:a2,righty:a3,start:b11,platform:Mac OS X,
@@ -1148,6 +1152,8 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 03000000120c0000101e000000010000,Zeroplus P4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
 
 # Linux
+03000000c82d00001930000011010000,8BitDo 64,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a3,start:b11,platform:Linux,
+05000000c82d00001930000001000000,8BitDo 64,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a3,start:b11,platform:Linux,
 03000000c82d00000031000011010000,8BitDo Adapter,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
 03000000c82d00000631000000010000,8BitDo Adapter 2,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 03000000c82d00000951000000010000,8BitDo Dogbone,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,rightx:a2,righty:a3,start:b11,platform:Linux,
@@ -1625,7 +1631,9 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 0300132d9b2800006500000001010000,Raphnet GameCube Adapter,a:b0,b:b7,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b2,righttrigger:b5,rightx:a3,righty:a4,start:b3,x:b1,y:b8,platform:Linux,
 030000009b2800003200000001010000,Raphnet GC and N64 Adapter,a:b0,b:b7,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b2,righttrigger:b5,rightx:a3,righty:a4,start:b3,x:b1,y:b8,platform:Linux,
 030000009b2800006000000001010000,Raphnet GC and N64 Adapter,a:b0,b:b7,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b2,righttrigger:b5,rightx:a3,righty:a4,start:b3,x:b1,y:b8,platform:Linux,
+030000009b2800003c00000001010000,Raphnet N64 Adapter,+rightx:b9,+righty:b7,-rightx:b8,-righty:b6,a:b0,b:b1,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,leftshoulder:b4,lefttrigger:b2,leftx:a0,lefty:a1,rightshoulder:b5,start:b3,platform:Linux,
 030000009b2800006100000001010000,Raphnet N64 Adapter,+rightx:b9,+righty:b7,-rightx:b8,-righty:b6,a:b0,b:b1,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,leftshoulder:b4,lefttrigger:b2,leftx:a0,lefty:a1,rightshoulder:b5,start:b3,platform:Linux,
+030000009b2800006300000001010000,Raphnet N64 Adapter,+rightx:b9,+righty:b7,-rightx:b8,-righty:b6,a:b0,b:b1,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,leftshoulder:b4,lefttrigger:b2,leftx:a0,lefty:a1,rightshoulder:b5,start:b3,platform:Linux,
 030000009b2800006400000001010000,Raphnet N64 Adapter,+rightx:b9,+righty:b7,-rightx:b8,-righty:b6,a:b0,b:b1,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,leftshoulder:b4,lefttrigger:b2,leftx:a0,lefty:a1,rightshoulder:b5,start:b3,platform:Linux,
 030000009b2800008000000020020000,Raphnet Wii Classic Adapter,a:b1,b:b4,back:b2,dpdown:b13,dpleft:b14,dpright:b15,dpup:b12,leftshoulder:b6,rightshoulder:b7,start:b3,x:b0,y:b5,platform:Linux,
 030000009b2800008000000001010000,Raphnet Wii Classic Adapter V3,a:b1,b:b4,back:b2,dpdown:b13,dpleft:b14,dpright:b15,dpup:b12,leftshoulder:b6,rightshoulder:b7,start:b3,x:b0,y:b5,platform:Linux,
@@ -1683,10 +1691,10 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 03000000790000001100000011010000,Sega Saturn,a:b1,b:b2,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,lefttrigger:b7,rightshoulder:b5,righttrigger:b4,start:b9,x:b0,y:b3,platform:Linux,
 03000000790000002201000011010000,Sega Saturn,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b5,rightshoulder:b6,righttrigger:b7,start:b9,x:b2,y:b3,platform:Linux,
 03000000b40400000a01000000010000,Sega Saturn,a:b0,b:b1,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,lefttrigger:b7,rightshoulder:b5,righttrigger:b2,start:b8,x:b3,y:b4,platform:Linux,
-03000000632500002305000010010000,ShanWan Gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+03000000632500002305000010010000,Shanwan Gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
 03000000632500002605000010010000,Shanwan Gamepad,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
 03000000632500007505000010010000,Shanwan Gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
-03000000bc2000000055000010010000,Shanwan Gamepad,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000bc2000000055000010010000,Shanwan Gamepad,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
 03000000f025000021c1000010010000,Shanwan Gioteck PS3 Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
 03000000341a00000908000010010000,SL6566,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
 030000004b2900000430000011000000,Snakebyte Xbox Series Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
@@ -1825,6 +1833,7 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 060000005e040000120b00000d050000,Xbox Series Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,misc1:b11,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 060000005e040000120b00000f050000,Xbox Series Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,misc1:b11,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 050000005e040000130b000022050000,Xbox Series X Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b15,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+060000005e040000120b000011050000,Xbox Series X Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,misc1:b11,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 050000005e040000200b000013050000,Xbox Wireless Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
 050000005e040000200b000017050000,Xbox Wireless Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
 050000005e040000200b000023050000,Xbox Wireless Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,

bin/resources/shaders/dx11/shadeboost.fx

@@ -21,6 +21,7 @@ float4 ContrastSaturationBrightness(float4 color) // Ported to HLSL
 	float brt = params.x;
 	float con = params.y;
 	float sat = params.z;
+	float gam = params.w;
 	
 	// Increase or decrease these values to adjust r, g and b color channels separately
 	const float AvgLumR = 0.5;
@@ -34,8 +35,10 @@ float4 ContrastSaturationBrightness(float4 color) // Ported to HLSL
 	float3 intensity = dot(brtColor, LumCoeff);
 	float3 satColor = lerp(intensity, brtColor, sat);
 	float3 conColor = lerp(AvgLumin, satColor, con);
-
-	color.rgb = conColor;	
+	
+	float3 csb = conColor;
+	csb = pow(csb, 1.0 / gam);
+	color.rgb = csb;
 	return color;
 }
 

bin/resources/shaders/opengl/shadeboost.glsl

@@ -30,6 +30,7 @@ vec4 ContrastSaturationBrightness(vec4 color)
 	float brt = params.x;
 	float con = params.y;
 	float sat = params.z;
+	float gam = params.w;
 
 	// Increase or decrease these values to adjust r, g and b color channels separately
 	const float AvgLumR = 0.5;
@@ -45,7 +46,10 @@ vec4 ContrastSaturationBrightness(vec4 color)
 	vec3 satColor = mix(intensity, brtColor, sat);
 	vec3 conColor = mix(AvgLumin, satColor, con);
 
-	color.rgb = conColor;
+	vec3 csb = conColor;
+	csb = pow(csb, vec3(1.0 / gam));
+	color.rgb = csb;
+
 	return color;
 }
 

bin/resources/shaders/vulkan/shadeboost.glsl

@@ -44,6 +44,7 @@ vec4 ContrastSaturationBrightness(vec4 color)
     float brt = params.x;
     float con = params.y;
     float sat = params.z;
+    float gam = params.w;
 
     // Increase or decrease these values to adjust r, g and b color channels separately
     const float AvgLumR = 0.5;
@@ -59,7 +60,9 @@ vec4 ContrastSaturationBrightness(vec4 color)
     vec3 satColor = mix(intensity, brtColor, sat);
     vec3 conColor = mix(AvgLumin, satColor, con);
 
-    color.rgb = conColor;
+    vec3 csb = conColor;
+    csb = pow(csb, vec3(1.0 / gam));
+    color.rgb = csb;
     return color;
 }
 

cmake/SearchForStuff.cmake

@@ -18,7 +18,7 @@ find_package(Zstd 1.5.5 REQUIRED)
 find_package(LZ4 REQUIRED)
 find_package(WebP REQUIRED) # v1.3.2, spews an error on Linux because no pkg-config.
 find_package(SDL3 3.2.6 REQUIRED)
-find_package(Freetype 2.11.1 REQUIRED)
+find_package(Freetype 2.12 REQUIRED)
 find_package(plutovg 1.1.0 REQUIRED)
 find_package(plutosvg 0.0.7 REQUIRED)
 

common/CMakeLists.txt

@@ -85,7 +85,6 @@ target_sources(common PRIVATE
 
 if(_M_X86)
 	target_sources(common PRIVATE
-		emitter/avx.cpp
 		emitter/bmi.cpp
 		emitter/fpu.cpp
 		emitter/groups.cpp
@@ -174,9 +173,6 @@ else()
 		target_compile_definitions(common PRIVATE "HAS_LIBBACKTRACE=1")
 		target_link_libraries(common PRIVATE libbacktrace::libbacktrace)
 	endif()
-	if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
-		target_link_libraries(common PRIVATE cpuinfo)
-	endif()
 endif()
 
 set_source_files_properties(PrecompiledHeader.cpp PROPERTIES HEADER_FILE_ONLY TRUE)
@@ -206,6 +202,7 @@ target_link_libraries(common PRIVATE
 	JPEG::JPEG
 	PNG::PNG
 	WebP::libwebp
+	cpuinfo
 )
 
 target_link_libraries(common PUBLIC

common/Console.cpp

@@ -335,7 +335,7 @@ bool Log::SetFileOutputLevel(LOGLEVEL level, std::string path)
 
 	const bool was_enabled = (s_file_level > LOGLEVEL_NONE);
 	const bool new_enabled = (level > LOGLEVEL_NONE && !path.empty());
-	if (was_enabled != new_enabled || (new_enabled && path == s_file_path))
+	if (was_enabled != new_enabled || (new_enabled && path != s_file_path))
 	{
 		if (new_enabled)
 		{

common/Darwin/DarwinMisc.cpp

@@ -271,7 +271,7 @@ std::vector<DarwinMisc::CPUClass> DarwinMisc::GetCPUClasses()
 	}
 	else if (std::optional<u32> physcpu = sysctlbyname_T<u32>("hw.physicalcpu"))
 	{
-		out.push_back({"Default", *physcpu, sysctlbyname_T<u32>("hw.logicalcpu").value_or(0)});
+		out.push_back({"Default", *physcpu, sysctlbyname_T<u32>("hw.logicalcpu").value_or(*physcpu)});
 	}
 	else
 	{
@@ -281,6 +281,35 @@ std::vector<DarwinMisc::CPUClass> DarwinMisc::GetCPUClasses()
 	return out;
 }
 
+static CPUInfo CalcCPUInfo()
+{
+	CPUInfo out;
+	char name[256];
+	size_t name_size = sizeof(name);
+	if (0 != sysctlbyname("machdep.cpu.brand_string", name, &name_size, nullptr, 0))
+		strcpy(name, "Unknown");
+	out.name = name;
+	if (sysctlbyname_T<u32>("sysctl.proc_translated").value_or(0))
+		out.name += " (Rosetta)";
+	std::vector<DarwinMisc::CPUClass> classes = DarwinMisc::GetCPUClasses();
+	out.num_clusters = static_cast<u32>(classes.size());
+	out.num_big_cores = classes.empty() ? 0 : classes[0].num_physical;
+	out.num_threads   = classes.empty() ? 0 : classes[0].num_logical;
+	out.num_small_cores = 0;
+	for (std::size_t i = 1; i < classes.size(); i++)
+	{
+		out.num_small_cores += classes[i].num_physical;
+		out.num_threads += classes[i].num_logical;
+	}
+	return out;
+}
+
+const CPUInfo& GetCPUInfo()
+{
+	static const CPUInfo info = CalcCPUInfo();
+	return info;
+}
+
 size_t HostSys::GetRuntimePageSize()
 {
 	return sysctlbyname_T<u32>("hw.pagesize").value_or(0);

common/HostSys.cpp

@@ -5,6 +5,10 @@
 #include "Console.h"
 #include "VectorIntrin.h"
 
+#ifndef __APPLE__
+#include "cpuinfo.h"
+#endif
+
 static u32 PAUSE_TIME = 0;
 
 static void MultiPause()
@@ -135,3 +139,43 @@ void AbortWithMessage(const char* msg)
 #endif
 	abort();
 }
+
+#ifndef __APPLE__
+// MacOS version is in DarwinMisc
+static CPUInfo CalcCPUInfo()
+{
+	CPUInfo out;
+	out.name = cpuinfo_get_package(0)->name;
+	out.num_threads = cpuinfo_get_processors_count();
+	out.num_clusters = cpuinfo_get_clusters_count();
+	out.num_big_cores = 0;
+	out.num_small_cores = 0;
+	const cpuinfo_cluster* clusters = cpuinfo_get_clusters();
+	uint64_t big_freq = 0;
+	for (uint32_t i = 0; i < out.num_clusters; i++)
+	{
+		const cpuinfo_cluster& cluster = clusters[i];
+		if (cluster.frequency > big_freq)
+		{
+			out.num_small_cores += out.num_big_cores;
+			out.num_big_cores = cluster.core_count;
+			big_freq = cluster.frequency;
+		}
+		else if (cluster.frequency == big_freq)
+		{
+			out.num_big_cores += cluster.core_count;
+		}
+		else
+		{
+			out.num_small_cores += cluster.core_count;
+		}
+	}
+	return out;
+}
+
+const CPUInfo& GetCPUInfo()
+{
+	static const CPUInfo info = CalcCPUInfo();
+	return info;
+}
+#endif

common/HostSys.h

@@ -192,6 +192,16 @@ extern const u32 SPIN_TIME_NS;
 
 extern std::string GetOSVersionString();
 
+struct CPUInfo {
+	std::string name;
+	u32 num_big_cores;
+	u32 num_small_cores;
+	u32 num_threads;
+	u32 num_clusters;
+};
+
+const CPUInfo& GetCPUInfo();
+
 namespace Common
 {
 	/// Enables or disables the screen saver from starting.

common/SmallString.cpp

@@ -600,7 +600,7 @@ bool SmallStringBase::starts_with(const char* str, bool case_sensitive) const
 		return false;
 
 	return (case_sensitive) ? (std::strncmp(str, m_buffer, other_length) == 0) :
-							  (CASE_N_COMPARE(str, m_buffer, other_length) == 0);
+	                          (CASE_N_COMPARE(str, m_buffer, other_length) == 0);
 }
 
 bool SmallStringBase::starts_with(const SmallStringBase& str, bool case_sensitive) const
@@ -610,7 +610,7 @@ bool SmallStringBase::starts_with(const SmallStringBase& str, bool case_sensitiv
 		return false;
 
 	return (case_sensitive) ? (std::strncmp(str.m_buffer, m_buffer, other_length) == 0) :
-							  (CASE_N_COMPARE(str.m_buffer, m_buffer, other_length) == 0);
+	                          (CASE_N_COMPARE(str.m_buffer, m_buffer, other_length) == 0);
 }
 
 bool SmallStringBase::starts_with(const std::string_view str, bool case_sensitive) const
@@ -620,7 +620,7 @@ bool SmallStringBase::starts_with(const std::string_view str, bool case_sensitiv
 		return false;
 
 	return (case_sensitive) ? (std::strncmp(str.data(), m_buffer, other_length) == 0) :
-							  (CASE_N_COMPARE(str.data(), m_buffer, other_length) == 0);
+	                          (CASE_N_COMPARE(str.data(), m_buffer, other_length) == 0);
 }
 
 bool SmallStringBase::starts_with(const std::string& str, bool case_sensitive) const
@@ -630,7 +630,7 @@ bool SmallStringBase::starts_with(const std::string& str, bool case_sensitive) c
 		return false;
 
 	return (case_sensitive) ? (std::strncmp(str.data(), m_buffer, other_length) == 0) :
-							  (CASE_N_COMPARE(str.data(), m_buffer, other_length) == 0);
+	                          (CASE_N_COMPARE(str.data(), m_buffer, other_length) == 0);
 }
 
 bool SmallStringBase::ends_with(const char* str, bool case_sensitive) const
@@ -641,7 +641,7 @@ bool SmallStringBase::ends_with(const char* str, bool case_sensitive) const
 
 	u32 start_offset = m_length - other_length;
 	return (case_sensitive) ? (std::strncmp(str, m_buffer + start_offset, other_length) == 0) :
-							  (CASE_N_COMPARE(str, m_buffer + start_offset, other_length) == 0);
+	                          (CASE_N_COMPARE(str, m_buffer + start_offset, other_length) == 0);
 }
 
 bool SmallStringBase::ends_with(const SmallStringBase& str, bool case_sensitive) const
@@ -652,7 +652,7 @@ bool SmallStringBase::ends_with(const SmallStringBase& str, bool case_sensitive)
 
 	const u32 start_offset = m_length - other_length;
 	return (case_sensitive) ? (std::strncmp(str.m_buffer, m_buffer + start_offset, other_length) == 0) :
-							  (CASE_N_COMPARE(str.m_buffer, m_buffer + start_offset, other_length) == 0);
+	                          (CASE_N_COMPARE(str.m_buffer, m_buffer + start_offset, other_length) == 0);
 }
 
 bool SmallStringBase::ends_with(const std::string_view str, bool case_sensitive) const
@@ -663,7 +663,7 @@ bool SmallStringBase::ends_with(const std::string_view str, bool case_sensitive)
 
 	const u32 start_offset = m_length - other_length;
 	return (case_sensitive) ? (std::strncmp(str.data(), m_buffer + start_offset, other_length) == 0) :
-							  (CASE_N_COMPARE(str.data(), m_buffer + start_offset, other_length) == 0);
+	                          (CASE_N_COMPARE(str.data(), m_buffer + start_offset, other_length) == 0);
 }
 
 bool SmallStringBase::ends_with(const std::string& str, bool case_sensitive) const
@@ -674,7 +674,7 @@ bool SmallStringBase::ends_with(const std::string& str, bool case_sensitive) con
 
 	const u32 start_offset = m_length - other_length;
 	return (case_sensitive) ? (std::strncmp(str.data(), m_buffer + start_offset, other_length) == 0) :
-							  (CASE_N_COMPARE(str.data(), m_buffer + start_offset, other_length) == 0);
+	                          (CASE_N_COMPARE(str.data(), m_buffer + start_offset, other_length) == 0);
 }
 
 void SmallStringBase::clear()

common/common.vcxproj

@@ -32,6 +32,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\cpuinfo\include</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\fast_float\include</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\fmt\include</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\jpgd</AdditionalIncludeDirectories>
@@ -79,9 +80,6 @@
     <ClCompile Include="Windows\WinThreads.cpp" />
     <ClCompile Include="HostSys.cpp" />
     <ClCompile Include="Semaphore.cpp" />
-    <ClCompile Include="emitter\avx.cpp">
-      <ExcludedFromBuild Condition="'$(Platform)'=='ARM64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="emitter\bmi.cpp">
       <ExcludedFromBuild Condition="'$(Platform)'=='ARM64'">true</ExcludedFromBuild>
     </ClCompile>
@@ -191,4 +189,4 @@
   <ImportGroup Label="ExtensionTargets">
     <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
   </ImportGroup>
-</Project>
+</Project>

common/emitter/avx.cpp

@@ -1,172 +0,0 @@
-// SPDX-FileCopyrightText: 2002-2025 PCSX2 Dev Team
-// SPDX-License-Identifier: GPL-3.0+
-
-#include "common/emitter/internal.h"
-
-// warning: suggest braces around initialization of subobject [-Wmissing-braces]
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wmissing-braces"
-#endif
-
-namespace x86Emitter
-{
-	const xImplAVX_Move xVMOVAPS = {0x00, 0x28, 0x29};
-	const xImplAVX_Move xVMOVUPS = {0x00, 0x10, 0x11};
-
-	const xImplAVX_ArithFloat xVADD = {
-		{0x00, 0x58}, // VADDPS
-		{0x66, 0x58}, // VADDPD
-		{0xF3, 0x58}, // VADDSS
-		{0xF2, 0x58}, // VADDSD
-	};
-	const xImplAVX_ArithFloat xVSUB = {
-		{0x00, 0x5C}, // VSUBPS
-		{0x66, 0x5C}, // VSUBPD
-		{0xF3, 0x5C}, // VSUBSS
-		{0xF2, 0x5C}, // VSUBSD
-	};
-	const xImplAVX_ArithFloat xVMUL = {
-		{0x00, 0x59}, // VMULPS
-		{0x66, 0x59}, // VMULPD
-		{0xF3, 0x59}, // VMULSS
-		{0xF2, 0x59}, // VMULSD
-	};
-	const xImplAVX_ArithFloat xVDIV = {
-		{0x00, 0x5E}, // VDIVPS
-		{0x66, 0x5E}, // VDIVPD
-		{0xF3, 0x5E}, // VDIVSS
-		{0xF2, 0x5E}, // VDIVSD
-	};
-	const xImplAVX_CmpFloat xVCMP = {
-		{SSE2_Equal},
-		{SSE2_Less},
-		{SSE2_LessOrEqual},
-		{SSE2_Unordered},
-		{SSE2_NotEqual},
-		{SSE2_NotLess},
-		{SSE2_NotLessOrEqual},
-		{SSE2_Ordered},
-	};
-	const xImplAVX_ThreeArgYMM xVPAND = {0x66, 0xDB};
-	const xImplAVX_ThreeArgYMM xVPANDN = {0x66, 0xDF};
-	const xImplAVX_ThreeArgYMM xVPOR = {0x66, 0xEB};
-	const xImplAVX_ThreeArgYMM xVPXOR = {0x66, 0xEF};
-	const xImplAVX_CmpInt xVPCMP = {
-		{0x66, 0x74}, // VPCMPEQB
-		{0x66, 0x75}, // VPCMPEQW
-		{0x66, 0x76}, // VPCMPEQD
-		{0x66, 0x64}, // VPCMPGTB
-		{0x66, 0x65}, // VPCMPGTW
-		{0x66, 0x66}, // VPCMPGTD
-	};
-
-	void xVPMOVMSKB(const xRegister32& to, const xRegisterSSE& from)
-	{
-		xOpWriteC5(0x66, 0xd7, to, xRegister32(), from);
-	}
-
-	void xVMOVMSKPS(const xRegister32& to, const xRegisterSSE& from)
-	{
-		xOpWriteC5(0x00, 0x50, to, xRegister32(), from);
-	}
-
-	void xVMOVMSKPD(const xRegister32& to, const xRegisterSSE& from)
-	{
-		xOpWriteC5(0x66, 0x50, to, xRegister32(), from);
-	}
-
-	void xVZEROUPPER()
-	{
-		// rather than dealing with nonexistant operands..
-		xWrite8(0xc5);
-		xWrite8(0xf8);
-		xWrite8(0x77);
-	}
-
-	void xImplAVX_Move::operator()(const xRegisterSSE& to, const xRegisterSSE& from) const
-	{
-		if (to != from)
-			xOpWriteC5(Prefix, LoadOpcode, to, xRegisterSSE(), from);
-	}
-
-	void xImplAVX_Move::operator()(const xRegisterSSE& to, const xIndirectVoid& from) const
-	{
-		xOpWriteC5(Prefix, LoadOpcode, to, xRegisterSSE(), from);
-	}
-
-	void xImplAVX_Move::operator()(const xIndirectVoid& to, const xRegisterSSE& from) const
-	{
-		xOpWriteC5(Prefix, StoreOpcode, from, xRegisterSSE(), to);
-	}
-
-	void xImplAVX_ThreeArg::operator()(const xRegisterSSE& to, const xRegisterSSE& from1, const xRegisterSSE& from2) const
-	{
-		pxAssert(!to.IsWideSIMD() && !from1.IsWideSIMD() && !from2.IsWideSIMD());
-		xOpWriteC5(Prefix, Opcode, to, from1, from2);
-	}
-
-	void xImplAVX_ThreeArg::operator()(const xRegisterSSE& to, const xRegisterSSE& from1, const xIndirectVoid& from2) const
-	{
-		pxAssert(!to.IsWideSIMD() && !from1.IsWideSIMD());
-		xOpWriteC5(Prefix, Opcode, to, from1, from2);
-	}
-
-	void xImplAVX_ThreeArgYMM::operator()(const xRegisterSSE& to, const xRegisterSSE& from1, const xRegisterSSE& from2) const
-	{
-		xOpWriteC5(Prefix, Opcode, to, from1, from2);
-	}
-
-	void xImplAVX_ThreeArgYMM::operator()(const xRegisterSSE& to, const xRegisterSSE& from1, const xIndirectVoid& from2) const
-	{
-		xOpWriteC5(Prefix, Opcode, to, from1, from2);
-	}
-
-	void xImplAVX_CmpFloatHelper::PS(const xRegisterSSE& to, const xRegisterSSE& from1, const xRegisterSSE& from2) const
-	{
-		xOpWriteC5(0x00, 0xC2, to, from1, from2);
-		xWrite8(static_cast<u8>(CType));
-	}
-
-	void xImplAVX_CmpFloatHelper::PS(const xRegisterSSE& to, const xRegisterSSE& from1, const xIndirectVoid& from2) const
-	{
-		xOpWriteC5(0x00, 0xC2, to, from1, from2);
-		xWrite8(static_cast<u8>(CType));
-	}
-
-	void xImplAVX_CmpFloatHelper::PD(const xRegisterSSE& to, const xRegisterSSE& from1, const xIndirectVoid& from2) const
-	{
-		xOpWriteC5(0x66, 0xC2, to, from1, from2);
-		xWrite8(static_cast<u8>(CType));
-	}
-
-	void xImplAVX_CmpFloatHelper::PD(const xRegisterSSE& to, const xRegisterSSE& from1, const xRegisterSSE& from2) const
-	{
-		xOpWriteC5(0x66, 0xC2, to, from1, from2);
-		xWrite8(static_cast<u8>(CType));
-	}
-
-	void xImplAVX_CmpFloatHelper::SS(const xRegisterSSE& to, const xRegisterSSE& from1, const xRegisterSSE& from2) const
-	{
-		xOpWriteC5(0xF3, 0xC2, to, from1, from2);
-		xWrite8(static_cast<u8>(CType));
-	}
-
-	void xImplAVX_CmpFloatHelper::SS(const xRegisterSSE& to, const xRegisterSSE& from1, const xIndirectVoid& from2) const
-	{
-		xOpWriteC5(0xF3, 0xC2, to, from1, from2);
-		xWrite8(static_cast<u8>(CType));
-	}
-
-	void xImplAVX_CmpFloatHelper::SD(const xRegisterSSE& to, const xRegisterSSE& from1, const xIndirectVoid& from2) const
-	{
-		xOpWriteC5(0xF2, 0xC2, to, from1, from2);
-		xWrite8(static_cast<u8>(CType));
-	}
-
-	void xImplAVX_CmpFloatHelper::SD(const xRegisterSSE& to, const xRegisterSSE& from1, const xRegisterSSE& from2) const
-	{
-		xOpWriteC5(0xF2, 0xC2, to, from1, from2);
-		xWrite8(static_cast<u8>(CType));
-	}
-} // namespace x86Emitter

common/emitter/groups.cpp

@@ -29,7 +29,7 @@ namespace x86Emitter
 	// Note on "[Indirect],Imm" forms : use int as the source operand since it's "reasonably inert" from a
 	// compiler perspective.  (using uint tends to make the compiler try and fail to match signed immediates
 	// with one of the other overloads).
-	static void _g1_IndirectImm(G1Type InstType, const xIndirect64orLess& sibdest, int imm)
+	void xImpl_Group1::operator()(const xIndirect64orLess& sibdest, int imm) const
 	{
 		if (sibdest.Is8BitOp())
 		{
@@ -49,7 +49,7 @@ namespace x86Emitter
 		}
 	}
 
-	void _g1_EmitOp(G1Type InstType, const xRegisterInt& to, const xRegisterInt& from)
+	void xImpl_Group1::operator()(const xRegisterInt& to, const xRegisterInt& from) const
 	{
 		pxAssert(to.GetOperandSize() == from.GetOperandSize());
 
@@ -57,19 +57,19 @@ namespace x86Emitter
 		xOpWrite(to.GetPrefix16(), opcode, from, to);
 	}
 
-	static void _g1_EmitOp(G1Type InstType, const xIndirectVoid& sibdest, const xRegisterInt& from)
+	void xImpl_Group1::operator()(const xIndirectVoid& sibdest, const xRegisterInt& from) const
 	{
 		u8 opcode = (from.Is8BitOp() ? 0 : 1) | (InstType << 3);
 		xOpWrite(from.GetPrefix16(), opcode, from, sibdest);
 	}
 
-	static void _g1_EmitOp(G1Type InstType, const xRegisterInt& to, const xIndirectVoid& sibsrc)
+	void xImpl_Group1::operator()(const xRegisterInt& to, const xIndirectVoid& sibsrc) const
 	{
 		u8 opcode = (to.Is8BitOp() ? 2 : 3) | (InstType << 3);
 		xOpWrite(to.GetPrefix16(), opcode, to, sibsrc);
 	}
 
-	static void _g1_EmitOp(G1Type InstType, const xRegisterInt& to, int imm)
+	void xImpl_Group1::operator()(const xRegisterInt& to, int imm) const
 	{
 		if (!to.Is8BitOp() && is_s8(imm))
 		{
@@ -92,28 +92,16 @@ namespace x86Emitter
 		}
 	}
 
-#define ImplementGroup1(g1type, insttype)                                                                                 \
-    void g1type::operator()(const xRegisterInt& to, const xRegisterInt& from) const { _g1_EmitOp(insttype, to, from); }   \
-    void g1type::operator()(const xIndirectVoid& to, const xRegisterInt& from) const { _g1_EmitOp(insttype, to, from); }  \
-    void g1type::operator()(const xRegisterInt& to, const xIndirectVoid& from) const { _g1_EmitOp(insttype, to, from); }  \
-    void g1type::operator()(const xRegisterInt& to, int imm) const { _g1_EmitOp(insttype, to, imm); }                     \
-    void g1type::operator()(const xIndirect64orLess& sibdest, int imm) const { _g1_IndirectImm(insttype, sibdest, imm); }
+	const xImpl_G1Logic xAND = {{G1Type_AND}, {SIMDInstructionInfo(0x54).commutative()}, {SIMDInstructionInfo(0x54).commutative().p66()}};
+	const xImpl_G1Logic xOR  = {{G1Type_OR},  {SIMDInstructionInfo(0x56).commutative()}, {SIMDInstructionInfo(0x56).commutative().p66()}};
+	const xImpl_G1Logic xXOR = {{G1Type_XOR}, {SIMDInstructionInfo(0x57).commutative()}, {SIMDInstructionInfo(0x57).commutative().p66()}};
 
-	ImplementGroup1(xImpl_Group1, InstType)
-	ImplementGroup1(xImpl_G1Logic, InstType)
-	ImplementGroup1(xImpl_G1Arith, InstType)
-	ImplementGroup1(xImpl_G1Compare, G1Type_CMP)
-
-	const xImpl_G1Logic xAND = {G1Type_AND, {0x00, 0x54}, {0x66, 0x54}};
-	const xImpl_G1Logic xOR = {G1Type_OR, {0x00, 0x56}, {0x66, 0x56}};
-	const xImpl_G1Logic xXOR = {G1Type_XOR, {0x00, 0x57}, {0x66, 0x57}};
-
-	const xImpl_G1Arith xADD = {G1Type_ADD, {0x00, 0x58}, {0x66, 0x58}, {0xf3, 0x58}, {0xf2, 0x58}};
-	const xImpl_G1Arith xSUB = {G1Type_SUB, {0x00, 0x5c}, {0x66, 0x5c}, {0xf3, 0x5c}, {0xf2, 0x5c}};
-	const xImpl_G1Compare xCMP = {{0x00, 0xc2}, {0x66, 0xc2}, {0xf3, 0xc2}, {0xf2, 0xc2}};
+	const xImpl_G1Arith xADD = {{G1Type_ADD}, {SIMDInstructionInfo(0x58).commutative()}, {SIMDInstructionInfo(0x58).commutative().p66()}, {SIMDInstructionInfo(0x58).pf3()}, {SIMDInstructionInfo(0x58).pf2()}};
+	const xImpl_G1Arith xSUB = {{G1Type_SUB}, {SIMDInstructionInfo(0x5c)}, {SIMDInstructionInfo(0x5c).p66()}, {SIMDInstructionInfo(0x5c).pf3()}, {SIMDInstructionInfo(0x5c).pf2()}};
 
 	const xImpl_Group1 xADC = {G1Type_ADC};
 	const xImpl_Group1 xSBB = {G1Type_SBB};
+	const xImpl_Group1 xCMP = {G1Type_CMP};
 
 	// =====================================================================================================
 	//  Group 2 Instructions - SHR, SHL, etc.
@@ -186,11 +174,15 @@ namespace x86Emitter
 		xOpWrite(from.GetPrefix16(), from.Is8BitOp() ? 0xf6 : 0xf7, InstType, from);
 	}
 
-	void xImpl_Group3::operator()(const xRegisterInt& from) const { _g3_EmitOp(InstType, from); }
-	void xImpl_Group3::operator()(const xIndirect64orLess& from) const { _g3_EmitOp(InstType, from); }
+	void xImpl_Group3::operator()(const xRegisterInt& from) const
+	{
+		xOpWrite(from.GetPrefix16(), from.Is8BitOp() ? 0xf6 : 0xf7, InstType, from);
+	}
 
-	void xImpl_iDiv::operator()(const xRegisterInt& from) const { _g3_EmitOp(G3Type_iDIV, from); }
-	void xImpl_iDiv::operator()(const xIndirect64orLess& from) const { _g3_EmitOp(G3Type_iDIV, from); }
+	void xImpl_Group3::operator()(const xIndirect64orLess& from) const
+	{
+		xOpWrite(from.GetPrefix16(), from.Is8BitOp() ? 0xf6 : 0xf7, InstType, from);
+	}
 
 	template <typename SrcType>
 	static void _imul_ImmStyle(const xRegisterInt& param1, const SrcType& param2, int imm)
@@ -205,9 +197,6 @@ namespace x86Emitter
 			param1.xWriteImm(imm);
 	}
 
-	void xImpl_iMul::operator()(const xRegisterInt& from) const { _g3_EmitOp(G3Type_iMUL, from); }
-	void xImpl_iMul::operator()(const xIndirect64orLess& from) const { _g3_EmitOp(G3Type_iMUL, from); }
-
 	void xImpl_iMul::operator()(const xRegister32& to, const xRegister32& from) const { xOpWrite0F(0xaf, to, from); }
 	void xImpl_iMul::operator()(const xRegister32& to, const xIndirectVoid& src) const { xOpWrite0F(0xaf, to, src); }
 	void xImpl_iMul::operator()(const xRegister16& to, const xRegister16& from) const { xOpWrite0F(0x66, 0xaf, to, from); }
@@ -223,8 +212,8 @@ namespace x86Emitter
 	const xImpl_Group3 xUMUL = {G3Type_MUL};
 	const xImpl_Group3 xUDIV = {G3Type_DIV};
 
-	const xImpl_iDiv xDIV = {{0x00, 0x5e}, {0x66, 0x5e}, {0xf3, 0x5e}, {0xf2, 0x5e}};
-	const xImpl_iMul xMUL = {{0x00, 0x59}, {0x66, 0x59}, {0xf3, 0x59}, {0xf2, 0x59}};
+	const xImpl_iDiv xDIV = {{G3Type_iDIV}, {SIMDInstructionInfo(0x5e)}, {SIMDInstructionInfo(0x5e).p66()}, {SIMDInstructionInfo(0x5e).pf3()}, {SIMDInstructionInfo(0x5e).pf2()}};
+	const xImpl_iMul xMUL = {{G3Type_iMUL}, {SIMDInstructionInfo(0x59).commutative()}, {SIMDInstructionInfo(0x59).commutative().p66()}, {SIMDInstructionInfo(0x59).pf3()}, {SIMDInstructionInfo(0x59).pf2()}};
 
 	// =====================================================================================================
 	//  Group 8 Instructions

common/emitter/implement/group1.h

@@ -18,8 +18,6 @@ namespace x86Emitter
 		G1Type_CMP
 	};
 
-	extern void _g1_EmitOp(G1Type InstType, const xRegisterInt& to, const xRegisterInt& from);
-
 	// --------------------------------------------------------------------------------------
 	//  xImpl_Group1
 	// --------------------------------------------------------------------------------------
@@ -33,99 +31,27 @@ namespace x86Emitter
 		void operator()(const xRegisterInt& to, const xIndirectVoid& from) const;
 		void operator()(const xRegisterInt& to, int imm) const;
 		void operator()(const xIndirect64orLess& to, int imm) const;
-
-#if 0
-	// ------------------------------------------------------------------------
-	template< typename T > __noinline void operator()( const ModSibBase& to, const xImmReg<T>& immOrReg ) const
-	{
-		_DoI_helpermess( *this, to, immOrReg );
-	}
-
-	template< typename T > __noinline void operator()( const xDirectOrIndirect<T>& to, const xImmReg<T>& immOrReg ) const
-	{
-		_DoI_helpermess( *this, to, immOrReg );
-	}
-
-	template< typename T > __noinline void operator()( const xDirectOrIndirect<T>& to, int imm ) const
-	{
-		_DoI_helpermess( *this, to, imm );
-	}
-
-	template< typename T > __noinline void operator()( const xDirectOrIndirect<T>& to, const xDirectOrIndirect<T>& from ) const
-	{
-		_DoI_helpermess( *this, to, from );
-	}
-
-	// FIXME : Make this struct to 8, 16, and 32 bit registers
-	template< typename T > __noinline void operator()( const xRegisterBase& to, const xDirectOrIndirect<T>& from ) const
-	{
-		_DoI_helpermess( *this, xDirectOrIndirect<T>( to ), from );
-	}
-
-	// FIXME : Make this struct to 8, 16, and 32 bit registers
-	template< typename T > __noinline void operator()( const xDirectOrIndirect<T>& to, const xRegisterBase& from ) const
-	{
-		_DoI_helpermess( *this, to, xDirectOrIndirect<T>( from ) );
-	}
-#endif
 	};
 
 	// ------------------------------------------------------------------------
 	// This class combines x86 with SSE/SSE2 logic operations (ADD, OR, and NOT).
 	// Note: ANDN [AndNot] is handled below separately.
 	//
-	struct xImpl_G1Logic
+	struct xImpl_G1Logic : public xImpl_Group1
 	{
-		G1Type InstType;
-
-		void operator()(const xRegisterInt& to, const xRegisterInt& from) const;
-
-		void operator()(const xIndirectVoid& to, const xRegisterInt& from) const;
-		void operator()(const xRegisterInt& to, const xIndirectVoid& from) const;
-		void operator()(const xRegisterInt& to, int imm) const;
-
-		void operator()(const xIndirect64orLess& to, int imm) const;
-
-		xImplSimd_DestRegSSE PS; // packed single precision
-		xImplSimd_DestRegSSE PD; // packed double precision
+		xImplSimd_3Arg PS; // packed single precision
+		xImplSimd_3Arg PD; // packed double precision
 	};
 
 	// ------------------------------------------------------------------------
 	// This class combines x86 with SSE/SSE2 arithmetic operations (ADD/SUB).
 	//
-	struct xImpl_G1Arith
+	struct xImpl_G1Arith : public xImpl_Group1
 	{
-		G1Type InstType;
-
-		void operator()(const xRegisterInt& to, const xRegisterInt& from) const;
-
-		void operator()(const xIndirectVoid& to, const xRegisterInt& from) const;
-		void operator()(const xRegisterInt& to, const xIndirectVoid& from) const;
-		void operator()(const xRegisterInt& to, int imm) const;
-
-		void operator()(const xIndirect64orLess& to, int imm) const;
-
-		xImplSimd_DestRegSSE PS; // packed single precision
-		xImplSimd_DestRegSSE PD; // packed double precision
-		xImplSimd_DestRegSSE SS; // scalar single precision
-		xImplSimd_DestRegSSE SD; // scalar double precision
-	};
-
-	// ------------------------------------------------------------------------
-	struct xImpl_G1Compare
-	{
-		void operator()(const xRegisterInt& to, const xRegisterInt& from) const;
-
-		void operator()(const xIndirectVoid& to, const xRegisterInt& from) const;
-		void operator()(const xRegisterInt& to, const xIndirectVoid& from) const;
-		void operator()(const xRegisterInt& to, int imm) const;
-
-		void operator()(const xIndirect64orLess& to, int imm) const;
-
-		xImplSimd_DestSSE_CmpImm PS;
-		xImplSimd_DestSSE_CmpImm PD;
-		xImplSimd_DestSSE_CmpImm SS;
-		xImplSimd_DestSSE_CmpImm SD;
+		xImplSimd_3Arg PS; // packed single precision
+		xImplSimd_3Arg PD; // packed double precision
+		xImplSimd_3Arg SS; // scalar single precision
+		xImplSimd_3Arg SD; // scalar double precision
 	};
 
 } // End namespace x86Emitter

common/emitter/implement/group3.h

@@ -25,57 +25,26 @@ namespace x86Emitter
 
 		void operator()(const xRegisterInt& from) const;
 		void operator()(const xIndirect64orLess& from) const;
-
-#if 0
-	template< typename T >
-	void operator()( const xDirectOrIndirect<T>& from ) const
-	{
-		_DoI_helpermess( *this, from );
-	}
-#endif
-	};
-
-	// --------------------------------------------------------------------------------------
-	//  xImpl_MulDivBase
-	// --------------------------------------------------------------------------------------
-	// This class combines x86 and SSE/SSE2 instructions for iMUL and iDIV.
-	//
-	struct xImpl_MulDivBase
-	{
-		G3Type InstType;
-		u16 OpcodeSSE;
-
-		void operator()(const xRegisterInt& from) const;
-		void operator()(const xIndirect64orLess& from) const;
-
-		const xImplSimd_DestRegSSE PS;
-		const xImplSimd_DestRegSSE PD;
-		const xImplSimd_DestRegSSE SS;
-		const xImplSimd_DestRegSSE SD;
 	};
 
 	// --------------------------------------------------------------------------------------
 	//  xImpl_iDiv
 	// --------------------------------------------------------------------------------------
-	struct xImpl_iDiv
+	struct xImpl_iDiv : public xImpl_Group3
 	{
-		void operator()(const xRegisterInt& from) const;
-		void operator()(const xIndirect64orLess& from) const;
-
-		const xImplSimd_DestRegSSE PS;
-		const xImplSimd_DestRegSSE PD;
-		const xImplSimd_DestRegSSE SS;
-		const xImplSimd_DestRegSSE SD;
+		const xImplSimd_3Arg PS;
+		const xImplSimd_3Arg PD;
+		const xImplSimd_3Arg SS;
+		const xImplSimd_3Arg SD;
 	};
 
 	// --------------------------------------------------------------------------------------
 	//  xImpl_iMul
 	// --------------------------------------------------------------------------------------
 	//
-	struct xImpl_iMul
+	struct xImpl_iMul : public xImpl_Group3
 	{
-		void operator()(const xRegisterInt& from) const;
-		void operator()(const xIndirect64orLess& from) const;
+		using xImpl_Group3::operator();
 
 		// The following iMul-specific forms are valid for 16 and 32 bit register operands only!
 
@@ -89,9 +58,9 @@ namespace x86Emitter
 		void operator()(const xRegister16& to, const xRegister16& from, s16 imm) const;
 		void operator()(const xRegister16& to, const xIndirectVoid& from, s16 imm) const;
 
-		const xImplSimd_DestRegSSE PS;
-		const xImplSimd_DestRegSSE PD;
-		const xImplSimd_DestRegSSE SS;
-		const xImplSimd_DestRegSSE SD;
+		const xImplSimd_3Arg PS;
+		const xImplSimd_3Arg PD;
+		const xImplSimd_3Arg SS;
+		const xImplSimd_3Arg SD;
 	};
 } // namespace x86Emitter

common/emitter/implement/simd_arithmetic.h

@@ -11,15 +11,16 @@ namespace x86Emitter
 	// --------------------------------------------------------------------------------------
 	struct _SimdShiftHelper
 	{
-		u8 Prefix;
-		u16 Opcode;
-		u16 OpcodeImm;
-		u8 Modcode;
+		SIMDInstructionInfo info;
+		SIMDInstructionInfo infoImm;
 
-		void operator()(const xRegisterSSE& to, const xRegisterSSE& from) const;
-		void operator()(const xRegisterSSE& to, const xIndirectVoid& from) const;
+		void operator()(const xRegisterSSE& dst, const xRegisterSSE& src)  const { (*this)(dst, dst, src); }
+		void operator()(const xRegisterSSE& dst, const xIndirectVoid& src) const { (*this)(dst, dst, src); }
+		void operator()(const xRegisterSSE& dst, const xRegisterSSE& src1, const xRegisterSSE& src2)  const;
+		void operator()(const xRegisterSSE& dst, const xRegisterSSE& src1, const xIndirectVoid& src2) const;
 
-		void operator()(const xRegisterSSE& to, u8 imm8) const;
+		void operator()(const xRegisterSSE& dst, u8 imm8) const { (*this)(dst, dst, imm8); }
+		void operator()(const xRegisterSSE& dst, const xRegisterSSE& src, u8 imm8) const;
 	};
 
 	// --------------------------------------------------------------------------------------
@@ -42,39 +43,40 @@ namespace x86Emitter
 		const _SimdShiftHelper D;
 		const _SimdShiftHelper Q;
 
-		void DQ(const xRegisterSSE& to, u8 imm8) const;
+		void DQ(const xRegisterSSE& dst, u8 imm8) const { DQ(dst, dst, imm8); }
+		void DQ(const xRegisterSSE& dst, const xRegisterSSE& src, u8 imm8) const;
 	};
 
 	//////////////////////////////////////////////////////////////////////////////////////////
 	//
 	struct xImplSimd_AddSub
 	{
-		const xImplSimd_DestRegEither B;
-		const xImplSimd_DestRegEither W;
-		const xImplSimd_DestRegEither D;
-		const xImplSimd_DestRegEither Q;
+		const xImplSimd_3Arg B;
+		const xImplSimd_3Arg W;
+		const xImplSimd_3Arg D;
+		const xImplSimd_3Arg Q;
 
 		// Add/Sub packed signed byte [8bit] integers from src into dest, and saturate the results.
-		const xImplSimd_DestRegEither SB;
+		const xImplSimd_3Arg SB;
 
 		// Add/Sub packed signed word [16bit] integers from src into dest, and saturate the results.
-		const xImplSimd_DestRegEither SW;
+		const xImplSimd_3Arg SW;
 
 		// Add/Sub packed unsigned byte [8bit] integers from src into dest, and saturate the results.
-		const xImplSimd_DestRegEither USB;
+		const xImplSimd_3Arg USB;
 
 		// Add/Sub packed unsigned word [16bit] integers from src into dest, and saturate the results.
-		const xImplSimd_DestRegEither USW;
+		const xImplSimd_3Arg USW;
 	};
 
 	//////////////////////////////////////////////////////////////////////////////////////////
 	//
 	struct xImplSimd_PMul
 	{
-		const xImplSimd_DestRegEither LW;
-		const xImplSimd_DestRegEither HW;
-		const xImplSimd_DestRegEither HUW;
-		const xImplSimd_DestRegEither UDQ;
+		const xImplSimd_3Arg LW;
+		const xImplSimd_3Arg HW;
+		const xImplSimd_3Arg HUW;
+		const xImplSimd_3Arg UDQ;
 
 		// [SSE-3] PMULHRSW multiplies vertically each signed 16-bit integer from dest with the
 		// corresponding signed 16-bit integer of source, producing intermediate signed 32-bit
@@ -86,14 +88,14 @@ namespace x86Emitter
 		//
 		// Both operands can be MMX or XMM registers.  Source can be register or memory.
 		//
-		const xImplSimd_DestRegEither HRSW;
+		const xImplSimd_3Arg HRSW;
 
 		// [SSE-4.1] Multiply the packed dword signed integers in dest with src, and store
 		// the low 32 bits of each product in xmm1.
-		const xImplSimd_DestRegSSE LD;
+		const xImplSimd_3Arg LD;
 
 		// [SSE-4.1] Multiply the packed signed dword integers in dest with src.
-		const xImplSimd_DestRegSSE DQ;
+		const xImplSimd_3Arg DQ;
 	};
 
 	//////////////////////////////////////////////////////////////////////////////////////////
@@ -101,26 +103,27 @@ namespace x86Emitter
 	//
 	struct xImplSimd_rSqrt
 	{
-		const xImplSimd_DestRegSSE PS;
-		const xImplSimd_DestRegSSE SS;
+		const xImplSimd_2Arg PS;
+		const xImplSimd_3Arg SS;
 	};
 
 	//////////////////////////////////////////////////////////////////////////////////////////
-	// SQRT has PS/SS/SD forms, but not the PD form.
+	// SQRT has PS/SS/PD/SD forms
 	//
 	struct xImplSimd_Sqrt
 	{
-		const xImplSimd_DestRegSSE PS;
-		const xImplSimd_DestRegSSE SS;
-		const xImplSimd_DestRegSSE SD;
+		const xImplSimd_2Arg PS;
+		const xImplSimd_3Arg SS;
+		const xImplSimd_2Arg PD;
+		const xImplSimd_3Arg SD;
 	};
 
 	//////////////////////////////////////////////////////////////////////////////////////////
 	//
 	struct xImplSimd_AndNot
 	{
-		const xImplSimd_DestRegSSE PS;
-		const xImplSimd_DestRegSSE PD;
+		const xImplSimd_3Arg PS;
+		const xImplSimd_3Arg PD;
 	};
 
 	//////////////////////////////////////////////////////////////////////////////////////////
@@ -130,15 +133,15 @@ namespace x86Emitter
 	{
 		// [sSSE-3] Computes the absolute value of bytes in the src, and stores the result
 		// in dest, as UNSIGNED.
-		const xImplSimd_DestRegEither B;
+		const xImplSimd_2Arg B;
 
 		// [sSSE-3] Computes the absolute value of word in the src, and stores the result
 		// in dest, as UNSIGNED.
-		const xImplSimd_DestRegEither W;
+		const xImplSimd_2Arg W;
 
 		// [sSSE-3] Computes the absolute value of doublewords in the src, and stores the
 		// result in dest, as UNSIGNED.
-		const xImplSimd_DestRegEither D;
+		const xImplSimd_2Arg D;
 	};
 
 	//////////////////////////////////////////////////////////////////////////////////////////
@@ -152,21 +155,21 @@ namespace x86Emitter
 		// of a data element in src is positive, the corresponding data element in dest is
 		// unchanged. If a data element in src is zero, the corresponding data element in
 		// dest is set to zero.
-		const xImplSimd_DestRegEither B;
+		const xImplSimd_3Arg B;
 
 		// [sSSE-3] negates each word element of dest if the signed integer value of the
 		// corresponding data element in src is less than zero. If the signed integer value
 		// of a data element in src is positive, the corresponding data element in dest is
 		// unchanged. If a data element in src is zero, the corresponding data element in
 		// dest is set to zero.
-		const xImplSimd_DestRegEither W;
+		const xImplSimd_3Arg W;
 
 		// [sSSE-3] negates each doubleword element of dest if the signed integer value
 		// of the corresponding data element in src is less than zero. If the signed integer
 		// value of a data element in src is positive, the corresponding data element in dest
 		// is unchanged. If a data element in src is zero, the corresponding data element in
 		// dest is set to zero.
-		const xImplSimd_DestRegEither D;
+		const xImplSimd_3Arg D;
 	};
 
 	//////////////////////////////////////////////////////////////////////////////////////////
@@ -182,7 +185,7 @@ namespace x86Emitter
 		//   DEST[63:32] = ( DEST[47:32] * SRC[47:32]) + (DEST[63:48] * SRC[63:48] );
 		//   [.. repeat in the case of XMM src/dest operands ..]
 		//
-		const xImplSimd_DestRegEither WD;
+		const xImplSimd_3Arg WD;
 
 		// [sSSE-3] multiplies vertically each unsigned byte of dest with the corresponding
 		// signed byte of src, producing intermediate signed 16-bit integers. Each adjacent
@@ -198,7 +201,7 @@ namespace x86Emitter
 		//   DEST[31-16] = SaturateToSignedWord( SRC[31-24] * DEST[31-24] + SRC[23-16] * DEST[23-16] );
 		//   [.. repeat for each 16 bits up to 64 (mmx) or 128 (xmm) ..]
 		//
-		const xImplSimd_DestRegEither UBSW;
+		const xImplSimd_3Arg UBSW;
 	};
 
 	//////////////////////////////////////////////////////////////////////////////////////////
@@ -213,14 +216,14 @@ namespace x86Emitter
 		//   stores the result in the second dword of dest.
 		// * Adds single-precision floating-point values in the first and second dword of *src*
 		//   and stores the result in the third dword of dest.
-		const xImplSimd_DestRegSSE PS;
+		const xImplSimd_3Arg PS;
 
 		// [SSE-3] Horizontal Add of Packed Data.  A two step process:
 		// * Adds the double-precision floating-point values in the high and low quadwords of
 		//   dest and stores the result in the low quadword of dest.
 		// * Adds the double-precision floating-point values in the high and low quadwords of
 		//   *src* stores the result in the high quadword of dest.
-		const xImplSimd_DestRegSSE PD;
+		const xImplSimd_3Arg PD;
 	};
 
 	//////////////////////////////////////////////////////////////////////////////////////////
@@ -241,10 +244,10 @@ namespace x86Emitter
 		// element in dest.  If a broadcast mask bit is zero, the corresponding element in
 		// the destination is set to zero.
 		//
-		xImplSimd_DestRegImmSSE PS;
+		xImplSimd_3ArgImm PS;
 
 		// [SSE-4.1]
-		xImplSimd_DestRegImmSSE PD;
+		xImplSimd_3ArgImm PD;
 	};
 
 	//////////////////////////////////////////////////////////////////////////////////////////
@@ -262,7 +265,7 @@ namespace x86Emitter
 		// Rounding Mode Reference:
 		//   0 - Nearest, 1 - Negative Infinity, 2 - Positive infinity, 3 - Truncate.
 		//
-		const xImplSimd_DestRegImmSSE PS;
+		const xImplSimd_2ArgImm PS;
 
 		// [SSE-4.1] Rounds the 2 packed double-precision src values and stores them in dest.
 		//
@@ -274,7 +277,7 @@ namespace x86Emitter
 		// Rounding Mode Reference:
 		//   0 - Nearest, 1 - Negative Infinity, 2 - Positive infinity, 3 - Truncate.
 		//
-		const xImplSimd_DestRegImmSSE PD;
+		const xImplSimd_2ArgImm PD;
 
 		// [SSE-4.1] Rounds the single-precision src value and stores in dest.
 		//
@@ -286,7 +289,7 @@ namespace x86Emitter
 		// Rounding Mode Reference:
 		//   0 - Nearest, 1 - Negative Infinity, 2 - Positive infinity, 3 - Truncate.
 		//
-		const xImplSimd_DestRegImmSSE SS;
+		const xImplSimd_3ArgImm SS;
 
 		// [SSE-4.1] Rounds the double-precision src value and stores in dest.
 		//
@@ -298,7 +301,7 @@ namespace x86Emitter
 		// Rounding Mode Reference:
 		//   0 - Nearest, 1 - Negative Infinity, 2 - Positive infinity, 3 - Truncate.
 		//
-		const xImplSimd_DestRegImmSSE SD;
+		const xImplSimd_3ArgImm SD;
 	};
 
 } // End namespace x86Emitter

common/emitter/implement/simd_comparisons.h

@@ -8,10 +8,10 @@ namespace x86Emitter
 
 	struct xImplSimd_MinMax
 	{
-		const xImplSimd_DestRegSSE PS; // packed single precision
-		const xImplSimd_DestRegSSE PD; // packed double precision
-		const xImplSimd_DestRegSSE SS; // scalar single precision
-		const xImplSimd_DestRegSSE SD; // scalar double precision
+		const xImplSimd_3Arg PS; // packed single precision
+		const xImplSimd_3Arg PD; // packed double precision
+		const xImplSimd_3Arg SS; // scalar single precision
+		const xImplSimd_3Arg SD; // scalar double precision
 	};
 
 	//////////////////////////////////////////////////////////////////////////////////////////
@@ -20,17 +20,25 @@ namespace x86Emitter
 	{
 		SSE2_ComparisonType CType;
 
-		void PS(const xRegisterSSE& to, const xRegisterSSE& from) const;
-		void PS(const xRegisterSSE& to, const xIndirectVoid& from) const;
+		void PS(const xRegisterSSE& dst, const xRegisterSSE&  src) const { PS(dst, dst, src); }
+		void PS(const xRegisterSSE& dst, const xIndirectVoid& src) const { PS(dst, dst, src); }
+		void PS(const xRegisterSSE& dst, const xRegisterSSE& src1, const xRegisterSSE&  src2) const;
+		void PS(const xRegisterSSE& dst, const xRegisterSSE& src1, const xIndirectVoid& src2) const;
 
-		void PD(const xRegisterSSE& to, const xRegisterSSE& from) const;
-		void PD(const xRegisterSSE& to, const xIndirectVoid& from) const;
+		void PD(const xRegisterSSE& dst, const xRegisterSSE&  src) const { PD(dst, dst, src); }
+		void PD(const xRegisterSSE& dst, const xIndirectVoid& src) const { PD(dst, dst, src); }
+		void PD(const xRegisterSSE& dst, const xRegisterSSE& src1, const xRegisterSSE&  src2) const;
+		void PD(const xRegisterSSE& dst, const xRegisterSSE& src1, const xIndirectVoid& src2) const;
 
-		void SS(const xRegisterSSE& to, const xRegisterSSE& from) const;
-		void SS(const xRegisterSSE& to, const xIndirectVoid& from) const;
+		void SS(const xRegisterSSE& dst, const xRegisterSSE&  src) const { SS(dst, dst, src); }
+		void SS(const xRegisterSSE& dst, const xIndirectVoid& src) const { SS(dst, dst, src); }
+		void SS(const xRegisterSSE& dst, const xRegisterSSE& src1, const xRegisterSSE&  src2) const;
+		void SS(const xRegisterSSE& dst, const xRegisterSSE& src1, const xIndirectVoid& src2) const;
 
-		void SD(const xRegisterSSE& to, const xRegisterSSE& from) const;
-		void SD(const xRegisterSSE& to, const xIndirectVoid& from) const;
+		void SD(const xRegisterSSE& dst, const xRegisterSSE&  src) const { SD(dst, dst, src); }
+		void SD(const xRegisterSSE& dst, const xIndirectVoid& src) const { SD(dst, dst, src); }
+		void SD(const xRegisterSSE& dst, const xRegisterSSE& src1, const xRegisterSSE&  src2) const;
+		void SD(const xRegisterSSE& dst, const xRegisterSSE& src1, const xIndirectVoid& src2) const;
 	};
 
 	//////////////////////////////////////////////////////////////////////////////////////////
@@ -38,8 +46,8 @@ namespace x86Emitter
 	//
 	struct xImplSimd_COMI
 	{
-		const xImplSimd_DestRegSSE SS;
-		const xImplSimd_DestRegSSE SD;
+		const xImplSimd_2Arg SS;
+		const xImplSimd_2Arg SD;
 	};
 
 
@@ -47,36 +55,35 @@ namespace x86Emitter
 	//
 	struct xImplSimd_PCompare
 	{
-	public:
 		// Compare packed bytes for equality.
 		// If a data element in dest is equal to the corresponding date element src, the
 		// corresponding data element in dest is set to all 1s; otherwise, it is set to all 0s.
-		const xImplSimd_DestRegEither EQB;
+		const xImplSimd_3Arg EQB;
 
 		// Compare packed words for equality.
 		// If a data element in dest is equal to the corresponding date element src, the
 		// corresponding data element in dest is set to all 1s; otherwise, it is set to all 0s.
-		const xImplSimd_DestRegEither EQW;
+		const xImplSimd_3Arg EQW;
 
 		// Compare packed doublewords [32-bits] for equality.
 		// If a data element in dest is equal to the corresponding date element src, the
 		// corresponding data element in dest is set to all 1s; otherwise, it is set to all 0s.
-		const xImplSimd_DestRegEither EQD;
+		const xImplSimd_3Arg EQD;
 
 		// Compare packed signed bytes for greater than.
 		// If a data element in dest is greater than the corresponding date element src, the
 		// corresponding data element in dest is set to all 1s; otherwise, it is set to all 0s.
-		const xImplSimd_DestRegEither GTB;
+		const xImplSimd_3Arg GTB;
 
 		// Compare packed signed words for greater than.
 		// If a data element in dest is greater than the corresponding date element src, the
 		// corresponding data element in dest is set to all 1s; otherwise, it is set to all 0s.
-		const xImplSimd_DestRegEither GTW;
+		const xImplSimd_3Arg GTW;
 
 		// Compare packed signed doublewords [32-bits] for greater than.
 		// If a data element in dest is greater than the corresponding date element src, the
 		// corresponding data element in dest is set to all 1s; otherwise, it is set to all 0s.
-		const xImplSimd_DestRegEither GTD;
+		const xImplSimd_3Arg GTD;
 	};
 
 	//////////////////////////////////////////////////////////////////////////////////////////
@@ -85,27 +92,27 @@ namespace x86Emitter
 	{
 		// Compare packed unsigned byte integers in dest to src and store packed min/max
 		// values in dest.
-		const xImplSimd_DestRegEither UB;
+		const xImplSimd_3Arg UB;
 
 		// Compare packed signed word integers in dest to src and store packed min/max
 		// values in dest.
-		const xImplSimd_DestRegEither SW;
+		const xImplSimd_3Arg SW;
 
 		// [SSE-4.1] Compare packed signed byte integers in dest to src and store
 		// packed min/max values in dest. (SSE operands only)
-		const xImplSimd_DestRegSSE SB;
+		const xImplSimd_3Arg SB;
 
 		// [SSE-4.1] Compare packed signed doubleword integers in dest to src and store
 		// packed min/max values in dest. (SSE operands only)
-		const xImplSimd_DestRegSSE SD;
+		const xImplSimd_3Arg SD;
 
 		// [SSE-4.1] Compare packed unsigned word integers in dest to src and store
 		// packed min/max values in dest. (SSE operands only)
-		const xImplSimd_DestRegSSE UW;
+		const xImplSimd_3Arg UW;
 
 		// [SSE-4.1] Compare packed unsigned doubleword integers in dest to src and store
 		// packed min/max values in dest. (SSE operands only)
-		const xImplSimd_DestRegSSE UD;
+		const xImplSimd_3Arg UD;
 	};
 
 } // end namespace x86Emitter

common/emitter/implement/simd_helpers.h

@@ -10,52 +10,151 @@ namespace x86Emitter
 	//  xImpl_SIMD Types (template free!)
 	// =====================================================================================================
 
-	// ------------------------------------------------------------------------
-	// For implementing SSE-only logic operations that have xmmreg,xmmreg/rm forms only,
-	// like ANDPS/ANDPD
-	//
-	struct xImplSimd_DestRegSSE
-	{
-		u8 Prefix;
-		u16 Opcode;
+	struct SIMDInstructionInfo {
+		/// The prefix byte of a simd instruction.  These match up with their (E)VEX encodings.
+		enum class Prefix : u32 {
+			None = 0,
+			P66  = 1,
+			PF3  = 2,
+			PF2  = 3,
+		};
+		/// The opcode map of a simd instruction.  These match up with their (E)VEX encodings.
+		enum class Map : u32 {
+			M0F   = 1,
+			M0F38 = 2,
+			M0F3A = 3,
+		};
+		/// Whether an operation operates on float (ss, ps), integer (b, w, d, q), or double (sd, pd) data.
+		/// May be used to choose an appropriate mov instruction if one is needed.
+		enum class Type : u32 {
+			Float, Integer, Double
+		};
 
-		void operator()(const xRegisterSSE& to, const xRegisterSSE& from) const;
-		void operator()(const xRegisterSSE& to, const xIndirectVoid& from) const;
+		/// The main opcode
+		u32 opcode : 8;
+		/// Prefix byte
+		Prefix prefix : 2;
+		/// Opcode map
+		Map map : 5;
+		/// Information about the data this operation operates on.  Ignored for instructions where the SSE4 and AVX versions have the same number of arguments.
+		Type type : 2;
+		/// For instructions like pslld, the data that should go into the reg field in place of the first src
+		u32 ext : 3;
+		/// If true, the two inputs to the function can be swapped without changing its result.
+		u32 is_commutative : 1;
+		/// If true, the dst and src1 must be the same in AVX (e.g. mov instructions, pshufd)
+		u32 is_mov : 1;
+		/// If true, get `W` from dst register instead of `w_bit`
+		u32 dst_w : 1;
+		/// If true, get `W` from src register instead of `w_bit`
+		u32 src_w : 1;
+		/// If true, the instruction has the VEX W bit set
+		u32 w_bit : 1;
+
+		constexpr SIMDInstructionInfo(u8 opcode_, u8 ext_ = 0)
+			: opcode(opcode_), prefix(Prefix::None), map(Map::M0F), type(Type::Float), ext(ext_)
+			, is_commutative(false), is_mov(false), dst_w(false), src_w(false), w_bit(false)
+		{
+		}
+
+		// For configuration using in a builder-style
+		constexpr SIMDInstructionInfo p66() const { SIMDInstructionInfo copy = *this; copy.prefix = Prefix::P66; return copy; }
+		constexpr SIMDInstructionInfo pf3() const { SIMDInstructionInfo copy = *this; copy.prefix = Prefix::PF3; return copy; }
+		constexpr SIMDInstructionInfo pf2() const { SIMDInstructionInfo copy = *this; copy.prefix = Prefix::PF2; return copy; }
+		constexpr SIMDInstructionInfo m0f38() const { SIMDInstructionInfo copy = *this; copy.map = Map::M0F38; return copy; }
+		constexpr SIMDInstructionInfo m0f3a() const { SIMDInstructionInfo copy = *this; copy.map = Map::M0F3A; return copy; }
+		constexpr SIMDInstructionInfo f() const { SIMDInstructionInfo copy = *this; copy.type = Type::Float;   return copy; }
+		constexpr SIMDInstructionInfo i() const { SIMDInstructionInfo copy = *this; copy.type = Type::Integer; return copy; }
+		constexpr SIMDInstructionInfo d() const { SIMDInstructionInfo copy = *this; copy.type = Type::Double;  return copy; }
+		constexpr SIMDInstructionInfo w() const { SIMDInstructionInfo copy = *this; copy.w_bit = true; return copy; }
+		constexpr SIMDInstructionInfo dstw() const { SIMDInstructionInfo copy = *this; copy.dst_w = true; return copy; }
+		constexpr SIMDInstructionInfo srcw() const { SIMDInstructionInfo copy = *this; copy.src_w = true; return copy; }
+		constexpr SIMDInstructionInfo commutative() const { SIMDInstructionInfo copy = *this; copy.is_commutative = true; return copy; }
+		constexpr SIMDInstructionInfo mov() const { SIMDInstructionInfo copy = *this; copy.is_mov = true; return copy; }
 	};
 
 	// ------------------------------------------------------------------------
-	// For implementing SSE-only logic operations that have xmmreg,reg/rm,imm forms only
-	// (PSHUFD / PSHUFHW / etc).
+	// For implementing SSE/AVX logic operations that have two arguments in both SSE and AVX
+	// like MOVAPS, CVTPS2DQ, etc
 	//
-	struct xImplSimd_DestRegImmSSE
+	struct xImplSimd_2Arg
 	{
-		u8 Prefix;
-		u16 Opcode;
+		SIMDInstructionInfo info;
 
-		void operator()(const xRegisterSSE& to, const xRegisterSSE& from, u8 imm) const;
-		void operator()(const xRegisterSSE& to, const xIndirectVoid& from, u8 imm) const;
-	};
+		constexpr xImplSimd_2Arg(SIMDInstructionInfo info_): info(info_.mov()) {}
 
-	struct xImplSimd_DestSSE_CmpImm
-	{
-		u8 Prefix;
-		u16 Opcode;
-
-		void operator()(const xRegisterSSE& to, const xRegisterSSE& from, SSE2_ComparisonType imm) const;
-		void operator()(const xRegisterSSE& to, const xIndirectVoid& from, SSE2_ComparisonType imm) const;
+		void operator()(const xRegisterSSE& dst, const xRegisterSSE& src)  const;
+		void operator()(const xRegisterSSE& dst, const xIndirectVoid& src) const;
 	};
 
 	// ------------------------------------------------------------------------
-	// For implementing SSE operations that have reg,reg/rm forms only,
-	// but accept either MM or XMM destinations (most PADD/PSUB and other P arithmetic ops).
+	// For implementing SSE/AVX logic operations that have two arguments in both SSE and AVX, plus an immediate
+	// like PSHUFD
 	//
-	struct xImplSimd_DestRegEither
+	struct xImplSimd_2ArgImm
 	{
-		u8 Prefix;
-		u16 Opcode;
+		SIMDInstructionInfo info;
 
-		void operator()(const xRegisterSSE& to, const xRegisterSSE& from) const;
-		void operator()(const xRegisterSSE& to, const xIndirectVoid& from) const;
+		constexpr xImplSimd_2ArgImm(SIMDInstructionInfo info_): info(info_.mov()) {}
+
+		void operator()(const xRegisterSSE& dst, const xRegisterSSE& src, u8 imm)  const;
+		void operator()(const xRegisterSSE& dst, const xIndirectVoid& src, u8 imm) const;
 	};
 
+	// ------------------------------------------------------------------------
+	// For implementing SSE/AVX logic operations that have three arguments AVX and two in SSE
+	// like ANDPS, ANDPD, etc
+	//
+	struct xImplSimd_3Arg
+	{
+		SIMDInstructionInfo info;
+
+		void operator()(const xRegisterSSE& dst, const xRegisterSSE& src)  const { (*this)(dst, dst, src); }
+		void operator()(const xRegisterSSE& dst, const xIndirectVoid& src) const { (*this)(dst, dst, src); }
+		void operator()(const xRegisterSSE& dst, const xRegisterSSE& src1, const xRegisterSSE& src2)  const;
+		void operator()(const xRegisterSSE& dst, const xRegisterSSE& src1, const xIndirectVoid& src2) const;
+	};
+
+	// ------------------------------------------------------------------------
+	// For implementing SSE/AVX logic operations that have three arguments AVX and two in SSE
+	// like SHUFPS, INSERTPS, etc
+	//
+	struct xImplSimd_3ArgImm
+	{
+		SIMDInstructionInfo info;
+
+		void operator()(const xRegisterSSE& dst, const xRegisterSSE& src,  u8 imm) const { (*this)(dst, dst, src, imm); }
+		void operator()(const xRegisterSSE& dst, const xIndirectVoid& src, u8 imm) const { (*this)(dst, dst, src, imm); }
+		void operator()(const xRegisterSSE& dst, const xRegisterSSE& src1, const xRegisterSSE& src2,  u8 imm) const;
+		void operator()(const xRegisterSSE& dst, const xRegisterSSE& src1, const xIndirectVoid& src2, u8 imm) const;
+	};
+
+	// ------------------------------------------------------------------------
+	// For implementing SSE/AVX logic operations that have three arguments AVX and two in SSE
+	// like SHUFPS, INSERTPS, etc
+	//
+	struct xImplSimd_3ArgCmp
+	{
+		SIMDInstructionInfo info;
+
+		void operator()(const xRegisterSSE& dst, const xRegisterSSE& src,  SSE2_ComparisonType imm) const { (*this)(dst, dst, src, imm); }
+		void operator()(const xRegisterSSE& dst, const xIndirectVoid& src, SSE2_ComparisonType imm) const { (*this)(dst, dst, src, imm); }
+		void operator()(const xRegisterSSE& dst, const xRegisterSSE& src1, const xRegisterSSE& src2,  SSE2_ComparisonType imm) const;
+		void operator()(const xRegisterSSE& dst, const xRegisterSSE& src1, const xIndirectVoid& src2, SSE2_ComparisonType imm) const;
+	};
+
+	// ------------------------------------------------------------------------
+	// For implementing SSE/AVX logic operations that have four arguments AVX and two in SSE (with an implicit xmm0)
+	// like PBLENDVB, BLENDVPS, etc
+	//
+	struct xImplSimd_4ArgBlend
+	{
+		SIMDInstructionInfo sse;
+		SIMDInstructionInfo avx;
+
+		void operator()(const xRegisterSSE& dst, const xRegisterSSE& src)  const { (*this)(dst, dst, src, xmm0); }
+		void operator()(const xRegisterSSE& dst, const xIndirectVoid& src) const { (*this)(dst, dst, src, xmm0); }
+		void operator()(const xRegisterSSE& dst, const xRegisterSSE& src1, const xRegisterSSE& src2,  const xRegisterSSE& src3) const;
+		void operator()(const xRegisterSSE& dst, const xRegisterSSE& src1, const xIndirectVoid& src2, const xRegisterSSE& src3) const;
+	};
 } // end namespace x86Emitter

common/emitter/implement/simd_moremovs.h

@@ -14,13 +14,15 @@ namespace x86Emitter
 	//
 	struct xImplSimd_MovHL
 	{
-		u16 Opcode;
+		SIMDInstructionInfo info;
 
-		void PS(const xRegisterSSE& to, const xIndirectVoid& from) const;
-		void PS(const xIndirectVoid& to, const xRegisterSSE& from) const;
+		void PS(const xRegisterSSE& dst, const xIndirectVoid& src) const { PS(dst, dst, src); }
+		void PS(const xRegisterSSE& dst, const xRegisterSSE& src1, const xIndirectVoid& src2) const;
+		void PS(const xIndirectVoid& dst, const xRegisterSSE& src) const;
 
-		void PD(const xRegisterSSE& to, const xIndirectVoid& from) const;
-		void PD(const xIndirectVoid& to, const xRegisterSSE& from) const;
+		void PD(const xRegisterSSE& dst, const xIndirectVoid& src) const { PD(dst, dst, src); }
+		void PD(const xRegisterSSE& dst, const xRegisterSSE& src1, const xIndirectVoid& src2) const;
+		void PD(const xIndirectVoid& dst, const xRegisterSSE& src) const;
 	};
 
 	// --------------------------------------------------------------------------------------
@@ -31,16 +33,18 @@ namespace x86Emitter
 	//
 	struct xImplSimd_MovHL_RtoR
 	{
-		u16 Opcode;
+		SIMDInstructionInfo info;
 
-		void PS(const xRegisterSSE& to, const xRegisterSSE& from) const;
-		void PD(const xRegisterSSE& to, const xRegisterSSE& from) const;
+		void PS(const xRegisterSSE& dst, const xRegisterSSE& src) const { PS(dst, dst, src); }
+		void PD(const xRegisterSSE& dst, const xRegisterSSE& src) const { PD(dst, dst, src); }
+		void PS(const xRegisterSSE& dst, const xRegisterSSE& src1, const xRegisterSSE& src2) const;
+		void PD(const xRegisterSSE& dst, const xRegisterSSE& src1, const xRegisterSSE& src2) const;
 	};
 
 	// --------------------------------------------------------------------------------------
 	//  xImplSimd_MoveSSE
 	// --------------------------------------------------------------------------------------
-	// Legends in their own right: MOVAPS / MOVAPD / MOVUPS / MOVUPD
+	// Legends in their own right: MOVAPS / MOVAPD / MOVUPS / MOVUPD / MOVDQA / MOVDQU
 	//
 	// All implementations of Unaligned Movs will, when possible, use aligned movs instead.
 	// This happens when using Mem,Reg or Reg,Mem forms where the address is simple displacement
@@ -48,27 +52,10 @@ namespace x86Emitter
 	//
 	struct xImplSimd_MoveSSE
 	{
-		u8 Prefix;
-		bool isAligned;
-
-		void operator()(const xRegisterSSE& to, const xRegisterSSE& from) const;
-		void operator()(const xRegisterSSE& to, const xIndirectVoid& from) const;
-		void operator()(const xIndirectVoid& to, const xRegisterSSE& from) const;
-	};
-
-	// --------------------------------------------------------------------------------------
-	//  xImplSimd_MoveDQ
-	// --------------------------------------------------------------------------------------
-	// Implementations for MOVDQA / MOVDQU
-	//
-	// All implementations of Unaligned Movs will, when possible, use aligned movs instead.
-	// This happens when using Mem,Reg or Reg,Mem forms where the address is simple displacement
-	// which can be checked for alignment at runtime.
-
-	struct xImplSimd_MoveDQ
-	{
-		u8 Prefix;
-		bool isAligned;
+		SIMDInstructionInfo aligned_load;
+		SIMDInstructionInfo aligned_store;
+		SIMDInstructionInfo unaligned_load;
+		SIMDInstructionInfo unaligned_store;
 
 		void operator()(const xRegisterSSE& to, const xRegisterSSE& from) const;
 		void operator()(const xRegisterSSE& to, const xIndirectVoid& from) const;
@@ -89,7 +76,7 @@ namespace x86Emitter
 		// If a mask bit is 1, then the corresponding dword in the source operand is copied
 		// to dest, else the dword element in dest is left unchanged.
 		//
-		xImplSimd_DestRegImmSSE PS;
+		xImplSimd_3ArgImm PS;
 
 		// [SSE-4.1] Conditionally copies quadword values from src to dest, depending on the
 		// mask bits in the immediate operand (bits [1:0]).  Each mask bit corresponds to a
@@ -98,7 +85,7 @@ namespace x86Emitter
 		// If a mask bit is 1, then the corresponding dword in the source operand is copied
 		// to dest, else the dword element in dest is left unchanged.
 		//
-		xImplSimd_DestRegImmSSE PD;
+		xImplSimd_3ArgImm PD;
 
 		// [SSE-4.1] Conditionally copies dword values from src to dest, depending on the
 		// mask (bits [3:0]) in XMM0 (yes, the fixed register).  Each mask bit corresponds
@@ -107,7 +94,7 @@ namespace x86Emitter
 		// If a mask bit is 1, then the corresponding dword in the source operand is copied
 		// to dest, else the dword element in dest is left unchanged.
 		//
-		xImplSimd_DestRegSSE VPS;
+		xImplSimd_4ArgBlend VPS;
 
 		// [SSE-4.1] Conditionally copies quadword values from src to dest, depending on the
 		// mask (bits [1:0]) in XMM0 (yes, the fixed register).  Each mask bit corresponds
@@ -116,13 +103,13 @@ namespace x86Emitter
 		// If a mask bit is 1, then the corresponding dword in the source operand is copied
 		// to dest, else the dword element in dest is left unchanged.
 		//
-		xImplSimd_DestRegSSE VPD;
+		xImplSimd_4ArgBlend VPD;
 	};
 
 	struct xImplSimd_PBlend
 	{
-		xImplSimd_DestRegImmSSE W;
-		xImplSimd_DestRegSSE VB;
+		xImplSimd_3ArgImm W;
+		xImplSimd_4ArgBlend VB;
 	};
 
 	// --------------------------------------------------------------------------------------
@@ -132,36 +119,36 @@ namespace x86Emitter
 	//
 	struct xImplSimd_PMove
 	{
-		u16 OpcodeBase;
+		SIMDInstructionInfo info;
 
 		// [SSE-4.1] Zero/Sign-extend the low byte values in src into word integers
 		// and store them in dest.
 		void BW(const xRegisterSSE& to, const xRegisterSSE& from) const;
-		void BW(const xRegisterSSE& to, const xIndirect64& from) const;
+		void BW(const xRegisterSSE& to, const xIndirectVoid& from) const;
 
 		// [SSE-4.1] Zero/Sign-extend the low byte values in src into dword integers
 		// and store them in dest.
 		void BD(const xRegisterSSE& to, const xRegisterSSE& from) const;
-		void BD(const xRegisterSSE& to, const xIndirect32& from) const;
+		void BD(const xRegisterSSE& to, const xIndirectVoid& from) const;
 
 		// [SSE-4.1] Zero/Sign-extend the low byte values in src into qword integers
 		// and store them in dest.
 		void BQ(const xRegisterSSE& to, const xRegisterSSE& from) const;
-		void BQ(const xRegisterSSE& to, const xIndirect16& from) const;
+		void BQ(const xRegisterSSE& to, const xIndirectVoid& from) const;
 
 		// [SSE-4.1] Zero/Sign-extend the low word values in src into dword integers
 		// and store them in dest.
 		void WD(const xRegisterSSE& to, const xRegisterSSE& from) const;
-		void WD(const xRegisterSSE& to, const xIndirect64& from) const;
+		void WD(const xRegisterSSE& to, const xIndirectVoid& from) const;
 
 		// [SSE-4.1] Zero/Sign-extend the low word values in src into qword integers
 		// and store them in dest.
 		void WQ(const xRegisterSSE& to, const xRegisterSSE& from) const;
-		void WQ(const xRegisterSSE& to, const xIndirect32& from) const;
+		void WQ(const xRegisterSSE& to, const xIndirectVoid& from) const;
 
 		// [SSE-4.1] Zero/Sign-extend the low dword values in src into qword integers
 		// and store them in dest.
 		void DQ(const xRegisterSSE& to, const xRegisterSSE& from) const;
-		void DQ(const xRegisterSSE& to, const xIndirect64& from) const;
+		void DQ(const xRegisterSSE& to, const xIndirectVoid& from) const;
 	};
 } // namespace x86Emitter

common/emitter/implement/simd_shufflepack.h

@@ -13,11 +13,15 @@ namespace x86Emitter
 	{
 		inline void _selector_assertion_check(u8 selector) const;
 
-		void PS(const xRegisterSSE& to, const xRegisterSSE& from, u8 selector) const;
-		void PS(const xRegisterSSE& to, const xIndirectVoid& from, u8 selector) const;
+		void PS(const xRegisterSSE& dst, const xRegisterSSE&  src, u8 selector) const { PS(dst, dst, src, selector); }
+		void PS(const xRegisterSSE& dst, const xIndirectVoid& src, u8 selector) const { PS(dst, dst, src, selector); }
+		void PS(const xRegisterSSE& dst, const xRegisterSSE& src1, const xRegisterSSE&  src2, u8 selector) const;
+		void PS(const xRegisterSSE& dst, const xRegisterSSE& src1, const xIndirectVoid& src2, u8 selector) const;
 
-		void PD(const xRegisterSSE& to, const xRegisterSSE& from, u8 selector) const;
-		void PD(const xRegisterSSE& to, const xIndirectVoid& from, u8 selector) const;
+		void PD(const xRegisterSSE& dst, const xRegisterSSE&  src, u8 selector) const { PD(dst, dst, src, selector); }
+		void PD(const xRegisterSSE& dst, const xIndirectVoid& src, u8 selector) const { PD(dst, dst, src, selector); }
+		void PD(const xRegisterSSE& dst, const xRegisterSSE& src1, const xRegisterSSE&  src2, u8 selector) const;
+		void PD(const xRegisterSSE& dst, const xRegisterSSE& src1, const xIndirectVoid& src2, u8 selector) const;
 	};
 
 	// --------------------------------------------------------------------------------------
@@ -27,17 +31,17 @@ namespace x86Emitter
 	{
 		// Copies doublewords from src and inserts them into dest at dword locations selected
 		// with the order operand (8 bit immediate).
-		const xImplSimd_DestRegImmSSE D;
+		const xImplSimd_2ArgImm D;
 
 		// Copies words from the low quadword of src and inserts them into the low quadword
 		// of dest at word locations selected with the order operand (8 bit immediate).
 		// The high quadword of src is copied to the high quadword of dest.
-		const xImplSimd_DestRegImmSSE LW;
+		const xImplSimd_2ArgImm LW;
 
 		// Copies words from the high quadword of src and inserts them into the high quadword
 		// of dest at word locations selected with the order operand (8 bit immediate).
 		// The low quadword of src is copied to the low quadword of dest.
-		const xImplSimd_DestRegImmSSE HW;
+		const xImplSimd_2ArgImm HW;
 
 		// [sSSE-3] Performs in-place shuffles of bytes in dest according to the shuffle
 		// control mask in src.  If the most significant bit (bit[7]) of each byte of the
@@ -46,42 +50,7 @@ namespace x86Emitter
 		// byte in dest. The value of each index is the least significant 4 bits (128-bit
 		// operation) or 3 bits (64-bit operation) of the shuffle control byte.
 		//
-		const xImplSimd_DestRegEither B;
-
-		// below is my test bed for a new system, free of subclasses.  Was supposed to improve intellisense
-		// but it doesn't (makes it worse).  Will try again in MSVC 2010. --air
-
-#if 0
-	// Copies words from src and inserts them into dest at word locations selected with
-	// the order operand (8 bit immediate).
-
-	// Copies doublewords from src and inserts them into dest at dword locations selected
-	// with the order operand (8 bit immediate).
-	void D( const xRegisterSSE& to, const xRegisterSSE& from, u8 imm ) const	{ xOpWrite0F( 0x66, 0x70, to, from, imm ); }
-	void D( const xRegisterSSE& to, const xIndirectVoid& from, u8 imm ) const		{ xOpWrite0F( 0x66, 0x70, to, from, imm ); }
-
-	// Copies words from the low quadword of src and inserts them into the low quadword
-	// of dest at word locations selected with the order operand (8 bit immediate).
-	// The high quadword of src is copied to the high quadword of dest.
-	void LW( const xRegisterSSE& to, const xRegisterSSE& from, u8 imm ) const	{ xOpWrite0F( 0xf2, 0x70, to, from, imm ); }
-	void LW( const xRegisterSSE& to, const xIndirectVoid& from, u8 imm ) const		{ xOpWrite0F( 0xf2, 0x70, to, from, imm ); }
-
-	// Copies words from the high quadword of src and inserts them into the high quadword
-	// of dest at word locations selected with the order operand (8 bit immediate).
-	// The low quadword of src is copied to the low quadword of dest.
-	void HW( const xRegisterSSE& to, const xRegisterSSE& from, u8 imm ) const	{ xOpWrite0F( 0xf3, 0x70, to, from, imm ); }
-	void HW( const xRegisterSSE& to, const xIndirectVoid& from, u8 imm ) const		{ xOpWrite0F( 0xf3, 0x70, to, from, imm ); }
-
-	// [sSSE-3] Performs in-place shuffles of bytes in dest according to the shuffle
-	// control mask in src.  If the most significant bit (bit[7]) of each byte of the
-	// shuffle control mask is set, then constant zero is written in the result byte.
-	// Each byte in the shuffle control mask forms an index to permute the corresponding
-	// byte in dest. The value of each index is the least significant 4 bits (128-bit
-	// operation) or 3 bits (64-bit operation) of the shuffle control byte.
-	//
-	void B( const xRegisterSSE& to, const xRegisterSSE& from ) const	{ OpWriteSSE( 0x66, 0x0038 ); }
-	void B( const xRegisterSSE& to, const xIndirectVoid& from ) const		{ OpWriteSSE( 0x66, 0x0038 ); }
-#endif
+		const xImplSimd_3Arg B;
 	};
 
 	// --------------------------------------------------------------------------------------
@@ -90,22 +59,22 @@ namespace x86Emitter
 	struct SimdImpl_PUnpack
 	{
 		// Unpack and interleave low-order bytes from src and dest into dest.
-		const xImplSimd_DestRegEither LBW;
+		const xImplSimd_3Arg LBW;
 		// Unpack and interleave low-order words from src and dest into dest.
-		const xImplSimd_DestRegEither LWD;
+		const xImplSimd_3Arg LWD;
 		// Unpack and interleave low-order doublewords from src and dest into dest.
-		const xImplSimd_DestRegEither LDQ;
+		const xImplSimd_3Arg LDQ;
 		// Unpack and interleave low-order quadwords from src and dest into dest.
-		const xImplSimd_DestRegSSE LQDQ;
+		const xImplSimd_3Arg LQDQ;
 
 		// Unpack and interleave high-order bytes from src and dest into dest.
-		const xImplSimd_DestRegEither HBW;
+		const xImplSimd_3Arg HBW;
 		// Unpack and interleave high-order words from src and dest into dest.
-		const xImplSimd_DestRegEither HWD;
+		const xImplSimd_3Arg HWD;
 		// Unpack and interleave high-order doublewords from src and dest into dest.
-		const xImplSimd_DestRegEither HDQ;
+		const xImplSimd_3Arg HDQ;
 		// Unpack and interleave high-order quadwords from src and dest into dest.
-		const xImplSimd_DestRegSSE HQDQ;
+		const xImplSimd_3Arg HQDQ;
 	};
 
 	// --------------------------------------------------------------------------------------
@@ -117,19 +86,19 @@ namespace x86Emitter
 	{
 		// Converts packed signed word integers from src and dest into packed signed
 		// byte integers in dest, using signed saturation.
-		const xImplSimd_DestRegEither SSWB;
+		const xImplSimd_3Arg SSWB;
 
 		// Converts packed signed dword integers from src and dest into packed signed
 		// word integers in dest, using signed saturation.
-		const xImplSimd_DestRegEither SSDW;
+		const xImplSimd_3Arg SSDW;
 
 		// Converts packed unsigned word integers from src and dest into packed unsigned
 		// byte integers in dest, using unsigned saturation.
-		const xImplSimd_DestRegEither USWB;
+		const xImplSimd_3Arg USWB;
 
 		// [SSE-4.1] Converts packed unsigned dword integers from src and dest into packed
 		// unsigned word integers in dest, using signed saturation.
-		const xImplSimd_DestRegSSE USDW;
+		const xImplSimd_3Arg USDW;
 	};
 
 	// --------------------------------------------------------------------------------------
@@ -144,14 +113,14 @@ namespace x86Emitter
 		//    dest[2] <- dest[3]
 		//    dest[3] <- src[3]
 		//
-		const xImplSimd_DestRegSSE HPS;
+		const xImplSimd_3Arg HPS;
 
 		// Unpacks the high quadword [double-precision] values from src and dest into
 		// dest, such that the result of dest looks like this:
 		//    dest.lo <- dest.hi
 		//    dest.hi <- src.hi
 		//
-		const xImplSimd_DestRegSSE HPD;
+		const xImplSimd_3Arg HPD;
 
 		// Unpacks the low doubleword [single-precision] values from src and dest into
 		// dest, such that the result of dest looks like this:
@@ -160,7 +129,7 @@ namespace x86Emitter
 		//    dest[1] <- src[0]
 		//    dest[0] <- dest[0]
 		//
-		const xImplSimd_DestRegSSE LPS;
+		const xImplSimd_3Arg LPS;
 
 		// Unpacks the low quadword [double-precision] values from src and dest into
 		// dest, effectively moving the low portion of src into the upper portion of dest.
@@ -168,7 +137,7 @@ namespace x86Emitter
 		//    dest.hi <- src.lo
 		//    dest.lo <- dest.lo  [remains unchanged!]
 		//
-		const xImplSimd_DestRegSSE LPD;
+		const xImplSimd_3Arg LPD;
 	};
 
 
@@ -179,17 +148,25 @@ namespace x86Emitter
 	//
 	struct xImplSimd_PInsert
 	{
-		void B(const xRegisterSSE& to, const xRegister32& from, u8 imm8) const;
-		void B(const xRegisterSSE& to, const xIndirect32& from, u8 imm8) const;
+		void B(const xRegisterSSE& dst, const xRegister32& src, u8 imm8) const { B(dst, dst, src, imm8); }
+		void B(const xRegisterSSE& dst, const xIndirect8&  src, u8 imm8) const { B(dst, dst, src, imm8); }
+		void B(const xRegisterSSE& dst, const xRegisterSSE& src1, const xRegister32& src2, u8 imm8) const;
+		void B(const xRegisterSSE& dst, const xRegisterSSE& src1, const xIndirect8&  src2, u8 imm8) const;
 
-		void W(const xRegisterSSE& to, const xRegister32& from, u8 imm8) const;
-		void W(const xRegisterSSE& to, const xIndirect32& from, u8 imm8) const;
+		void W(const xRegisterSSE& dst, const xRegister32& src, u8 imm8) const { W(dst, dst, src, imm8); }
+		void W(const xRegisterSSE& dst, const xIndirect16& src, u8 imm8) const { W(dst, dst, src, imm8); }
+		void W(const xRegisterSSE& dst, const xRegisterSSE& src1, const xRegister32& src2, u8 imm8) const;
+		void W(const xRegisterSSE& dst, const xRegisterSSE& src1, const xIndirect16& src2, u8 imm8) const;
 
-		void D(const xRegisterSSE& to, const xRegister32& from, u8 imm8) const;
-		void D(const xRegisterSSE& to, const xIndirect32& from, u8 imm8) const;
+		void D(const xRegisterSSE& dst, const xRegister32& src, u8 imm8) const { D(dst, dst, src, imm8); }
+		void D(const xRegisterSSE& dst, const xIndirect32& src, u8 imm8) const { D(dst, dst, src, imm8); }
+		void D(const xRegisterSSE& dst, const xRegisterSSE& src1, const xRegister32& src2, u8 imm8) const;
+		void D(const xRegisterSSE& dst, const xRegisterSSE& src1, const xIndirect32& src2, u8 imm8) const;
 
-		void Q(const xRegisterSSE& to, const xRegister64& from, u8 imm8) const;
-		void Q(const xRegisterSSE& to, const xIndirect64& from, u8 imm8) const;
+		void Q(const xRegisterSSE& dst, const xRegister64& src, u8 imm8) const { Q(dst, dst, src, imm8); }
+		void Q(const xRegisterSSE& dst, const xIndirect64& src, u8 imm8) const { Q(dst, dst, src, imm8); }
+		void Q(const xRegisterSSE& dst, const xRegisterSSE& src1, const xRegister64& src2, u8 imm8) const;
+		void Q(const xRegisterSSE& dst, const xRegisterSSE& src1, const xIndirect64& src2, u8 imm8) const;
 	};
 
 	//////////////////////////////////////////////////////////////////////////////////////////
@@ -202,8 +179,8 @@ namespace x86Emitter
 		// [SSE-4.1] Copies the byte element specified by imm8 from src to dest.  The upper bits
 		// of dest are zero-extended (cleared).  This can be used to extract any single packed
 		// byte value from src into an x86 32 bit register.
-		void B(const xRegister32& to, const xRegisterSSE& from, u8 imm8) const;
-		void B(const xIndirect32& dest, const xRegisterSSE& from, u8 imm8) const;
+		void B(const xRegister32& dst, const xRegisterSSE& src, u8 imm8) const;
+		void B(const xIndirect8&  dst, const xRegisterSSE& src, u8 imm8) const;
 
 		// Copies the word element specified by imm8 from src to dest.  The upper bits
 		// of dest are zero-extended (cleared).  This can be used to extract any single packed
@@ -211,16 +188,17 @@ namespace x86Emitter
 		//
 		// [SSE-4.1] Note: Indirect memory forms of this instruction are an SSE-4.1 extension!
 		//
-		void W(const xRegister32& to, const xRegisterSSE& from, u8 imm8) const;
-		void W(const xIndirect32& dest, const xRegisterSSE& from, u8 imm8) const;
+		void W(const xRegister32& dst, const xRegisterSSE& src, u8 imm8) const;
+		void W(const xIndirect16& dst, const xRegisterSSE& src, u8 imm8) const;
 
 		// [SSE-4.1] Copies the dword element specified by imm8 from src to dest.  This can be
 		// used to extract any single packed dword value from src into an x86 32 bit register.
-		void D(const xRegister32& to, const xRegisterSSE& from, u8 imm8) const;
-		void D(const xIndirect32& dest, const xRegisterSSE& from, u8 imm8) const;
+		void D(const xRegister32& dst, const xRegisterSSE& src, u8 imm8) const;
+		void D(const xIndirect32& dst, const xRegisterSSE& src, u8 imm8) const;
 
-		// Insert a qword integer value from r/m64 into the xmm1 at the destination element specified by imm8.
-		void Q(const xRegister64& to, const xRegisterSSE& from, u8 imm8) const;
-		void Q(const xIndirect64& dest, const xRegisterSSE& from, u8 imm8) const;
+		// [SSE-4.1] Copies the dword element specified by imm8 from src to dest.  This can be
+		// used to extract any single packed dword value from src into an x86 64 bit register.
+		void Q(const xRegister64& dst, const xRegisterSSE& src, u8 imm8) const;
+		void Q(const xIndirect64& dst, const xRegisterSSE& src, u8 imm8) const;
 	};
 } // namespace x86Emitter

common/emitter/instructions.h

@@ -29,6 +29,7 @@ namespace x86Emitter
 
 	extern const xImpl_Group1 xADC;
 	extern const xImpl_Group1 xSBB;
+	extern const xImpl_Group1 xCMP;
 
 	extern const xImpl_G1Logic xAND;
 	extern const xImpl_G1Logic xOR;
@@ -36,7 +37,6 @@ namespace x86Emitter
 
 	extern const xImpl_G1Arith xADD;
 	extern const xImpl_G1Arith xSUB;
-	extern const xImpl_G1Compare xCMP;
 
 	// ------------------------------------------------------------------------
 	// Group 2 Instruction Class
@@ -448,37 +448,40 @@ namespace x86Emitter
 	extern void xFXSAVE(const xIndirectVoid& dest);
 	extern void xFXRSTOR(const xIndirectVoid& src);
 
-	extern void xMOVDZX(const xRegisterSSE& to, const xRegister32or64& from);
-	extern void xMOVDZX(const xRegisterSSE& to, const xIndirectVoid& src);
+	extern void xMOVDZX(const xRegisterSSE& dst, const xRegister32or64& src);
+	extern void xMOVDZX(const xRegisterSSE& dst, const xIndirectVoid&   src);
 
-	extern void xMOVD(const xRegister32or64& to, const xRegisterSSE& from);
-	extern void xMOVD(const xIndirectVoid& dest, const xRegisterSSE& from);
+	extern void xMOVD(const xRegister32or64& dst, const xRegisterSSE& src);
+	extern void xMOVD(const xIndirectVoid&   dst, const xRegisterSSE& src);
 
-	extern void xMOVQ(const xIndirectVoid& dest, const xRegisterSSE& from);
+	extern void xMOVQ(const xIndirectVoid& dst, const xRegisterSSE& src);
 
-	extern void xMOVQZX(const xRegisterSSE& to, const xIndirectVoid& src);
-	extern void xMOVQZX(const xRegisterSSE& to, const xRegisterSSE& from);
+	extern void xMOVQZX(const xRegisterSSE& dst, const xIndirectVoid& src);
+	extern void xMOVQZX(const xRegisterSSE& dst, const xRegisterSSE&  src);
 
-	extern void xMOVSS(const xRegisterSSE& to, const xRegisterSSE& from);
-	extern void xMOVSS(const xIndirectVoid& to, const xRegisterSSE& from);
-	extern void xMOVSD(const xRegisterSSE& to, const xRegisterSSE& from);
-	extern void xMOVSD(const xIndirectVoid& to, const xRegisterSSE& from);
+	extern void xMOVSS(const xRegisterSSE&  dst, const xRegisterSSE& src1, const xRegisterSSE& src2);
+	static void xMOVSS(const xRegisterSSE&  dst, const xRegisterSSE& src) { xMOVSS(dst, dst, src); }
+	extern void xMOVSS(const xIndirectVoid& dst, const xRegisterSSE& src);
+	extern void xMOVSD(const xRegisterSSE&  dst, const xRegisterSSE& src1, const xRegisterSSE& src2);
+	static void xMOVSD(const xRegisterSSE&  dst, const xRegisterSSE& src) { xMOVSD(dst, dst, src); }
+	extern void xMOVSD(const xIndirectVoid& dst, const xRegisterSSE& src);
 
-	extern void xMOVSSZX(const xRegisterSSE& to, const xIndirectVoid& from);
-	extern void xMOVSDZX(const xRegisterSSE& to, const xIndirectVoid& from);
+	extern void xMOVSSZX(const xRegisterSSE& dst, const xIndirectVoid& src);
+	extern void xMOVSDZX(const xRegisterSSE& dst, const xIndirectVoid& src);
 
-	extern void xMOVNTDQA(const xRegisterSSE& to, const xIndirectVoid& from);
-	extern void xMOVNTDQA(const xIndirectVoid& to, const xRegisterSSE& from);
+	extern void xMOVNTDQA(const xRegisterSSE& dst, const xIndirectVoid& src);
+	extern void xMOVNTDQA(const xIndirectVoid& dst, const xRegisterSSE& src);
 
-	extern void xMOVNTPD(const xIndirectVoid& to, const xRegisterSSE& from);
-	extern void xMOVNTPS(const xIndirectVoid& to, const xRegisterSSE& from);
+	extern void xMOVNTPD(const xIndirectVoid& dst, const xRegisterSSE& src);
+	extern void xMOVNTPS(const xIndirectVoid& dst, const xRegisterSSE& src);
 
-	extern void xMOVMSKPS(const xRegister32& to, const xRegisterSSE& from);
-	extern void xMOVMSKPD(const xRegister32& to, const xRegisterSSE& from);
+	extern void xMOVMSKPS(const xRegister32& dst, const xRegisterSSE& src);
+	extern void xMOVMSKPD(const xRegister32& dst, const xRegisterSSE& src);
 
-	extern void xMASKMOV(const xRegisterSSE& to, const xRegisterSSE& from);
-	extern void xPMOVMSKB(const xRegister32or64& to, const xRegisterSSE& from);
-	extern void xPALIGNR(const xRegisterSSE& to, const xRegisterSSE& from, u8 imm8);
+	extern void xMASKMOV(const xRegisterSSE& dst, const xRegisterSSE& src);
+	extern void xPMOVMSKB(const xRegister32or64& dst, const xRegisterSSE& src);
+	extern void xPALIGNR(const xRegisterSSE& dst, const xRegisterSSE& src1, const xRegisterSSE& src2, u8 imm8);
+	static void xPALIGNR(const xRegisterSSE& dst, const xRegisterSSE& src, u8 imm8) { xPALIGNR(dst, dst, src, imm8); }
 
 	// ------------------------------------------------------------------------
 
@@ -486,14 +489,8 @@ namespace x86Emitter
 	extern const xImplSimd_MoveSSE xMOVUPS;
 	extern const xImplSimd_MoveSSE xMOVAPD;
 	extern const xImplSimd_MoveSSE xMOVUPD;
-
-#ifdef ALWAYS_USE_MOVAPS
 	extern const xImplSimd_MoveSSE xMOVDQA;
 	extern const xImplSimd_MoveSSE xMOVDQU;
-#else
-	extern const xImplSimd_MoveDQ xMOVDQA;
-	extern const xImplSimd_MoveDQ xMOVDQU;
-#endif
 
 	extern const xImplSimd_MovHL xMOVH;
 	extern const xImplSimd_MovHL xMOVL;
@@ -505,27 +502,29 @@ namespace x86Emitter
 	extern const xImplSimd_PMove xPMOVSX;
 	extern const xImplSimd_PMove xPMOVZX;
 
-	extern const xImplSimd_DestRegSSE xMOVSLDUP;
-	extern const xImplSimd_DestRegSSE xMOVSHDUP;
+	extern const xImplSimd_2Arg xMOVSLDUP;
+	extern const xImplSimd_2Arg xMOVSHDUP;
 
-	extern void xINSERTPS(const xRegisterSSE& to, const xRegisterSSE& from, u8 imm8);
-	extern void xINSERTPS(const xRegisterSSE& to, const xIndirect32& from, u8 imm8);
+	extern void xINSERTPS(const xRegisterSSE& dst, const xRegisterSSE& src1, const xRegisterSSE& src2, u8 imm8);
+	extern void xINSERTPS(const xRegisterSSE& dst, const xRegisterSSE& src1, const xIndirect32&  src2, u8 imm8);
+	static void xINSERTPS(const xRegisterSSE& dst, const xRegisterSSE& src, u8 imm8) { xINSERTPS(dst, dst, src, imm8); }
+	static void xINSERTPS(const xRegisterSSE& dst, const xIndirect32&  src, u8 imm8) { xINSERTPS(dst, dst, src, imm8); }
 
-	extern void xEXTRACTPS(const xRegister32or64& to, const xRegisterSSE& from, u8 imm8);
-	extern void xEXTRACTPS(const xIndirect32& dest, const xRegisterSSE& from, u8 imm8);
+	extern void xEXTRACTPS(const xRegister32& dst, const xRegisterSSE& src, u8 imm8);
+	extern void xEXTRACTPS(const xIndirect32& dst, const xRegisterSSE& src, u8 imm8);
 
 	// ------------------------------------------------------------------------
 
-	extern const xImplSimd_DestRegEither xPAND;
-	extern const xImplSimd_DestRegEither xPANDN;
-	extern const xImplSimd_DestRegEither xPOR;
-	extern const xImplSimd_DestRegEither xPXOR;
+	extern const xImplSimd_3Arg xPAND;
+	extern const xImplSimd_3Arg xPANDN;
+	extern const xImplSimd_3Arg xPOR;
+	extern const xImplSimd_3Arg xPXOR;
 
 	extern const xImplSimd_Shuffle xSHUF;
 
 	// ------------------------------------------------------------------------
 
-	extern const xImplSimd_DestRegSSE xPTEST;
+	extern const xImplSimd_2Arg xPTEST;
 
 	extern const xImplSimd_MinMax xMIN;
 	extern const xImplSimd_MinMax xMAX;
@@ -565,15 +564,23 @@ namespace x86Emitter
 
 	extern void xCVTSD2SI(const xRegister32or64& to, const xRegisterSSE& from);
 	extern void xCVTSD2SI(const xRegister32or64& to, const xIndirect64& from);
-	extern void xCVTSD2SS(const xRegisterSSE& to, const xRegisterSSE& from);
-	extern void xCVTSD2SS(const xRegisterSSE& to, const xIndirect64& from);
-	extern void xCVTSI2SS(const xRegisterSSE& to, const xRegister32or64& from);
-	extern void xCVTSI2SS(const xRegisterSSE& to, const xIndirect32& from);
+	extern void xCVTSD2SS(const xRegisterSSE& dst, const xRegisterSSE& src1, const xRegisterSSE& src2);
+	extern void xCVTSD2SS(const xRegisterSSE& dst, const xRegisterSSE& src1, const xIndirect64& src2);
+	extern void xCVTSI2SS(const xRegisterSSE& dst, const xRegisterSSE& src1, const xRegister32or64& src2);
+	extern void xCVTSI2SS(const xRegisterSSE& dst, const xRegisterSSE& src1, const xIndirect32& src2);
+	extern void xCVTSI2SS(const xRegisterSSE& dst, const xRegisterSSE& src1, const xIndirect64& src2);
+	static void xCVTSD2SS(const xRegisterSSE& to, const xRegisterSSE& from)    { xCVTSD2SS(to, to, from); }
+	static void xCVTSD2SS(const xRegisterSSE& to, const xIndirect64& from)     { xCVTSD2SS(to, to, from); }
+	static void xCVTSI2SS(const xRegisterSSE& to, const xRegister32or64& from) { xCVTSI2SS(to, to, from); }
+	static void xCVTSI2SS(const xRegisterSSE& to, const xIndirect32& from)     { xCVTSI2SS(to, to, from); }
+	static void xCVTSI2SS(const xRegisterSSE& to, const xIndirect64& from)     { xCVTSI2SS(to, to, from); }
 
-	extern void xCVTSS2SD(const xRegisterSSE& to, const xRegisterSSE& from);
-	extern void xCVTSS2SD(const xRegisterSSE& to, const xIndirect32& from);
 	extern void xCVTSS2SI(const xRegister32or64& to, const xRegisterSSE& from);
 	extern void xCVTSS2SI(const xRegister32or64& to, const xIndirect32& from);
+	extern void xCVTSS2SD(const xRegisterSSE& dst, const xRegisterSSE& src1, const xRegisterSSE& src2);
+	extern void xCVTSS2SD(const xRegisterSSE& dst, const xRegisterSSE& src1, const xIndirect32& src2);
+	static void xCVTSS2SD(const xRegisterSSE& to, const xRegisterSSE& from) { xCVTSS2SD(to, to, from); }
+	static void xCVTSS2SD(const xRegisterSSE& to, const xIndirect32& from)  { xCVTSS2SD(to, to, from); }
 
 	extern void xCVTTPD2DQ(const xRegisterSSE& to, const xRegisterSSE& from);
 	extern void xCVTTPD2DQ(const xRegisterSSE& to, const xIndirect128& from);
@@ -614,22 +621,6 @@ namespace x86Emitter
 
 	// ------------------------------------------------------------------------
 
-	extern const xImplAVX_Move xVMOVAPS;
-	extern const xImplAVX_Move xVMOVUPS;
-	extern const xImplAVX_ArithFloat xVADD;
-	extern const xImplAVX_ArithFloat xVSUB;
-	extern const xImplAVX_ArithFloat xVMUL;
-	extern const xImplAVX_ArithFloat xVDIV;
-	extern const xImplAVX_CmpFloat xVCMP;
-	extern const xImplAVX_ThreeArgYMM xVPAND;
-	extern const xImplAVX_ThreeArgYMM xVPANDN;
-	extern const xImplAVX_ThreeArgYMM xVPOR;
-	extern const xImplAVX_ThreeArgYMM xVPXOR;
-	extern const xImplAVX_CmpInt xVPCMP;
-
-	extern void xVPMOVMSKB(const xRegister32& to, const xRegisterSSE& from);
-	extern void xVMOVMSKPS(const xRegister32& to, const xRegisterSSE& from);
-	extern void xVMOVMSKPD(const xRegister32& to, const xRegisterSSE& from);
 	extern void xVZEROUPPER();
 
 } // namespace x86Emitter

common/emitter/internal.h

@@ -10,6 +10,7 @@ namespace x86Emitter
 {
 
 #define OpWriteSSE(pre, op) xOpWrite0F(pre, op, to, from)
+#define OpWriteSIMDMovOp(op) EmitSIMD(op.mov(), to, to, from)
 
 	extern void SimdPrefix(u8 prefix, u16 opcode);
 	extern void EmitSibMagic(uint regfield, const void* address, int extraRIPOffset = 0);
@@ -25,6 +26,9 @@ namespace x86Emitter
 	extern void EmitRex(const xRegisterBase& reg1, const xRegisterBase& reg2);
 	extern void EmitRex(const xRegisterBase& reg1, const void* src);
 	extern void EmitRex(const xRegisterBase& reg1, const xIndirectVoid& sib);
+	extern void EmitRex(SIMDInstructionInfo info, u32 reg1, const xRegisterBase& reg2);
+	extern void EmitRex(SIMDInstructionInfo info, const xRegisterBase& reg1, const xRegisterBase& reg2);
+	extern void EmitRex(SIMDInstructionInfo info, const xRegisterBase& reg1, const xIndirectVoid& sib);
 
 	extern void _xMovRtoR(const xRegisterInt& to, const xRegisterInt& from);
 
@@ -171,4 +175,44 @@ namespace x86Emitter
 		xWrite8(opcode);
 		EmitSibMagic(param1, param3);
 	}
+
+	void EmitVEX(SIMDInstructionInfo info, const xRegisterBase& dst, u8 src1, const xRegisterBase& src2, int extraRipOffset = 0);
+	void EmitVEX(SIMDInstructionInfo info, const xRegisterBase& dst, u8 src1, const xIndirectVoid& src2, int extraRipOffset = 0);
+	void EmitVEX(SIMDInstructionInfo info, u32 ext, u8 dst, const xRegisterBase& src2, int extraRipOffset = 0);
+
+	template <typename S2>
+	__emitinline static void EmitVEX(SIMDInstructionInfo info, const xRegisterBase& dst, const xRegisterBase& src1, const S2& src2, int extraRipOffset = 0)
+	{
+		EmitVEX(info, dst, src1.GetId(), src2, extraRipOffset);
+	}
+
+	// Emitter helpers for SIMD operations
+	// These will dispatch to either SSE or AVX implementations
+
+	void EmitSIMDImpl(SIMDInstructionInfo info, const xRegisterBase& dst, const xRegisterBase& src1, int extraRipOffset);
+	void EmitSIMDImpl(SIMDInstructionInfo info, const xRegisterBase& dst, const xRegisterBase& src1, const xRegisterBase& src2, int extraRipOffset);
+	void EmitSIMDImpl(SIMDInstructionInfo info, const xRegisterBase& dst, const xRegisterBase& src1, const xIndirectVoid& src2, int extraRipOffset);
+	void EmitSIMD(SIMDInstructionInfo info, const xRegisterBase& dst, const xRegisterBase& src1, const xRegisterBase& src2, const xRegisterBase& src3);
+	void EmitSIMD(SIMDInstructionInfo info, const xRegisterBase& dst, const xRegisterBase& src1, const xIndirectVoid& src2, const xRegisterBase& src3);
+
+	__emitinline static void EmitSIMD(SIMDInstructionInfo info, const xRegisterBase& dst, const xRegisterBase& src1)
+	{
+		EmitSIMDImpl(info, dst, src1, 0);
+	}
+	__emitinline static void EmitSIMD(SIMDInstructionInfo info, const xRegisterBase& dst, const xRegisterBase& src1, u8 imm)
+	{
+		EmitSIMDImpl(info, dst, src1, 1);
+		xWrite8(imm);
+	}
+	template <typename S2>
+	__emitinline static void EmitSIMD(SIMDInstructionInfo info, const xRegisterBase& dst, const xRegisterBase& src1, const S2& src2)
+	{
+		EmitSIMDImpl(info, dst, src1, src2, 0);
+	}
+	template <typename S2>
+	__emitinline static void EmitSIMD(SIMDInstructionInfo info, const xRegisterBase& dst, const xRegisterBase& src1, const S2& src2, u8 imm)
+	{
+		EmitSIMDImpl(info, dst, src1, src2, 1);
+		xWrite8(imm);
+	}
 } // namespace x86Emitter

common/emitter/movs.cpp

@@ -101,7 +101,7 @@ namespace x86Emitter
 		const xRegisterInt& to_ = to.GetNonWide();
 		if (!preserve_flags && (imm == 0))
 		{
-			_g1_EmitOp(G1Type_XOR, to_, to_);
+			xXOR(to_, to_);
 		}
 		else if (imm == (sptr)(u32)imm || !to.IsWide())
 		{

common/emitter/x86emitter.cpp

@@ -51,6 +51,8 @@
 thread_local u8* x86Ptr;
 thread_local XMMSSEType g_xmmtypes[iREGCNT_XMM] = {XMMT_INT};
 
+bool x86Emitter::use_avx;
+
 namespace x86Emitter
 {
 
@@ -502,6 +504,46 @@ const xRegister32
 		EmitRex(w, r, x, b, reg1.IsExtended8Bit());
 	}
 
+	void EmitRex(SIMDInstructionInfo info, const xRegisterBase& reg1, const xRegisterBase& reg2)
+	{
+		bool w = false;
+		if (info.dst_w)
+			w |= reg1.IsWide();
+		if (info.src_w)
+			w |= reg2.IsWide();
+		bool r = reg1.IsExtended();
+		bool x = false;
+		bool b = reg2.IsExtended();
+		EmitRex(w, r, x, b, reg2.IsExtended8Bit());
+	}
+
+	void EmitRex(SIMDInstructionInfo info, const xRegisterBase& reg1, const xIndirectVoid& sib)
+	{
+		bool w = false;
+		if (info.dst_w)
+			w |= reg1.IsWide();
+		if (info.src_w)
+			w |= sib.IsWide();
+		bool r = reg1.IsExtended();
+		bool x = sib.Index.IsExtended();
+		bool b = sib.Base.IsExtended();
+		if (!NeedsSibMagic(sib))
+		{
+			b = x;
+			x = false;
+		}
+		EmitRex(w, r, x, b, reg1.IsExtended8Bit());
+	}
+
+	void EmitRex(SIMDInstructionInfo info, uint reg1, const xRegisterBase& reg2)
+	{
+		bool w = info.src_w ? reg2.IsWide() : false;
+		bool r = false;
+		bool x = false;
+		bool b = reg2.IsExtended();
+		EmitRex(w, r, x, b, reg2.IsExtended8Bit());
+	}
+
 	// For use by instructions that are implicitly wide
 	void EmitRexImplicitlyWide(const xRegisterBase& reg)
 	{
@@ -526,6 +568,89 @@ const xRegister32
 		EmitRex(w, r, x, b);
 	}
 
+	__emitinline static u8 GetVEXRXB(u32 ext, const xRegisterBase& src2)
+	{
+		return src2.IsExtended() << 5;
+	}
+
+	__emitinline static u8 GetVEXRXB(const xRegisterBase& dst, const xIndirectVoid& src2)
+	{
+		bool r = dst.IsExtended();
+		bool x = src2.Index.IsExtended();
+		bool b = src2.Base.IsExtended();
+		if (!NeedsSibMagic(src2))
+		{
+			b = x;
+			x = false;
+		}
+		return (r << 7) | (x << 6) | (b << 5);
+	}
+
+	__emitinline static u8 GetVEXRXB(const xRegisterBase& dst, const xRegisterBase& src2)
+	{
+		return (dst.IsExtended() << 7) | (src2.IsExtended() << 5);
+	}
+
+	__emitinline static u8 GetL(const xRegisterBase& arg) { return arg.IsWideSIMD() ? 4 : 0; }
+	__emitinline static u8 GetL(const xIndirectVoid& arg) { return 0; }
+	__emitinline static u8 GetL(u32 ext) { return 0; }
+
+	__emitinline static u8 GetVEXW(const xRegisterBase& arg) { return arg.GetOperandSize() == 8 ? 0x80 : 0; }
+	__emitinline static u8 GetVEXW(const xIndirectVoid& arg) { return arg.GetOperandSize() == 8 ? 0x80 : 0; }
+	__emitinline static u8 GetVEXW(u32 ext) { return 0; }
+
+	template <typename D, typename S2>
+	__emitinline void xOpWriteVEX(SIMDInstructionInfo info, D dst, u8 src1, const S2& src2, int extraRipOffset)
+	{
+		u8 m = static_cast<u8>(info.map);
+		u8 p = static_cast<u8>(info.prefix);
+		u8 w = 0;
+		if (info.src_w || info.dst_w) {
+			if (info.dst_w)
+				w |= GetVEXW(dst);
+			if (info.src_w)
+				w |= GetVEXW(src2);
+		} else {
+			w = info.w_bit << 7;
+		}
+		u8 l = GetL(dst) | GetL(src2); // Needed for 256-bit movemask.
+		u8 rxb = GetVEXRXB(dst, src2);
+		u8 b2 = p | l | (src1 << 3);
+		if (!w && info.map == SIMDInstructionInfo::Map::M0F && !(rxb & 0x7F))
+		{
+			// Can use a C5 VEX
+			u8 b1 = rxb | b2;
+			xWrite8(0xC5);
+			xWrite8(b1 ^ 0xF8);
+			xWrite8(info.opcode);
+		}
+		else
+		{
+			u8 b1 = rxb | m;
+			b2 |= w;
+			xWrite8(0xC4);
+			xWrite8(b1 ^ 0xE0);
+			xWrite8(b2 ^ 0x78);
+			xWrite8(info.opcode);
+		}
+		EmitSibMagic(dst, src2, extraRipOffset);
+	}
+
+	void EmitVEX(SIMDInstructionInfo info, const xRegisterBase& dst, u8 src1, const xRegisterBase& src2, int extraRipOffset)
+	{
+		xOpWriteVEX(info, dst, src1, src2, extraRipOffset);
+	}
+
+	void EmitVEX(SIMDInstructionInfo info, const xRegisterBase& dst, u8 src1, const xIndirectVoid& src2, int extraRipOffset)
+	{
+		xOpWriteVEX(info, dst, src1, src2, extraRipOffset);
+	}
+
+	void EmitVEX(SIMDInstructionInfo info, u32 ext, u8 dst, const xRegisterBase& src2, int extraRipOffset)
+	{
+		xOpWriteVEX(info, ext, dst, src2, extraRipOffset);
+	}
+
 
 	// --------------------------------------------------------------------------------------
 	//  xSetPtr / xAlignPtr / xGetPtr / xAdvancePtr
@@ -941,7 +1066,7 @@ const xRegister32
 						else if (src.Displacement == 0)
 						{
 							_xMovRtoR(to, src.Base.MatchSizeTo(to));
-							_g1_EmitOp(G1Type_ADD, to, src.Index.MatchSizeTo(to));
+							xADD(to, src.Index.MatchSizeTo(to));
 							return;
 						}
 					}

common/emitter/x86types.h

@@ -29,6 +29,9 @@ namespace x86Emitter
 	static constexpr int SHADOW_STACK_SIZE = 0;
 #endif
 
+	/// This will switch all SSE instructions to generate AVX instructions instead
+	extern bool use_avx;
+
 	extern void xWrite8(u8 val);
 	extern void xWrite16(u16 val);
 	extern void xWrite32(u32 val);
@@ -47,23 +50,6 @@ namespace x86Emitter
 	template <typename T>
 	void xWrite(T val);
 
-// --------------------------------------------------------------------------------------
-//  ALWAYS_USE_MOVAPS [define] / AlwaysUseMovaps [const]
-// --------------------------------------------------------------------------------------
-// This tells the recompiler's emitter to always use movaps instead of movdqa.  Both instructions
-// do the exact same thing, but movaps is 1 byte shorter, and thus results in a cleaner L1 cache
-// and some marginal speed gains as a result.  (it's possible someday in the future the per-
-// formance of the two instructions could change, so this constant is provided to restore MOVDQA
-// use easily at a later time, if needed).
-//
-#define ALWAYS_USE_MOVAPS
-
-#ifdef ALWAYS_USE_MOVAPS
-	static const bool AlwaysUseMovaps = true;
-#else
-	static const bool AlwaysUseMovaps = false;
-#endif
-
 // --------------------------------------------------------------------------------------
 //  __emitline - preprocessors definition
 // --------------------------------------------------------------------------------------
@@ -1075,4 +1061,4 @@ extern const xRegister32
 #include "implement/jmpcall.h"
 
 #include "implement/bmi.h"
-#include "implement/avx.h"
+#include "implement/avx.h"

pcsx2-qt/AboutDialog.cpp

@@ -47,16 +47,16 @@ AboutDialog::AboutDialog(QWidget* parent)
 	m_ui.links->setTextInteractionFlags(Qt::TextBrowserInteraction);
 	m_ui.links->setText(QStringLiteral(
 		R"(<a href="%1">%2</a> | <a href="%3">%4</a> | <a href="%5">%6</a> | <a href="%7">%8</a> | <a href="%9">%10</a>)")
-							.arg(getWebsiteUrl())
-							.arg(tr("Website"))
-							.arg(getSupportForumsUrl())
-							.arg(tr("Support Forums"))
-							.arg(getGitHubRepositoryUrl())
-							.arg(tr("GitHub Repository"))
-							.arg(getLicenseUrl())
-							.arg(tr("License"))
-							.arg(getThirdPartyLicensesUrl())
-							.arg(tr("Third-Party Licenses")));
+			.arg(getWebsiteUrl())
+			.arg(tr("Website"))
+			.arg(getSupportForumsUrl())
+			.arg(tr("Support Forums"))
+			.arg(getGitHubRepositoryUrl())
+			.arg(tr("GitHub Repository"))
+			.arg(getLicenseUrl())
+			.arg(tr("License"))
+			.arg(getThirdPartyLicensesUrl())
+			.arg(tr("Third-Party Licenses")));
 
 	connect(m_ui.links, &QLabel::linkActivated, this, &AboutDialog::linksLinkActivated);
 	connect(m_ui.buttonBox, &QDialogButtonBox::rejected, this, &QDialog::close);

pcsx2-qt/AboutDialog.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>580</width>
-    <height>300</height>
+    <height>320</height>
    </rect>
   </property>
   <property name="windowTitle">

pcsx2-qt/CMakeLists.txt

@@ -83,15 +83,15 @@ target_sources(pcsx2-qt PRIVATE
 	Settings/ControllerSettingsWindow.h
 	Settings/ControllerSettingsWindow.ui
 	Settings/ControllerSettingWidgetBinder.h
+	Settings/DebugAnalysisSettingsTab.ui
 	Settings/DebugAnalysisSettingsWidget.cpp
 	Settings/DebugAnalysisSettingsWidget.h
 	Settings/DebugAnalysisSettingsWidget.ui
-	Settings/DebugUserInterfaceSettingsWidget.cpp
-	Settings/DebugUserInterfaceSettingsWidget.h
-	Settings/DebugUserInterfaceSettingsWidget.ui
+	Settings/DebugGSSettingsTab.ui
+	Settings/DebugLoggingSettingsTab.ui
+	Settings/DebugUserInterfaceSettingsTab.ui
 	Settings/DebugSettingsWidget.cpp
 	Settings/DebugSettingsWidget.h
-	Settings/DebugSettingsWidget.ui
 	Settings/EmulationSettingsWidget.cpp
 	Settings/EmulationSettingsWidget.h
 	Settings/EmulationSettingsWidget.ui
@@ -114,9 +114,19 @@ target_sources(pcsx2-qt PRIVATE
 	Settings/GameSummaryWidget.cpp
 	Settings/GameSummaryWidget.h
 	Settings/GameSummaryWidget.ui
+	Settings/GraphicsAdvancedSettingsTab.ui
+	Settings/GraphicsDisplaySettingsTab.ui
+	Settings/GraphicsHardwareFixesSettingsTab.ui
+	Settings/GraphicsHardwareRenderingSettingsTab.ui
+	Settings/GraphicsMediaCaptureSettingsTab.ui
+	Settings/GraphicsOnScreenDisplaySettingsTab.ui
+	Settings/GraphicsPostProcessingSettingsTab.ui
+	Settings/GraphicsSettingsHeader.ui
 	Settings/GraphicsSettingsWidget.cpp
 	Settings/GraphicsSettingsWidget.h
-	Settings/GraphicsSettingsWidget.ui
+	Settings/GraphicsSoftwareRenderingSettingsTab.ui
+	Settings/GraphicsTextureReplacementSettingsTab.ui
+	Settings/GraphicsUpscalingFixesSettingsTab.ui
 	Settings/HotkeySettingsWidget.cpp
 	Settings/HotkeySettingsWidget.h
 	Settings/InputBindingDialog.cpp
@@ -149,6 +159,8 @@ target_sources(pcsx2-qt PRIVATE
 	Settings/HddCreateQt.cpp
 	Settings/HddCreateQt.h
 	Settings/PatchDetailsWidget.ui
+	Settings/SettingsWidget.cpp
+	Settings/SettingsWidget.h
 	Settings/SettingsWindow.cpp
 	Settings/SettingsWindow.h
 	Settings/SettingsWindow.ui

pcsx2-qt/Debugger/Breakpoints/BreakpointModel.cpp

@@ -269,7 +269,7 @@ QVariant BreakpointModel::headerData(int section, Qt::Orientation orientation, i
 				//: Warning: limited space available. Abbreviate if needed.
 				return tr("OFFSET");
 			case BreakpointColumns::DESCRIPTION:
-				return "DESCRIPTION";
+				return tr("DESCRIPTION");
 			case BreakpointColumns::SIZE_LABEL:
 				//: Warning: limited space available. Abbreviate if needed.
 				return tr("SIZE / LABEL");

pcsx2-qt/Debugger/DisassemblyView.cpp

@@ -874,10 +874,10 @@ inline QString DisassemblyView::DisassemblyStringFromAddress(u32 address, QFont
 	}
 
 	lineString = lineString.leftJustified(4, ' ') // Address / symbol
-					 .arg(line.name.c_str())
-					 .arg(line.params.c_str()) // opcode + arguments
-					 .arg(isConditional ? (isConditionalMet ? "# true" : "# false") : "")
-					 .arg(isCurrentPC ? "<--" : "");
+	                 .arg(line.name.c_str())
+	                 .arg(line.params.c_str()) // opcode + arguments
+	                 .arg(isConditional ? (isConditionalMet ? "# true" : "# false") : "")
+	                 .arg(isCurrentPC ? "<--" : "");
 
 	return lineString;
 }

pcsx2-qt/GameList/GameListWidget.cpp

@@ -26,6 +26,7 @@
 #include <QtWidgets/QMenu>
 #include <QtWidgets/QScrollBar>
 #include <QtWidgets/QStyledItemDelegate>
+#include <QShortcut>
 
 static const char* SUPPORTED_FORMATS_STRING = QT_TRANSLATE_NOOP(GameListWidget,
 	".bin/.iso (ISO Disc Images)\n"
@@ -217,6 +218,10 @@ void GameListWidget::initialize()
 		m_sort_model->setFilterName(text);
 	});
 
+	connect(new QShortcut(QKeySequence::Find, this), &QShortcut::activated, [this]() {
+		m_ui.searchText->setFocus();
+	});
+
 	m_table_view = new QTableView(m_ui.stack);
 	m_table_view->setModel(m_sort_model);
 	m_table_view->setSortingEnabled(true);
@@ -230,7 +235,6 @@ void GameListWidget::initialize()
 	m_table_view->horizontalHeader()->setHighlightSections(false);
 	m_table_view->horizontalHeader()->setContextMenuPolicy(Qt::CustomContextMenu);
 	m_table_view->verticalHeader()->hide();
-	m_table_view->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
 	m_table_view->setVerticalScrollMode(QAbstractItemView::ScrollMode::ScrollPerPixel);
 	m_table_view->setItemDelegateForColumn(0, new GameListIconStyleDelegate(this));
 	m_table_view->setItemDelegateForColumn(8, new GameListIconStyleDelegate(this));

pcsx2-qt/GameList/GameListWidget.ui

@@ -53,12 +53,14 @@
            <height>0</height>
           </size>
          </property>
+         <property name="toolTip">
+          <string>Game List</string>
+         </property>
          <property name="text">
           <string>Game List</string>
          </property>
          <property name="icon">
-          <iconset theme="list-check">
-           <normaloff>.</normaloff>.</iconset>
+          <iconset theme="list-check"/>
          </property>
          <property name="checkable">
           <bool>true</bool>
@@ -76,12 +78,14 @@
            <height>0</height>
           </size>
          </property>
+         <property name="toolTip">
+          <string>Game Grid</string>
+         </property>
          <property name="text">
           <string>Game Grid</string>
          </property>
          <property name="icon">
-          <iconset theme="function-line">
-           <normaloff>.</normaloff>.</iconset>
+          <iconset theme="function-line"/>
          </property>
          <property name="checkable">
           <bool>true</bool>
@@ -99,12 +103,14 @@
            <height>0</height>
           </size>
          </property>
+         <property name="toolTip">
+          <string>Show Titles</string>
+         </property>
          <property name="text">
           <string>Show Titles</string>
          </property>
          <property name="icon">
-          <iconset theme="price-tag-3-line">
-           <normaloff>.</normaloff>.</iconset>
+          <iconset theme="price-tag-3-line"/>
          </property>
          <property name="checkable">
           <bool>true</bool>
@@ -135,7 +141,7 @@
           <number>200</number>
          </property>
          <property name="orientation">
-          <enum>Qt::Horizontal</enum>
+          <enum>Qt::Orientation::Horizontal</enum>
          </property>
         </widget>
        </item>
@@ -144,7 +150,7 @@
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">
-        <enum>Qt::Horizontal</enum>
+        <enum>Qt::Orientation::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
@@ -166,8 +172,7 @@
            <string>All Types</string>
           </property>
           <property name="icon">
-           <iconset theme="filter-line">
-            <normaloff>.</normaloff>.</iconset>
+           <iconset theme="filter-line"/>
           </property>
          </item>
         </widget>
@@ -179,8 +184,7 @@
            <string>All Regions</string>
           </property>
           <property name="icon">
-           <iconset theme="global-line">
-            <normaloff>.</normaloff>.</iconset>
+           <iconset theme="global-line"/>
           </property>
          </item>
         </widget>

pcsx2-qt/MainWindow.cpp

@@ -219,6 +219,9 @@ void MainWindow::setupAdditionalUi()
 	m_ui.actionViewStatusBar->setChecked(status_bar_visible);
 	m_ui.statusBar->setVisible(status_bar_visible);
 
+	const bool show_game_grid = Host::GetBaseBoolSettingValue("UI", "GameListGridView", false);
+	updateGameGridActions(show_game_grid);
+
 	m_game_list_widget = new GameListWidget(getContentParent());
 	m_game_list_widget->initialize();
 	m_ui.actionGridViewShowTitles->setChecked(m_game_list_widget->getShowGridCoverTitles());
@@ -390,6 +393,7 @@ void MainWindow::connectSignals()
 	connect(m_game_list_widget, &GameListWidget::layoutChange, this, [this]() {
 		QSignalBlocker sb(m_ui.actionGridViewShowTitles);
 		m_ui.actionGridViewShowTitles->setChecked(m_game_list_widget->getShowGridCoverTitles());
+		updateGameGridActions(m_game_list_widget->isShowingGameGrid());
 	});
 
 	SettingWidgetBinder::BindWidgetToBoolSetting(nullptr, m_ui.actionViewStatusBarVerbose, "UI", "VerboseStatusBar", false);
@@ -504,26 +508,24 @@ void MainWindow::createRendererSwitchMenu()
 	};
 	const GSRendererType current_renderer = static_cast<GSRendererType>(
 		Host::GetBaseIntSettingValue("EmuCore/GS", "Renderer", static_cast<int>(GSRendererType::Auto)));
+
+	QActionGroup* switch_renderer_group = new QActionGroup(m_ui.menuDebugSwitchRenderer);
+
 	for (const GSRendererType renderer : renderers)
 	{
-		QAction* action = m_ui.menuDebugSwitchRenderer->addAction(
-			QString::fromUtf8(Pcsx2Config::GSOptions::GetRendererName(renderer)));
+		QAction* action = new QAction(
+			QString::fromUtf8(Pcsx2Config::GSOptions::GetRendererName(renderer)), switch_renderer_group);
 		action->setCheckable(true);
 		action->setChecked(current_renderer == renderer);
 		connect(action,
-			&QAction::triggered, [this, action, renderer] {
+			&QAction::triggered, [renderer] {
 				Host::SetBaseIntSettingValue("EmuCore/GS", "Renderer", static_cast<int>(renderer));
 				Host::CommitBaseSettingChanges();
 				g_emu_thread->applySettings();
-
-				// clear all others
-				for (QObject* obj : m_ui.menuDebugSwitchRenderer->children())
-				{
-					if (QAction* act = qobject_cast<QAction*>(obj); act && act != action)
-						act->setChecked(false);
-				}
 			});
 	}
+
+	m_ui.menuDebugSwitchRenderer->addActions(switch_renderer_group->actions());
 }
 
 void MainWindow::recreate()
@@ -1131,8 +1133,8 @@ bool MainWindow::shouldHideMainWindow() const
 {
 	// NOTE: We can't use isRenderingToMain() here, because this happens post-fullscreen-switch.
 	return (Host::GetBoolSettingValue("UI", "HideMainWindowWhenRunning", false) && !g_emu_thread->shouldRenderToMain()) ||
-		   (g_emu_thread->shouldRenderToMain() && (isRenderingFullscreen() || m_is_temporarily_windowed)) ||
-		   Host::InNoGUIMode();
+	       (g_emu_thread->shouldRenderToMain() && (isRenderingFullscreen() || m_is_temporarily_windowed)) ||
+	       Host::InNoGUIMode();
 }
 
 bool MainWindow::shouldMouseLock() const
@@ -1144,8 +1146,8 @@ bool MainWindow::shouldMouseLock() const
 		return false;
 
 	bool windowsHidden = (!g_debugger_window || g_debugger_window->isHidden()) &&
-						 (!m_controller_settings_window || m_controller_settings_window->isHidden()) &&
-						 (!m_settings_window || m_settings_window->isHidden());
+	                     (!m_controller_settings_window || m_controller_settings_window->isHidden()) &&
+	                     (!m_settings_window || m_settings_window->isHidden());
 
 	return windowsHidden && (isActiveWindow() || isRenderingFullscreen());
 }
@@ -3147,6 +3149,14 @@ void MainWindow::updateGameDependentActions()
 	m_ui.actionReloadPatches->setEnabled(s_vm_valid);
 }
 
+void MainWindow::updateGameGridActions(const bool show_game_grid)
+{
+	m_ui.actionGridViewShowTitles->setEnabled(show_game_grid);
+	m_ui.actionGridViewZoomIn->setEnabled(show_game_grid);
+	m_ui.actionGridViewZoomOut->setEnabled(show_game_grid);
+	m_ui.actionGridViewRefreshCovers->setEnabled(show_game_grid);
+}
+
 void MainWindow::doStartFile(std::optional<CDVD_SourceType> source, const QString& path)
 {
 	if (s_vm_valid)

pcsx2-qt/MainWindow.h

@@ -234,6 +234,7 @@ private:
 	void updateEmulationActions(bool starting, bool running, bool stopping);
 	void updateDisplayRelatedActions(bool has_surface, bool render_to_main, bool fullscreen);
 	void updateGameDependentActions();
+	void updateGameGridActions(const bool show_game_grid);
 	void updateStatusBarWidgetVisibility();
 	void updateAdvancedSettingsVisibility();
 	void updateWindowTitle();

pcsx2-qt/QtHost.cpp

@@ -1000,21 +1000,21 @@ void EmuThread::updatePerformanceMetrics(bool force)
 		if (THREAD_VU1)
 		{
 			gs_stat = tr("Slot: %1 | Volume: %2% | %3 | EE: %4% | VU: %5% | GS: %6%")
-						  .arg(SaveStateSelectorUI::GetCurrentSlot())
-						  .arg(SPU2::GetOutputVolume())
-						  .arg(gs_stat_str.c_str())
-						  .arg(PerformanceMetrics::GetCPUThreadUsage(), 0, 'f', 0)
-						  .arg(PerformanceMetrics::GetVUThreadUsage(), 0, 'f', 0)
-						  .arg(PerformanceMetrics::GetGSThreadUsage(), 0, 'f', 0);
+			              .arg(SaveStateSelectorUI::GetCurrentSlot())
+			              .arg(SPU2::GetOutputVolume())
+			              .arg(gs_stat_str.c_str())
+			              .arg(PerformanceMetrics::GetCPUThreadUsage(), 0, 'f', 0)
+			              .arg(PerformanceMetrics::GetVUThreadUsage(), 0, 'f', 0)
+			              .arg(PerformanceMetrics::GetGSThreadUsage(), 0, 'f', 0);
 		}
 		else
 		{
 			gs_stat = tr("Slot: %1 | Volume: %2% | %3 | EE: %4% | GS: %5%")
-						  .arg(SaveStateSelectorUI::GetCurrentSlot())
-						  .arg(SPU2::GetOutputVolume())
-						  .arg(gs_stat_str.c_str())
-						  .arg(PerformanceMetrics::GetCPUThreadUsage(), 0, 'f', 0)
-						  .arg(PerformanceMetrics::GetGSThreadUsage(), 0, 'f', 0);
+			              .arg(SaveStateSelectorUI::GetCurrentSlot())
+			              .arg(SPU2::GetOutputVolume())
+			              .arg(gs_stat_str.c_str())
+			              .arg(PerformanceMetrics::GetCPUThreadUsage(), 0, 'f', 0)
+			              .arg(PerformanceMetrics::GetGSThreadUsage(), 0, 'f', 0);
 		}
 
 		QMetaObject::invokeMethod(g_main_window->getStatusVerboseWidget(), "setText", Qt::QueuedConnection, Q_ARG(const QString&, gs_stat));
@@ -1129,9 +1129,9 @@ void Host::OnAchievementsRefreshed()
 		game_id = Achievements::GetGameID();
 
 		game_info = qApp
-						->translate("EmuThread", "Game: %1 (%2)\n")
-						.arg(QString::fromStdString(Achievements::GetGameTitle()))
-						.arg(game_id);
+		                ->translate("EmuThread", "Game: %1 (%2)\n")
+		                .arg(QString::fromStdString(Achievements::GetGameTitle()))
+		                .arg(game_id);
 
 		const std::string& rich_presence_string = Achievements::GetRichPresenceString();
 		if (!rich_presence_string.empty())
@@ -1181,7 +1181,7 @@ void Host::OpenHostFileSelectorAsync(std::string_view title, bool select_directo
 	if (!filters.empty())
 	{
 		filters_str.append(QStringLiteral("All File Types (%1)")
-							   .arg(QString::fromStdString(StringUtil::JoinString(filters.begin(), filters.end(), " "))));
+				.arg(QString::fromStdString(StringUtil::JoinString(filters.begin(), filters.end(), " "))));
 		for (const std::string& filter : filters)
 		{
 			filters_str.append(

pcsx2-qt/QtUtils.cpp

@@ -90,9 +90,7 @@ namespace QtUtils
 
 		const int min_column_width = header->minimumSectionSize();
 		const int scrollbar_width = ((view->verticalScrollBar() && view->verticalScrollBar()->isVisible()) ||
-										view->verticalScrollBarPolicy() == Qt::ScrollBarAlwaysOn) ?
-										view->verticalScrollBar()->width() :
-										0;
+			view->verticalScrollBarPolicy() == Qt::ScrollBarAlwaysOn) ? view->verticalScrollBar()->width() : 0;
 		int num_flex_items = 0;
 		int total_width = 0;
 		int column_index = 0;

pcsx2-qt/SettingWidgetBinder.h

@@ -242,8 +242,8 @@ namespace SettingWidgetBinder
 		static std::optional<QString> getNullableStringValue(const QCheckBox* widget)
 		{
 			return (widget->checkState() == Qt::PartiallyChecked) ?
-					   std::nullopt :
-					   std::optional<QString>(widget->isChecked() ? QStringLiteral("1") : QStringLiteral("0"));
+			           std::nullopt :
+			           std::optional<QString>(widget->isChecked() ? QStringLiteral("1") : QStringLiteral("0"));
 		}
 		static void setNullableStringValue(QCheckBox* widget, std::optional<QString> value)
 		{

pcsx2-qt/Settings/AchievementSettingsWidget.cpp

@@ -19,13 +19,12 @@
 
 const char* AUDIO_FILE_FILTER = QT_TRANSLATE_NOOP("MainWindow", "Audio Files (*.wav)");
 
-AchievementSettingsWidget::AchievementSettingsWidget(SettingsWindow* dialog, QWidget* parent)
-	: QWidget(parent)
-	, m_dialog(dialog)
+AchievementSettingsWidget::AchievementSettingsWidget(SettingsWindow* settings_dialog, QWidget* parent)
+	: SettingsWidget(settings_dialog, parent)
 {
-	SettingsInterface* sif = dialog->getSettingsInterface();
+	SettingsInterface* sif = dialog()->getSettingsInterface();
 
-	m_ui.setupUi(this);
+	setupTab(m_ui);
 
 	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.enable, "Achievements", "Enabled", false);
 	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.hardcoreMode, "Achievements", "ChallengeMode", false);
@@ -36,11 +35,12 @@ AchievementSettingsWidget::AchievementSettingsWidget(SettingsWindow* dialog, QWi
 	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.unlockSound, "Achievements", "UnlockSound", true);
 	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.lbSound, "Achievements", "LBSubmitSound", true);
 	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.overlays, "Achievements", "Overlays", true);
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.leaderboardOverlays, "Achievements", "LBOverlays", true);
 	SettingWidgetBinder::BindWidgetToIntSetting(sif, m_ui.overlayPosition, "Achievements", "OverlayPosition", static_cast<int>(AchievementOverlayPosition::BottomRight));
 	SettingWidgetBinder::BindWidgetToIntSetting(sif, m_ui.notificationPosition, "Achievements", "NotificationPosition", static_cast<int>(OsdOverlayPos::TopLeft));
 	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.encoreMode, "Achievements", "EncoreMode", false);
 	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.spectatorMode, "Achievements", "SpectatorMode", false);
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.unofficialAchievements, "Achievements", "UnofficialTestMode",false);
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.unofficialAchievements, "Achievements", "UnofficialTestMode", false);
 	SettingWidgetBinder::BindWidgetToIntSetting(sif, m_ui.achievementNotificationsDuration, "Achievements", "NotificationsDuration", Pcsx2Config::AchievementsOptions::DEFAULT_NOTIFICATION_DURATION);
 	SettingWidgetBinder::BindWidgetToIntSetting(sif, m_ui.leaderboardNotificationsDuration, "Achievements", "LeaderboardsDuration", Pcsx2Config::AchievementsOptions::DEFAULT_LEADERBOARD_DURATION);
 
@@ -48,18 +48,19 @@ AchievementSettingsWidget::AchievementSettingsWidget(SettingsWindow* dialog, QWi
 	SettingWidgetBinder::BindWidgetToFileSetting(sif, m_ui.unlockSoundPath, m_ui.unlockSoundBrowse, m_ui.unlockSoundOpen, m_ui.unlockSoundReset, "Achievements", "UnlockSoundName", Path::Combine(EmuFolders::Resources, EmuConfig.Achievements.DEFAULT_UNLOCK_SOUND_NAME), AUDIO_FILE_FILTER, true, false);
 	SettingWidgetBinder::BindWidgetToFileSetting(sif, m_ui.lbSoundPath, m_ui.lbSoundBrowse, m_ui.lbSoundOpen, m_ui.lbSoundReset, "Achievements", "LBSubmitSoundName", Path::Combine(EmuFolders::Resources, EmuConfig.Achievements.DEFAULT_LBSUBMIT_SOUND_NAME), AUDIO_FILE_FILTER, true, false);
 
-	dialog->registerWidgetHelp(m_ui.enable, tr("Enable Achievements"), tr("Unchecked"), tr("When enabled and logged in, PCSX2 will scan for achievements on startup."));
-	dialog->registerWidgetHelp(m_ui.hardcoreMode, tr("Enable Hardcore Mode"), tr("Unchecked"), tr("\"Challenge\" mode for achievements, including leaderboard tracking. Disables save state, cheats, and slowdown functions."));
-	dialog->registerWidgetHelp(m_ui.achievementNotifications, tr("Show Achievement Notifications"), tr("Checked"), tr("Displays popup messages on events such as achievement unlocks and game completion."));
-	dialog->registerWidgetHelp(m_ui.leaderboardNotifications, tr("Show Leaderboard Notifications"), tr("Checked"), tr("Displays popup messages when starting, submitting, or failing a leaderboard challenge."));
-	dialog->registerWidgetHelp(m_ui.soundEffects, tr("Enable Sound Effects"), tr("Checked"), tr("Plays sound effects for events such as achievement unlocks and leaderboard submissions."));
-	dialog->registerWidgetHelp(m_ui.soundEffectsBox, tr("Custom Sound Effect"), tr("Any"), tr("Customize the sound effect that are played whenever you received a notification, earned an achievement or submitted an entry to the leaderboard."));
-	dialog->registerWidgetHelp(m_ui.overlays, tr("Enable In-Game Overlays"), tr("Checked"), tr("Shows icons in the lower-right corner of the screen when a challenge/primed achievement is active."));
-	dialog->registerWidgetHelp(m_ui.overlayPosition, tr("Overlay Position"), tr("Bottom Right"), tr("Determines where achievement overlays are positioned on the screen."));
-	dialog->registerWidgetHelp(m_ui.notificationPosition, tr("Notification Position"), tr("Top Left"), tr("Determines where achievement notification popups are positioned on the screen."));
-	dialog->registerWidgetHelp(m_ui.encoreMode, tr("Enable Encore Mode"), tr("Unchecked"),tr("When enabled, each session will behave as if no achievements have been unlocked."));
-	dialog->registerWidgetHelp(m_ui.spectatorMode, tr("Enable Spectator Mode"), tr("Unchecked"), tr("When enabled, PCSX2 will assume all achievements are locked and not send any unlock notifications to the server."));
-	dialog->registerWidgetHelp(m_ui.unofficialAchievements, tr("Test Unofficial Achievements"), tr("Unchecked"), tr("When enabled, PCSX2 will list achievements from unofficial sets. Please note that these achievements are not tracked by RetroAchievements, so they unlock every time."));
+	dialog()->registerWidgetHelp(m_ui.enable, tr("Enable Achievements"), tr("Unchecked"), tr("When enabled and logged in, PCSX2 will scan for achievements on startup."));
+	dialog()->registerWidgetHelp(m_ui.hardcoreMode, tr("Enable Hardcore Mode"), tr("Unchecked"), tr("\"Challenge\" mode for achievements, including leaderboard tracking. Disables save state, cheats, and slowdown functions."));
+	dialog()->registerWidgetHelp(m_ui.achievementNotifications, tr("Show Achievement Notifications"), tr("Checked"), tr("Displays popup messages on events such as achievement unlocks and game completion."));
+	dialog()->registerWidgetHelp(m_ui.leaderboardNotifications, tr("Show Leaderboard Notifications"), tr("Checked"), tr("Displays popup messages when starting, submitting, or failing a leaderboard challenge."));
+	dialog()->registerWidgetHelp(m_ui.soundEffects, tr("Enable Sound Effects"), tr("Checked"), tr("Plays sound effects for events such as achievement unlocks and leaderboard submissions."));
+	dialog()->registerWidgetHelp(m_ui.soundEffectsBox, tr("Custom Sound Effect"), tr("Any"), tr("Customize the sound effect that are played whenever you received a notification, earned an achievement or submitted an entry to the leaderboard."));
+	dialog()->registerWidgetHelp(m_ui.overlays, tr("Enable In-Game Overlays"), tr("Checked"), tr("Shows icons in the screen when a challenge/primed achievement is active."));
+	dialog()->registerWidgetHelp(m_ui.leaderboardOverlays, tr("Enable In-Game Leaderboard Overlays"), tr("Checked"), tr("Shows icons in the screen when leaderboard tracking is active."));
+	dialog()->registerWidgetHelp(m_ui.overlayPosition, tr("Overlay Position"), tr("Bottom Right"), tr("Determines where achievement/leaderboard overlays are positioned on the screen."));
+	dialog()->registerWidgetHelp(m_ui.notificationPosition, tr("Notification Position"), tr("Top Left"), tr("Determines where achievement/leaderboard notification popups are positioned on the screen."));
+	dialog()->registerWidgetHelp(m_ui.encoreMode, tr("Enable Encore Mode"), tr("Unchecked"), tr("When enabled, each session will behave as if no achievements have been unlocked."));
+	dialog()->registerWidgetHelp(m_ui.spectatorMode, tr("Enable Spectator Mode"), tr("Unchecked"), tr("When enabled, PCSX2 will assume all achievements are locked and not send any unlock notifications to the server."));
+	dialog()->registerWidgetHelp(m_ui.unofficialAchievements, tr("Test Unofficial Achievements"), tr("Unchecked"), tr("When enabled, PCSX2 will list achievements from unofficial sets. Please note that these achievements are not tracked by RetroAchievements, so they unlock every time."));
 
 	connect(m_ui.enable, &QCheckBox::checkStateChanged, this, &AchievementSettingsWidget::updateEnableState);
 	connect(m_ui.hardcoreMode, &QCheckBox::checkStateChanged, this, &AchievementSettingsWidget::updateEnableState);
@@ -74,7 +75,7 @@ AchievementSettingsWidget::AchievementSettingsWidget(SettingsWindow* dialog, QWi
 	connect(m_ui.achievementNotificationsDuration, &QSlider::valueChanged, this, &AchievementSettingsWidget::onAchievementsNotificationDurationSliderChanged);
 	connect(m_ui.leaderboardNotificationsDuration, &QSlider::valueChanged, this, &AchievementSettingsWidget::onLeaderboardsNotificationDurationSliderChanged);
 
-	if (!m_dialog->isPerGameSettings())
+	if (!dialog()->isPerGameSettings())
 	{
 		connect(m_ui.loginButton, &QPushButton::clicked, this, &AchievementSettingsWidget::onLoginLogoutPressed);
 		connect(m_ui.viewProfile, &QPushButton::clicked, this, &AchievementSettingsWidget::onViewProfilePressed);
@@ -109,13 +110,13 @@ AchievementSettingsWidget::~AchievementSettingsWidget() = default;
 
 void AchievementSettingsWidget::updateEnableState()
 {
-	const bool enabled = m_dialog->getEffectiveBoolValue("Achievements", "Enabled", false);
-	const bool notifications = enabled && m_dialog->getEffectiveBoolValue("Achievements", "Notifications", true);
-	const bool lb_notifications = enabled && m_dialog->getEffectiveBoolValue("Achievements", "LeaderboardNotifications", true);
-	const bool sound = m_dialog->getEffectiveBoolValue("Achievements", "SoundEffects", true);
-	const bool info = enabled && sound && m_dialog->getEffectiveBoolValue("Achievements", "InfoSound", true);
-	const bool unlock = enabled && sound && m_dialog->getEffectiveBoolValue("Achievements", "UnlockSound", true);
-	const bool lbsound = enabled && sound && m_dialog->getEffectiveBoolValue("Achievements", "LBSubmitSound", true);
+	const bool enabled = dialog()->getEffectiveBoolValue("Achievements", "Enabled", false);
+	const bool notifications = enabled && dialog()->getEffectiveBoolValue("Achievements", "Notifications", true);
+	const bool lb_notifications = enabled && dialog()->getEffectiveBoolValue("Achievements", "LeaderboardNotifications", true);
+	const bool sound = dialog()->getEffectiveBoolValue("Achievements", "SoundEffects", true);
+	const bool info = enabled && sound && dialog()->getEffectiveBoolValue("Achievements", "InfoSound", true);
+	const bool unlock = enabled && sound && dialog()->getEffectiveBoolValue("Achievements", "UnlockSound", true);
+	const bool lbsound = enabled && sound && dialog()->getEffectiveBoolValue("Achievements", "LBSubmitSound", true);
 	m_ui.hardcoreMode->setEnabled(enabled);
 	m_ui.achievementNotifications->setEnabled(enabled);
 	m_ui.leaderboardNotifications->setEnabled(enabled);
@@ -124,7 +125,7 @@ void AchievementSettingsWidget::updateEnableState()
 	m_ui.leaderboardNotificationsDuration->setEnabled(lb_notifications);
 	m_ui.leaderboardNotificationsDurationLabel->setEnabled(lb_notifications);
 
-	if (!m_dialog->isPerGameSettings())
+	if (!dialog()->isPerGameSettings())
 	{
 		m_ui.notificationSoundPath->setEnabled(info);
 		m_ui.notificationSoundBrowse->setEnabled(info);
@@ -145,16 +146,18 @@ void AchievementSettingsWidget::updateEnableState()
 
 	m_ui.soundEffects->setEnabled(enabled);
 	m_ui.overlays->setEnabled(enabled);
-	
-	const bool overlays_enabled = enabled && m_dialog->getEffectiveBoolValue("Achievements", "Overlays", true);
-	const bool notifications_enabled = enabled && (m_dialog->getEffectiveBoolValue("Achievements", "Notifications", true) || 
-													m_dialog->getEffectiveBoolValue("Achievements", "LeaderboardNotifications", true));
+	m_ui.leaderboardOverlays->setEnabled(enabled);
+
+	const bool overlays_enabled = enabled && (dialog()->getEffectiveBoolValue("Achievements", "Overlays", true) ||
+												 dialog()->getEffectiveBoolValue("Achievements", "LBOverlays", true));
+	const bool notifications_enabled = enabled && (dialog()->getEffectiveBoolValue("Achievements", "Notifications", true) ||
+													  dialog()->getEffectiveBoolValue("Achievements", "LeaderboardNotifications", true));
 	m_ui.overlaySettingsBox->setEnabled(overlays_enabled || notifications_enabled);
 	m_ui.overlayPosition->setEnabled(overlays_enabled);
 	m_ui.overlayPositionLabel->setEnabled(overlays_enabled);
 	m_ui.notificationPosition->setEnabled(notifications_enabled);
 	m_ui.notificationPositionLabel->setEnabled(notifications_enabled);
-	
+
 	m_ui.encoreMode->setEnabled(enabled);
 	m_ui.spectatorMode->setEnabled(enabled);
 	m_ui.unofficialAchievements->setEnabled(enabled);
@@ -165,8 +168,8 @@ void AchievementSettingsWidget::onHardcoreModeStateChanged()
 	if (!QtHost::IsVMValid())
 		return;
 
-	const bool enabled = m_dialog->getEffectiveBoolValue("Achievements", "Enabled", false);
-	const bool challenge = m_dialog->getEffectiveBoolValue("Achievements", "ChallengeMode", false);
+	const bool enabled = dialog()->getEffectiveBoolValue("Achievements", "Enabled", false);
+	const bool challenge = dialog()->getEffectiveBoolValue("Achievements", "ChallengeMode", false);
 	if (!enabled || !challenge)
 		return;
 
@@ -188,14 +191,14 @@ void AchievementSettingsWidget::onHardcoreModeStateChanged()
 
 void AchievementSettingsWidget::onAchievementsNotificationDurationSliderChanged()
 {
-	const float duration = m_dialog->getEffectiveFloatValue("Achievements", "NotificationsDuration",
+	const float duration = dialog()->getEffectiveFloatValue("Achievements", "NotificationsDuration",
 		Pcsx2Config::AchievementsOptions::DEFAULT_NOTIFICATION_DURATION);
 	m_ui.achievementNotificationsDurationLabel->setText(tr("%n seconds", nullptr, static_cast<int>(duration)));
 }
 
 void AchievementSettingsWidget::onLeaderboardsNotificationDurationSliderChanged()
 {
-	const float duration = m_dialog->getEffectiveFloatValue("Achievements", "LeaderboardsDuration",
+	const float duration = dialog()->getEffectiveFloatValue("Achievements", "LeaderboardsDuration",
 		Pcsx2Config::AchievementsOptions::DEFAULT_LEADERBOARD_DURATION);
 	m_ui.leaderboardNotificationsDurationLabel->setText(tr("%n seconds", nullptr, static_cast<int>(duration)));
 }

pcsx2-qt/Settings/AchievementSettingsWidget.h

@@ -2,17 +2,17 @@
 // SPDX-License-Identifier: GPL-3.0+
 
 #pragma once
-#include <QtWidgets/QWidget>
+
 #include "ui_AchievementSettingsWidget.h"
 
-class SettingsWindow;
+#include "SettingsWidget.h"
 
-class AchievementSettingsWidget : public QWidget
+class AchievementSettingsWidget : public SettingsWidget
 {
 	Q_OBJECT
 
 public:
-	explicit AchievementSettingsWidget(SettingsWindow* dialog, QWidget* parent);
+	explicit AchievementSettingsWidget(SettingsWindow* settings_dialog, QWidget* parent);
 	~AchievementSettingsWidget();
 
 private Q_SLOTS:
@@ -28,6 +28,4 @@ private:
 	void updateLoginState();
 
 	Ui::AchievementSettingsWidget m_ui;
-
-	SettingsWindow* m_dialog;
 };

pcsx2-qt/Settings/AchievementSettingsWidget.ui

@@ -6,508 +6,497 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>680</width>
-    <height>480</height>
+    <width>700</width>
+    <height>1000</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
    <item>
-    <widget class="QScrollArea" name="scrollArea">
-     <property name="widgetResizable">
+    <widget class="QGroupBox" name="settingsBox">
+     <property name="title">
+      <string>Settings</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_5">
+      <item row="2" column="0">
+       <widget class="QCheckBox" name="unofficialAchievements">
+        <property name="text">
+         <string>Test Unofficial Achievements</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QCheckBox" name="hardcoreMode">
+        <property name="text">
+         <string>Enable Hardcore Mode</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QCheckBox" name="enable">
+        <property name="text">
+         <string>Enable Achievements</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QCheckBox" name="spectatorMode">
+        <property name="text">
+         <string>Enable Spectator Mode</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QCheckBox" name="encoreMode">
+        <property name="text">
+         <string>Enable Encore Mode</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="notificationBox">
+     <property name="title">
+      <string>Notifications</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_2" columnstretch="1,1">
+      <item row="0" column="1">
+       <layout class="QHBoxLayout" name="achievementNotificationsDurationSliderContainer" stretch="1,0">
+        <item>
+         <widget class="QSlider" name="achievementNotificationsDuration">
+          <property name="minimum">
+           <number>3</number>
+          </property>
+          <property name="maximum">
+           <number>30</number>
+          </property>
+          <property name="pageStep">
+           <number>1</number>
+          </property>
+          <property name="value">
+           <number>5</number>
+          </property>
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="invertedAppearance">
+           <bool>false</bool>
+          </property>
+          <property name="tickPosition">
+           <enum>QSlider::TicksBelow</enum>
+          </property>
+          <property name="tickInterval">
+           <number>1</number>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="achievementNotificationsDurationLabel">
+          <property name="text">
+           <string>5 seconds</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="0" column="0">
+       <widget class="QCheckBox" name="achievementNotifications">
+        <property name="text">
+         <string>Show Achievement Notifications</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <layout class="QHBoxLayout" name="leaderboardNotificationsDurationSliderContainer" stretch="1,0">
+        <item>
+         <widget class="QSlider" name="leaderboardNotificationsDuration">
+          <property name="minimum">
+           <number>3</number>
+          </property>
+          <property name="maximum">
+           <number>30</number>
+          </property>
+          <property name="pageStep">
+           <number>1</number>
+          </property>
+          <property name="value">
+           <number>5</number>
+          </property>
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="invertedAppearance">
+           <bool>false</bool>
+          </property>
+          <property name="tickPosition">
+           <enum>QSlider::TicksBelow</enum>
+          </property>
+          <property name="tickInterval">
+           <number>1</number>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="leaderboardNotificationsDurationLabel">
+          <property name="text">
+           <string>5 seconds</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="1" column="0">
+       <widget class="QCheckBox" name="leaderboardNotifications">
+        <property name="text">
+         <string>Show Leaderboard Notifications</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QCheckBox" name="soundEffects">
+        <property name="text">
+         <string>Enable Sound Effects</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0">
+       <widget class="QLabel" name="notificationPositionLabel">
+        <property name="text">
+         <string>Notification Position:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
+       <widget class="QComboBox" name="notificationPosition">
+        <item>
+         <property name="text">
+          <string>None</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Top Left (Default)</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Top Center</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Top Right</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Center Left</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Center</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Center Right</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Bottom Left</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Bottom Center</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Bottom Right</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="overlaySettingsBox">
+     <property name="title">
+      <string>Overlay Settings</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_overlay">
+      <item row="1" column="1">
+       <widget class="QComboBox" name="overlayPosition">
+        <item>
+         <property name="text">
+          <string>Top Left</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Top Center</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Top Right</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Center Left</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Center</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Center Right</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Bottom Left</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Bottom Center</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Bottom Right (Default)</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="overlayPositionLabel">
+        <property name="text">
+         <string>Overlay Position:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QCheckBox" name="overlays">
+        <property name="text">
+         <string>Enable In-Game Overlays</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QCheckBox" name="leaderboardOverlays">
+        <property name="text">
+         <string>Enable In-Game Leaderboard Overlays</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="soundEffectsBox">
+     <property name="title">
+      <string>Sound Effects</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_6">
+      <item row="5" column="0">
+       <widget class="QLineEdit" name="lbSoundPath"/>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLineEdit" name="notificationSoundPath"/>
+      </item>
+      <item row="3" column="1">
+       <widget class="QPushButton" name="unlockSoundBrowse">
+        <property name="text">
+         <string>Browse...</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="3">
+       <widget class="QPushButton" name="notificationSoundReset">
+        <property name="text">
+         <string>Reset</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QCheckBox" name="unlockSound">
+        <property name="text">
+         <string>Achievement Unlock Sound</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QPushButton" name="notificationSoundBrowse">
+        <property name="text">
+         <string>Browse...</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0">
+       <widget class="QLineEdit" name="unlockSoundPath"/>
+      </item>
+      <item row="5" column="1">
+       <widget class="QPushButton" name="lbSoundBrowse">
+        <property name="text">
+         <string>Browse...</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="2">
+       <widget class="QPushButton" name="unlockSoundOpen">
+        <property name="text">
+         <string>Preview</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2">
+       <widget class="QPushButton" name="notificationSoundOpen">
+        <property name="text">
+         <string>Preview</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QCheckBox" name="notificationSound">
+        <property name="text">
+         <string>Notification Sound</string>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="2">
+       <widget class="QPushButton" name="lbSoundOpen">
+        <property name="text">
+         <string>Preview</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="3">
+       <widget class="QPushButton" name="unlockSoundReset">
+        <property name="text">
+         <string>Reset</string>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="3">
+       <widget class="QPushButton" name="lbSoundReset">
+        <property name="text">
+         <string>Reset</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0">
+       <widget class="QCheckBox" name="lbSound">
+        <property name="text">
+         <string>Leaderboard Submit Sound</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="loginBox">
+     <property name="title">
+      <string>Account</string>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,0">
+      <item>
+       <widget class="QLabel" name="loginStatus">
+        <property name="text">
+         <string>Username:
+Login token generated at:</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="achievementButtons">
+        <item>
+         <widget class="QPushButton" name="viewProfile">
+          <property name="text">
+           <string>View Profile...</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="loginButton">
+          <property name="text">
+           <string>Login...</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="gameInfoBox">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>75</height>
+      </size>
+     </property>
+     <property name="title">
+      <string>Game Info</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_3">
+      <item row="0" column="0">
+       <widget class="QLabel" name="gameInfo">
+        <property name="alignment">
+         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="rcheevosDisclaimer">
+     <property name="text">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;PCSX2 uses RetroAchievements as an achievement database and for tracking progress. To use achievements, please sign up for an account at &lt;a href=&quot;https://retroachievements.org/&quot;&gt;retroachievements.org&lt;/a&gt;.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To view the achievement list in-game, press the hotkey for &lt;span style=&quot; font-weight:600;&quot;&gt;Open Pause Menu&lt;/span&gt; and select &lt;span style=&quot; font-weight:600;&quot;&gt;Achievements&lt;/span&gt; from the menu.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="textFormat">
+      <enum>Qt::RichText</enum>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+     <property name="margin">
+      <number>8</number>
+     </property>
+     <property name="openExternalLinks">
       <bool>true</bool>
      </property>
-     <widget class="QWidget" name="scrollAreaAchievements">
-      <property name="geometry">
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>661</width>
-        <height>700</height>
-       </rect>
-      </property>
-      <layout class="QVBoxLayout" name="verticalLayout_2">
-       <item>
-        <widget class="QGroupBox" name="settingsBox">
-         <property name="title">
-          <string>Settings</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_5">
-          <item row="2" column="0">
-           <widget class="QCheckBox" name="unofficialAchievements">
-            <property name="text">
-             <string>Test Unofficial Achievements</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QCheckBox" name="hardcoreMode">
-            <property name="text">
-             <string>Enable Hardcore Mode</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="0">
-           <widget class="QCheckBox" name="enable">
-            <property name="text">
-             <string>Enable Achievements</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QCheckBox" name="spectatorMode">
-            <property name="text">
-             <string>Enable Spectator Mode</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QCheckBox" name="encoreMode">
-            <property name="text">
-             <string>Enable Encore Mode</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="notificationBox">
-         <property name="title">
-          <string>Notifications</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_2" columnstretch="1,0">
-          <item row="0" column="1">
-           <layout class="QHBoxLayout" name="achievementNotificationsDurationSliderContainer" stretch="1,0">
-            <item>
-             <widget class="QSlider" name="achievementNotificationsDuration">
-              <property name="minimum">
-               <number>3</number>
-              </property>
-              <property name="maximum">
-               <number>30</number>
-              </property>
-              <property name="pageStep">
-               <number>1</number>
-              </property>
-              <property name="value">
-               <number>5</number>
-              </property>
-              <property name="orientation">
-               <enum>Qt::Orientation::Horizontal</enum>
-              </property>
-              <property name="invertedAppearance">
-               <bool>false</bool>
-              </property>
-              <property name="tickPosition">
-               <enum>QSlider::TickPosition::TicksBelow</enum>
-              </property>
-              <property name="tickInterval">
-               <number>1</number>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLabel" name="achievementNotificationsDurationLabel">
-              <property name="text">
-               <string>5 seconds</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item row="0" column="0">
-           <widget class="QCheckBox" name="achievementNotifications">
-            <property name="text">
-             <string>Show Achievement Notifications</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <layout class="QHBoxLayout" name="leaderboardNotificationsDurationSliderContainer" stretch="1,0">
-            <item>
-             <widget class="QSlider" name="leaderboardNotificationsDuration">
-              <property name="minimum">
-               <number>3</number>
-              </property>
-              <property name="maximum">
-               <number>30</number>
-              </property>
-              <property name="pageStep">
-               <number>1</number>
-              </property>
-              <property name="value">
-               <number>5</number>
-              </property>
-              <property name="orientation">
-               <enum>Qt::Orientation::Horizontal</enum>
-              </property>
-              <property name="invertedAppearance">
-               <bool>false</bool>
-              </property>
-              <property name="tickPosition">
-               <enum>QSlider::TickPosition::TicksBelow</enum>
-              </property>
-              <property name="tickInterval">
-               <number>1</number>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLabel" name="leaderboardNotificationsDurationLabel">
-              <property name="text">
-               <string>5 seconds</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item row="1" column="0">
-           <widget class="QCheckBox" name="leaderboardNotifications">
-            <property name="text">
-             <string>Show Leaderboard Notifications</string>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="0">
-           <widget class="QCheckBox" name="soundEffects">
-            <property name="text">
-             <string>Enable Sound Effects</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="overlaySettingsBox">
-         <property name="title">
-          <string>Overlay Settings</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_overlay">
-          <item row="1" column="1">
-           <widget class="QComboBox" name="overlayPosition">
-            <item>
-             <property name="text">
-              <string>Top Left</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Top Center</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Top Right</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Center Left</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Center</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Center Right</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Bottom Left</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Bottom Center</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Bottom Right (Default)</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="notificationPositionLabel">
-            <property name="text">
-             <string>Notification Position:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1">
-           <widget class="QComboBox" name="notificationPosition">
-            <item>
-             <property name="text">
-              <string>None</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Top Left (Default)</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Top Center</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Top Right</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Center Left</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Center</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Center Right</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Bottom Left</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Bottom Center</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Bottom Right</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="overlayPositionLabel">
-            <property name="text">
-             <string>Overlay Position:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="0">
-           <widget class="QCheckBox" name="overlays">
-            <property name="text">
-             <string>Enable In-Game Overlays</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="soundEffectsBox">
-         <property name="title">
-          <string>Sound Effects</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_6">
-          <item row="5" column="0">
-           <widget class="QLineEdit" name="lbSoundPath"/>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLineEdit" name="notificationSoundPath"/>
-          </item>
-          <item row="3" column="1">
-           <widget class="QPushButton" name="unlockSoundBrowse">
-            <property name="text">
-             <string>Browse...</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="3">
-           <widget class="QPushButton" name="notificationSoundReset">
-            <property name="text">
-             <string>Reset</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0">
-           <widget class="QCheckBox" name="unlockSound">
-            <property name="text">
-             <string>Achievement Unlock Sound</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QPushButton" name="notificationSoundBrowse">
-            <property name="text">
-             <string>Browse...</string>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="0">
-           <widget class="QLineEdit" name="unlockSoundPath"/>
-          </item>
-          <item row="5" column="1">
-           <widget class="QPushButton" name="lbSoundBrowse">
-            <property name="text">
-             <string>Browse...</string>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="2">
-           <widget class="QPushButton" name="unlockSoundOpen">
-            <property name="text">
-             <string>Preview</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="2">
-           <widget class="QPushButton" name="notificationSoundOpen">
-            <property name="text">
-             <string>Preview</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="0">
-           <widget class="QCheckBox" name="notificationSound">
-            <property name="text">
-             <string>Notification Sound</string>
-            </property>
-           </widget>
-          </item>
-          <item row="5" column="2">
-           <widget class="QPushButton" name="lbSoundOpen">
-            <property name="text">
-             <string>Preview</string>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="3">
-           <widget class="QPushButton" name="unlockSoundReset">
-            <property name="text">
-             <string>Reset</string>
-            </property>
-           </widget>
-          </item>
-          <item row="5" column="3">
-           <widget class="QPushButton" name="lbSoundReset">
-            <property name="text">
-             <string>Reset</string>
-            </property>
-           </widget>
-          </item>
-          <item row="4" column="0">
-           <widget class="QCheckBox" name="lbSound">
-            <property name="text">
-             <string>Leaderboard Submit Sound</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="loginBox">
-         <property name="title">
-          <string>Account</string>
-         </property>
-         <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,0">
-          <item>
-           <widget class="QLabel" name="loginStatus">
-            <property name="text">
-             <string>Username:
-Login token generated at:</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <layout class="QHBoxLayout" name="achievementButtons">
-            <item>
-             <widget class="QPushButton" name="viewProfile">
-              <property name="text">
-               <string>View Profile...</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QPushButton" name="loginButton">
-              <property name="text">
-               <string>Login...</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="gameInfoBox">
-         <property name="minimumSize">
-          <size>
-           <width>0</width>
-           <height>75</height>
-          </size>
-         </property>
-         <property name="title">
-          <string>Game Info</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_3">
-          <item row="0" column="0">
-           <widget class="QLabel" name="gameInfo">
-            <property name="alignment">
-             <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLabel" name="rcheevosDisclaimer">
-         <property name="text">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;PCSX2 uses RetroAchievements as an achievement database and for tracking progress. To use achievements, please sign up for an account at &lt;a href=&quot;https://retroachievements.org/&quot;&gt;retroachievements.org&lt;/a&gt;.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To view the achievement list in-game, press the hotkey for &lt;span style=&quot; font-weight:600;&quot;&gt;Open Pause Menu&lt;/span&gt; and select &lt;span style=&quot; font-weight:600;&quot;&gt;Achievements&lt;/span&gt; from the menu.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-         </property>
-         <property name="textFormat">
-          <enum>Qt::TextFormat::RichText</enum>
-         </property>
-         <property name="wordWrap">
-          <bool>true</bool>
-         </property>
-         <property name="margin">
-          <number>8</number>
-         </property>
-         <property name="openExternalLinks">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
     </widget>
    </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>0</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <resources>

pcsx2-qt/Settings/AdvancedSettingsWidget.cpp

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: GPL-3.0+
 
 #include <QtWidgets/QMessageBox>
-#include <algorithm>
 
 #include "AdvancedSettingsWidget.h"
 #include "QtHost.h"
@@ -10,13 +9,12 @@
 #include "SettingWidgetBinder.h"
 #include "SettingsWindow.h"
 
-AdvancedSettingsWidget::AdvancedSettingsWidget(SettingsWindow* dialog, QWidget* parent)
-	: QWidget(parent)
-	, m_dialog(dialog)
+AdvancedSettingsWidget::AdvancedSettingsWidget(SettingsWindow* settings_dialog, QWidget* parent)
+	: SettingsWidget(settings_dialog, parent)
 {
-	SettingsInterface* sif = dialog->getSettingsInterface();
+	SettingsInterface* sif = dialog()->getSettingsInterface();
 
-	m_ui.setupUi(this);
+	setupTab(m_ui);
 
 	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.eeRecompiler, "EmuCore/CPU/Recompiler", "EnableEE", true);
 	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.eeCache, "EmuCore/CPU/Recompiler", "EnableEECache", false);
@@ -35,7 +33,7 @@ AdvancedSettingsWidget::AdvancedSettingsWidget(SettingsWindow* dialog, QWidget*
 	SettingWidgetBinder::BindWidgetToIntSetting(sif, m_ui.eeDivRoundingMode, "EmuCore/CPU", "FPUDiv.Roundmode", static_cast<int>(FPRoundMode::Nearest));
 	SettingWidgetBinder::BindWidgetToIntSetting(sif, m_ui.vu0RoundingMode, "EmuCore/CPU", "VU0.Roundmode", static_cast<int>(FPRoundMode::ChopZero));
 	SettingWidgetBinder::BindWidgetToIntSetting(sif, m_ui.vu1RoundingMode, "EmuCore/CPU", "VU1.Roundmode", static_cast<int>(FPRoundMode::ChopZero));
-	if (m_dialog->isPerGameSettings())
+	if (dialog()->isPerGameSettings())
 	{
 		m_ui.eeClampMode->insertItem(0, tr("Use Global Setting [%1]").arg(m_ui.eeClampMode->itemText(getGlobalClampingModeIndex(-1))));
 		m_ui.vu0ClampMode->insertItem(0, tr("Use Global Setting [%1]").arg(m_ui.vu0ClampMode->itemText(getGlobalClampingModeIndex(0))));
@@ -53,8 +51,8 @@ AdvancedSettingsWidget::AdvancedSettingsWidget(SettingsWindow* dialog, QWidget*
 	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.gameFixes, "EmuCore", "EnableGameFixes", true);
 	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.patches, "EmuCore", "EnablePatches", true);
 
-	dialog->registerWidgetHelp(m_ui.savestateSelector, tr("Use Save State Selector"), tr("Checked"), 
-			tr("Show a save state selector UI when switching slots instead of showing a notification bubble."));
+	dialog()->registerWidgetHelp(m_ui.savestateSelector, tr("Use Save State Selector"), tr("Checked"),
+		tr("Show a save state selector UI when switching slots instead of showing a notification bubble."));
 
 	SettingWidgetBinder::BindWidgetToIntSetting(
 		sif, m_ui.savestateCompressionMethod, "EmuCore", "SavestateCompressionType", static_cast<int>(SavestateCompressionMethod::Zstandard));
@@ -72,82 +70,86 @@ AdvancedSettingsWidget::AdvancedSettingsWidget(SettingsWindow* dialog, QWidget*
 	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.pineEnable, "EmuCore", "EnablePINE", false);
 	SettingWidgetBinder::BindWidgetToIntSetting(sif, m_ui.pineSlot, "EmuCore", "PINESlot", 28011);
 
-	dialog->registerWidgetHelp(m_ui.eeRoundingMode, tr("Rounding Mode"), tr("Chop/Zero (Default)"), tr("Changes how PCSX2 handles rounding while emulating the Emotion Engine's Floating Point Unit (EE FPU). "
-	"Because the various FPUs in the PS2 are non-compliant with international standards, some games may need different modes to do math correctly. The default value handles the vast majority of games; <b>modifying this setting when a game is not having a visible problem can cause instability.</b>"));
-	dialog->registerWidgetHelp(m_ui.eeDivRoundingMode, tr("Division Rounding Mode"), tr("Nearest (Default)"), tr("Determines how the results of floating-point division are rounded. Some games need specific settings; <b>modifying this setting when a game is not having a visible problem can cause instability.</b>"));
+	dialog()->registerWidgetHelp(m_ui.eeRoundingMode, tr("Rounding Mode"), tr("Chop/Zero (Default)"), tr("Changes how PCSX2 handles rounding while emulating the Emotion Engine's Floating Point Unit (EE FPU). "
+																										 "Because the various FPUs in the PS2 are non-compliant with international standards, some games may need different modes to do math correctly. The default value handles the vast majority of games; <b>modifying this setting when a game is not having a visible problem can cause instability.</b>"));
+	dialog()->registerWidgetHelp(m_ui.eeDivRoundingMode, tr("Division Rounding Mode"), tr("Nearest (Default)"), tr("Determines how the results of floating-point division are rounded. Some games need specific settings; <b>modifying this setting when a game is not having a visible problem can cause instability.</b>"));
 
-	dialog->registerWidgetHelp(m_ui.eeClampMode, tr("Clamping Mode"), tr("Normal (Default)"), tr("Changes how PCSX2 handles keeping floats in a standard x86 range. "
-	"The default value handles the vast majority of games; <b>modifying this setting when a game is not having a visible problem can cause instability.</b>"));
+	dialog()->registerWidgetHelp(m_ui.eeClampMode, tr("Clamping Mode"), tr("Normal (Default)"),
+		tr("Changes how PCSX2 handles keeping floats in a standard x86 range. "
+		   "The default value handles the vast majority of games; <b>modifying this setting when a game is not having a visible problem can cause instability.</b>"));
 
-	dialog->registerWidgetHelp(m_ui.eeRecompiler, tr("Enable Recompiler"), tr("Checked"),
+	dialog()->registerWidgetHelp(m_ui.eeRecompiler, tr("Enable Recompiler"), tr("Checked"),
 		tr("Performs just-in-time binary translation of 64-bit MIPS-IV machine code to x86."));
 
 	//: Wait loop: When the game makes the CPU do nothing (loop/spin) while it waits for something to happen (usually an interrupt).
-	dialog->registerWidgetHelp(m_ui.eeWaitLoopDetection, tr("Wait Loop Detection"), tr("Checked"),
+	dialog()->registerWidgetHelp(m_ui.eeWaitLoopDetection, tr("Wait Loop Detection"), tr("Checked"),
 		tr("Moderate speedup for some games, with no known side effects."));
 
-	dialog->registerWidgetHelp(m_ui.eeCache, tr("Enable Cache (Slow)"), tr("Unchecked"), tr("Interpreter only, provided for diagnostic."));
+	dialog()->registerWidgetHelp(m_ui.eeCache, tr("Enable Cache (Slow)"), tr("Unchecked"), tr("Interpreter only, provided for diagnostic."));
 
 	//: INTC = Name of a PS2 register, leave as-is. "spin" = to make a cpu (or gpu) actively do nothing while you wait for something.  Like spinning in a circle, you're moving but not actually going anywhere.
-	dialog->registerWidgetHelp(m_ui.eeINTCSpinDetection, tr("INTC Spin Detection"), tr("Checked"),
+	dialog()->registerWidgetHelp(m_ui.eeINTCSpinDetection, tr("INTC Spin Detection"), tr("Checked"),
 		tr("Huge speedup for some games, with almost no compatibility side effects."));
 
-	dialog->registerWidgetHelp(m_ui.eeFastmem, tr("Enable Fast Memory Access"), tr("Checked"),
+	dialog()->registerWidgetHelp(m_ui.eeFastmem, tr("Enable Fast Memory Access"), tr("Checked"),
 		//: "Backpatching" = To edit previously generated code to change what it does (in this case, we generate direct memory accesses, then backpatch them to jump to a fancier handler function when we realize they need the fancier handler function)
 		tr("Uses backpatching to avoid register flushing on every memory access."));
 
-	dialog->registerWidgetHelp(m_ui.pauseOnTLBMiss, tr("Pause On TLB Miss"), tr("Unchecked"),
+	dialog()->registerWidgetHelp(m_ui.pauseOnTLBMiss, tr("Pause On TLB Miss"), tr("Unchecked"),
 		tr("Pauses the virtual machine when a TLB miss occurs, instead of ignoring it and continuing. Note that the VM will pause after the "
 		   "end of the block, not on the instruction which caused the exception. Refer to the console to see the address where the invalid "
 		   "access occurred."));
 
-	dialog->registerWidgetHelp(m_ui.extraMemory, tr("Enable 128MB RAM (Dev Console)"), tr("Unchecked"),
+	dialog()->registerWidgetHelp(m_ui.extraMemory, tr("Enable 128MB RAM (Dev Console)"), tr("Unchecked"),
 		tr("Exposes an additional 96MB of memory to the virtual machine."));
 
-	dialog->registerWidgetHelp(m_ui.vu0RoundingMode, tr("VU0 Rounding Mode"), tr("Chop/Zero (Default)"), tr("Changes how PCSX2 handles rounding while emulating the Emotion Engine's Vector Unit 0 (EE VU0). "
-	"The default value handles the vast majority of games; <b>modifying this setting when a game is not having a visible problem will cause stability issues and/or crashes.</b>"));
+	dialog()->registerWidgetHelp(m_ui.vu0RoundingMode, tr("VU0 Rounding Mode"), tr("Chop/Zero (Default)"), tr("Changes how PCSX2 handles rounding while emulating the Emotion Engine's Vector Unit 0 (EE VU0). "
+																											  "The default value handles the vast majority of games; <b>modifying this setting when a game is not having a visible problem will cause stability issues and/or crashes.</b>"));
 
-	dialog->registerWidgetHelp(m_ui.vu1RoundingMode, tr("VU1 Rounding Mode"), tr("Chop/Zero (Default)"), tr("Changes how PCSX2 handles rounding while emulating the Emotion Engine's Vector Unit 1 (EE VU1). "
-	"The default value handles the vast majority of games; <b>modifying this setting when a game is not having a visible problem will cause stability issues and/or crashes.</b>"));
+	dialog()->registerWidgetHelp(m_ui.vu1RoundingMode, tr("VU1 Rounding Mode"), tr("Chop/Zero (Default)"), tr("Changes how PCSX2 handles rounding while emulating the Emotion Engine's Vector Unit 1 (EE VU1). "
+																											  "The default value handles the vast majority of games; <b>modifying this setting when a game is not having a visible problem will cause stability issues and/or crashes.</b>"));
 
-	dialog->registerWidgetHelp(m_ui.vu0ClampMode, tr("VU0 Clamping Mode"), tr("Normal (Default)"), tr("Changes how PCSX2 handles keeping floats in a standard x86 range in the Emotion Engine's Vector Unit 0 (EE VU0). "
-	"The default value handles the vast majority of games; <b>modifying this setting when a game is not having a visible problem can cause instability.</b>"));
-	dialog->registerWidgetHelp(m_ui.vu1ClampMode, tr("VU1 Clamping Mode"), tr("Normal (Default)"), tr("Changes how PCSX2 handles keeping floats in a standard x86 range in the Emotion Engine's Vector Unit 1 (EE VU1). "
-	"The default value handles the vast majority of games; <b>modifying this setting when a game is not having a visible problem can cause instability.</b>"));
+	dialog()->registerWidgetHelp(m_ui.vu0ClampMode, tr("VU0 Clamping Mode"), tr("Normal (Default)"),
+		tr("Changes how PCSX2 handles keeping floats in a standard x86 range in the Emotion Engine's Vector Unit 0 (EE VU0). "
+		   "The default value handles the vast majority of games; <b>modifying this setting when a game is not having a visible problem can cause instability.</b>"));
+	dialog()->registerWidgetHelp(m_ui.vu1ClampMode, tr("VU1 Clamping Mode"), tr("Normal (Default)"),
+		tr("Changes how PCSX2 handles keeping floats in a standard x86 range in the Emotion Engine's Vector Unit 1 (EE VU1). "
+		   "The default value handles the vast majority of games; <b>modifying this setting when a game is not having a visible problem can cause instability.</b>"));
 
-	dialog->registerWidgetHelp(m_ui.instantVU1, tr("Enable Instant VU1"), tr("Checked"), tr("Runs VU1 instantly. Provides a modest speed improvement in most games. "
+	dialog()->registerWidgetHelp(m_ui.instantVU1, tr("Enable Instant VU1"), tr("Checked"),
+		tr("Runs VU1 instantly. Provides a modest speed improvement in most games. "
 		   "Safe for most games, but a few games may exhibit graphical errors."));
 
 	//: VU0 = Vector Unit 0. One of the PS2's processors.
-	dialog->registerWidgetHelp(m_ui.vu0Recompiler, tr("Enable VU0 Recompiler (Micro Mode)"), tr("Checked"), tr("Enables VU0 Recompiler."));
+	dialog()->registerWidgetHelp(m_ui.vu0Recompiler, tr("Enable VU0 Recompiler (Micro Mode)"), tr("Checked"), tr("Enables VU0 Recompiler."));
 
 	//: VU1 = Vector Unit 1. One of the PS2's processors.
-	dialog->registerWidgetHelp(m_ui.vu1Recompiler, tr("Enable VU1 Recompiler"), tr("Checked"), tr("Enables VU1 Recompiler."));
+	dialog()->registerWidgetHelp(m_ui.vu1Recompiler, tr("Enable VU1 Recompiler"), tr("Checked"), tr("Enables VU1 Recompiler."));
 
-	dialog->registerWidgetHelp(
+	dialog()->registerWidgetHelp(
 		//: mVU = PCSX2's recompiler for VU (Vector Unit) code (full name: microVU)
 		m_ui.vuFlagHack, tr("mVU Flag Hack"), tr("Checked"), tr("Good speedup and high compatibility, may cause graphical errors."));
 
-	dialog->registerWidgetHelp(m_ui.iopRecompiler, tr("Enable Recompiler"), tr("Checked"),
+	dialog()->registerWidgetHelp(m_ui.iopRecompiler, tr("Enable Recompiler"), tr("Checked"),
 		tr("Performs just-in-time binary translation of 32-bit MIPS-I machine code to x86."));
 
-	dialog->registerWidgetHelp(m_ui.gameFixes, tr("Enable Game Fixes"), tr("Checked"),
+	dialog()->registerWidgetHelp(m_ui.gameFixes, tr("Enable Game Fixes"), tr("Checked"),
 		tr("Automatically loads and applies fixes to known problematic games on game start."));
 
-	dialog->registerWidgetHelp(m_ui.patches, tr("Enable Compatibility Patches"), tr("Checked"),
+	dialog()->registerWidgetHelp(m_ui.patches, tr("Enable Compatibility Patches"), tr("Checked"),
 		tr("Automatically loads and applies compatibility patches to known problematic games."));
 
-	dialog->registerWidgetHelp(m_ui.savestateCompressionMethod, tr("Savestate Compression Method"), tr("Zstandard"),
+	dialog()->registerWidgetHelp(m_ui.savestateCompressionMethod, tr("Savestate Compression Method"), tr("Zstandard"),
 		tr("Determines the algorithm to be used when compressing savestates."));
 
-	dialog->registerWidgetHelp(m_ui.savestateCompressionLevel, tr("Savestate Compression Level"), tr("Medium"),
+	dialog()->registerWidgetHelp(m_ui.savestateCompressionLevel, tr("Savestate Compression Level"), tr("Medium"),
 		tr("Determines the level to be used when compressing savestates."));
 
-	dialog->registerWidgetHelp(m_ui.saveStateOnShutdown, tr("Save State On Shutdown"), tr("Unchecked"),
+	dialog()->registerWidgetHelp(m_ui.saveStateOnShutdown, tr("Save State On Shutdown"), tr("Unchecked"),
 		tr("Automatically saves the emulator state when powering down or exiting. You can then "
 		   "resume directly from where you left off next time."));
 
-	dialog->registerWidgetHelp(m_ui.backupSaveStates, tr("Create Save State Backups"), tr("Checked"),
+	dialog()->registerWidgetHelp(m_ui.backupSaveStates, tr("Create Save State Backups"), tr("Checked"),
 		//: Do not translate the ".backup" extension.
 		tr("Creates a backup copy of a save state if it already exists when the save is created. The backup copy has a .backup suffix."));
 }
@@ -174,15 +176,15 @@ int AdvancedSettingsWidget::getGlobalClampingModeIndex(int vunum) const
 int AdvancedSettingsWidget::getClampingModeIndex(int vunum) const
 {
 	// This is so messy... maybe we should just make the mode an int in the settings too...
-	const bool base = m_dialog->isPerGameSettings() ? 1 : 0;
-	std::optional<bool> default_false = m_dialog->isPerGameSettings() ? std::nullopt : std::optional<bool>(false);
-	std::optional<bool> default_true = m_dialog->isPerGameSettings() ? std::nullopt : std::optional<bool>(true);
+	const bool base = dialog()->isPerGameSettings() ? 1 : 0;
+	std::optional<bool> default_false = dialog()->isPerGameSettings() ? std::nullopt : std::optional<bool>(false);
+	std::optional<bool> default_true = dialog()->isPerGameSettings() ? std::nullopt : std::optional<bool>(true);
 
-	std::optional<bool> third = m_dialog->getBoolValue(
+	std::optional<bool> third = dialog()->getBoolValue(
 		"EmuCore/CPU/Recompiler", (vunum >= 0 ? ((vunum == 0) ? "vu0SignOverflow" : "vu1SignOverflow") : "fpuFullMode"), default_false);
-	std::optional<bool> second = m_dialog->getBoolValue("EmuCore/CPU/Recompiler",
+	std::optional<bool> second = dialog()->getBoolValue("EmuCore/CPU/Recompiler",
 		(vunum >= 0 ? ((vunum == 0) ? "vu0ExtraOverflow" : "vu1ExtraOverflow") : "fpuExtraOverflow"), default_false);
-	std::optional<bool> first = m_dialog->getBoolValue(
+	std::optional<bool> first = dialog()->getBoolValue(
 		"EmuCore/CPU/Recompiler", (vunum >= 0 ? ((vunum == 0) ? "vu0Overflow" : "vu1Overflow") : "fpuOverflow"), default_true);
 
 	if (third.has_value() && third.value())
@@ -201,25 +203,25 @@ void AdvancedSettingsWidget::setClampingMode(int vunum, int index)
 {
 	std::optional<bool> first, second, third;
 
-	if (!m_dialog->isPerGameSettings() || index > 0)
+	if (!dialog()->isPerGameSettings() || index > 0)
 	{
-		const bool base = m_dialog->isPerGameSettings() ? 1 : 0;
+		const bool base = dialog()->isPerGameSettings() ? 1 : 0;
 		third = (index >= (base + 3));
 		second = (index >= (base + 2));
 		first = (index >= (base + 1));
 	}
 
-	m_dialog->setBoolSettingValue(
+	dialog()->setBoolSettingValue(
 		"EmuCore/CPU/Recompiler", (vunum >= 0 ? ((vunum == 0) ? "vu0SignOverflow" : "vu1SignOverflow") : "fpuFullMode"), third);
-	m_dialog->setBoolSettingValue(
+	dialog()->setBoolSettingValue(
 		"EmuCore/CPU/Recompiler", (vunum >= 0 ? ((vunum == 0) ? "vu0ExtraOverflow" : "vu1ExtraOverflow") : "fpuExtraOverflow"), second);
-	m_dialog->setBoolSettingValue(
+	dialog()->setBoolSettingValue(
 		"EmuCore/CPU/Recompiler", (vunum >= 0 ? ((vunum == 0) ? "vu0Overflow" : "vu1Overflow") : "fpuOverflow"), first);
 }
 
 void AdvancedSettingsWidget::onSavestateCompressionTypeChanged()
 {
-	const bool uncompressed = (m_dialog->getEffectiveIntValue("EmuCore", "SavestateCompressionType", static_cast<int>(SavestateCompressionMethod::Zstandard)) ==
+	const bool uncompressed = (dialog()->getEffectiveIntValue("EmuCore", "SavestateCompressionType", static_cast<int>(SavestateCompressionMethod::Zstandard)) ==
 							   static_cast<int>(SavestateCompressionMethod::Uncompressed));
 	m_ui.savestateCompressionLevel->setDisabled(uncompressed);
-}
+}

pcsx2-qt/Settings/AdvancedSettingsWidget.h

@@ -3,13 +3,11 @@
 
 #pragma once
 
-#include <QtWidgets/QWidget>
-
 #include "ui_AdvancedSettingsWidget.h"
 
-class SettingsWindow;
+#include "SettingsWidget.h"
 
-class AdvancedSettingsWidget : public QWidget
+class AdvancedSettingsWidget : public SettingsWidget
 {
 	Q_OBJECT
 

pcsx2-qt/Settings/AudioSettingsWidget.cpp

@@ -18,13 +18,12 @@
 #include <algorithm>
 #include <bit>
 
-AudioSettingsWidget::AudioSettingsWidget(SettingsWindow* dialog, QWidget* parent)
-	: QWidget(parent)
-	, m_dialog(dialog)
+AudioSettingsWidget::AudioSettingsWidget(SettingsWindow* settings_dialog, QWidget* parent)
+	: SettingsWidget(settings_dialog, parent)
 {
-	SettingsInterface* sif = dialog->getSettingsInterface();
+	SettingsInterface* sif = dialog()->getSettingsInterface();
 
-	m_ui.setupUi(this);
+	setupTab(m_ui);
 
 	for (u32 i = 0; i < static_cast<u32>(AudioBackend::Count); i++)
 		m_ui.audioBackend->addItem(QString::fromUtf8(AudioStream::GetBackendDisplayName(static_cast<AudioBackend>(i))));
@@ -72,11 +71,11 @@ AudioSettingsWidget::AudioSettingsWidget(SettingsWindow* dialog, QWidget* parent
 	updateLatencyLabel();
 
 	// for per-game, just use the normal path, since it needs to re-read/apply
-	if (!dialog->isPerGameSettings())
+	if (!dialog()->isPerGameSettings())
 	{
-		m_ui.volume->setValue(m_dialog->getEffectiveIntValue("SPU2/Output", "OutputVolume", 100));
-		m_ui.fastForwardVolume->setValue(m_dialog->getEffectiveIntValue("SPU2/Output", "FastForwardVolume", 100));
-		m_ui.muted->setChecked(m_dialog->getEffectiveBoolValue("SPU2/Output", "OutputMuted", false));
+		m_ui.volume->setValue(dialog()->getEffectiveIntValue("SPU2/Output", "OutputVolume", 100));
+		m_ui.fastForwardVolume->setValue(dialog()->getEffectiveIntValue("SPU2/Output", "FastForwardVolume", 100));
+		m_ui.muted->setChecked(dialog()->getEffectiveBoolValue("SPU2/Output", "OutputMuted", false));
 		connect(m_ui.volume, &QSlider::valueChanged, this, &AudioSettingsWidget::onOutputVolumeChanged);
 		connect(m_ui.fastForwardVolume, &QSlider::valueChanged, this, &AudioSettingsWidget::onFastForwardVolumeChanged);
 		connect(m_ui.muted, &QCheckBox::checkStateChanged, this, &AudioSettingsWidget::onOutputMutedChanged);
@@ -91,39 +90,39 @@ AudioSettingsWidget::AudioSettingsWidget(SettingsWindow* dialog, QWidget* parent
 	connect(m_ui.resetVolume, &QToolButton::clicked, this, [this]() { resetVolume(false); });
 	connect(m_ui.resetFastForwardVolume, &QToolButton::clicked, this, [this]() { resetVolume(true); });
 
-	dialog->registerWidgetHelp(
+	dialog()->registerWidgetHelp(
 		m_ui.audioBackend, tr("Audio Backend"), QStringLiteral("Cubeb"),
 		tr("The audio backend determines how frames produced by the emulator are submitted to the host. Cubeb provides the "
 		   "lowest latency, if you encounter issues, try the SDL backend. The null backend disables all host audio "
 		   "output."));
-	dialog->registerWidgetHelp(
+	dialog()->registerWidgetHelp(
 		m_ui.bufferMS, tr("Buffer Size"), tr("%1 ms").arg(AudioStreamParameters::DEFAULT_BUFFER_MS),
 		tr("Determines the buffer size which the time stretcher will try to keep filled. It effectively selects the "
 		   "average latency, as audio will be stretched/shrunk to keep the buffer size within check."));
-	dialog->registerWidgetHelp(
+	dialog()->registerWidgetHelp(
 		m_ui.outputLatencyMS, tr("Output Latency"), tr("%1 ms").arg(AudioStreamParameters::DEFAULT_OUTPUT_LATENCY_MS),
 		tr("Determines the latency from the buffer to the host audio output. This can be set lower than the target latency "
 		   "to reduce audio delay."));
-	dialog->registerWidgetHelp(m_ui.volume, tr("Output Volume"), "100%",
+	dialog()->registerWidgetHelp(m_ui.volume, tr("Output Volume"), "100%",
 		tr("Controls the volume of the audio played on the host."));
-	dialog->registerWidgetHelp(m_ui.fastForwardVolume, tr("Fast Forward Volume"), "100%",
+	dialog()->registerWidgetHelp(m_ui.fastForwardVolume, tr("Fast Forward Volume"), "100%",
 		tr("Controls the volume of the audio played on the host when fast forwarding."));
-	dialog->registerWidgetHelp(m_ui.muted, tr("Mute All Sound"), tr("Unchecked"),
+	dialog()->registerWidgetHelp(m_ui.muted, tr("Mute All Sound"), tr("Unchecked"),
 		tr("Prevents the emulator from producing any audible sound."));
-	dialog->registerWidgetHelp(m_ui.expansionMode, tr("Expansion Mode"), tr("Disabled (Stereo)"),
+	dialog()->registerWidgetHelp(m_ui.expansionMode, tr("Expansion Mode"), tr("Disabled (Stereo)"),
 		tr("Determines how audio is expanded from stereo to surround for supported games. This "
 		   "includes games that support Dolby Pro Logic/Pro Logic II."));
-	dialog->registerWidgetHelp(m_ui.expansionSettings, tr("Expansion Settings"), tr("N/A"),
+	dialog()->registerWidgetHelp(m_ui.expansionSettings, tr("Expansion Settings"), tr("N/A"),
 		tr("These settings fine-tune the behavior of the FreeSurround-based channel expander."));
-	dialog->registerWidgetHelp(m_ui.syncMode, tr("Synchronization"), tr("TimeStretch (Recommended)"),
+	dialog()->registerWidgetHelp(m_ui.syncMode, tr("Synchronization"), tr("TimeStretch (Recommended)"),
 		tr("When running outside of 100% speed, adjusts the tempo on audio instead of dropping frames. Produces much nicer fast-forward/slowdown audio."));
-	dialog->registerWidgetHelp(m_ui.stretchSettings, tr("Stretch Settings"), tr("N/A"),
+	dialog()->registerWidgetHelp(m_ui.stretchSettings, tr("Stretch Settings"), tr("N/A"),
 		tr("These settings fine-tune the behavior of the SoundTouch audio time stretcher when running outside of 100% speed."));
-	dialog->registerWidgetHelp(m_ui.resetVolume, tr("Reset Volume"), tr("N/A"),
-		m_dialog->isPerGameSettings() ? tr("Resets output volume back to the global/inherited setting.") :
+	dialog()->registerWidgetHelp(m_ui.resetVolume, tr("Reset Volume"), tr("N/A"),
+		dialog()->isPerGameSettings() ? tr("Resets output volume back to the global/inherited setting.") :
 										tr("Resets output volume back to the default."));
-	dialog->registerWidgetHelp(m_ui.resetFastForwardVolume, tr("Reset Fast Forward Volume"), tr("N/A"),
-		m_dialog->isPerGameSettings() ? tr("Resets fast forward volume back to the global/inherited setting.") :
+	dialog()->registerWidgetHelp(m_ui.resetFastForwardVolume, tr("Reset Fast Forward Volume"), tr("N/A"),
+		dialog()->isPerGameSettings() ? tr("Resets fast forward volume back to the global/inherited setting.") :
 										tr("Resets fast forward volume back to the default."));
 }
 
@@ -132,10 +131,10 @@ AudioSettingsWidget::~AudioSettingsWidget() = default;
 AudioExpansionMode AudioSettingsWidget::getEffectiveExpansionMode() const
 {
 	return AudioStream::ParseExpansionMode(
-		m_dialog->getEffectiveStringValue("SPU2/Output", "ExpansionMode",
+		dialog()->getEffectiveStringValue("SPU2/Output", "ExpansionMode",
 					AudioStream::GetExpansionModeName(AudioStreamParameters::DEFAULT_EXPANSION_MODE))
 			.c_str())
-		.value_or(AudioStreamParameters::DEFAULT_EXPANSION_MODE);
+	    .value_or(AudioStreamParameters::DEFAULT_EXPANSION_MODE);
 }
 
 u32 AudioSettingsWidget::getEffectiveExpansionBlockSize() const
@@ -144,7 +143,7 @@ u32 AudioSettingsWidget::getEffectiveExpansionBlockSize() const
 	if (expansion_mode == AudioExpansionMode::Disabled)
 		return 0;
 
-	const u32 config_block_size = m_dialog->getEffectiveIntValue("SPU2/Output", "ExpandBlockSize",
+	const u32 config_block_size = dialog()->getEffectiveIntValue("SPU2/Output", "ExpandBlockSize",
 		AudioStreamParameters::DEFAULT_EXPAND_BLOCK_SIZE);
 	return std::has_single_bit(config_block_size) ? config_block_size : std::bit_ceil(config_block_size);
 }
@@ -160,9 +159,8 @@ void AudioSettingsWidget::onSyncModeChanged()
 {
 	const Pcsx2Config::SPU2Options::SPU2SyncMode sync_mode =
 		Pcsx2Config::SPU2Options::ParseSyncMode(
-			m_dialog
-				->getEffectiveStringValue("SPU2/Output", "SyncMode",
-					Pcsx2Config::SPU2Options::GetSyncModeName(Pcsx2Config::SPU2Options::DEFAULT_SYNC_MODE))
+			dialog()->getEffectiveStringValue("SPU2/Output", "SyncMode",
+						Pcsx2Config::SPU2Options::GetSyncModeName(Pcsx2Config::SPU2Options::DEFAULT_SYNC_MODE))
 				.c_str())
 			.value_or(Pcsx2Config::SPU2Options::DEFAULT_SYNC_MODE);
 	m_ui.stretchSettings->setEnabled(sync_mode == Pcsx2Config::SPU2Options::SPU2SyncMode::TimeStretch);
@@ -170,10 +168,11 @@ void AudioSettingsWidget::onSyncModeChanged()
 
 AudioBackend AudioSettingsWidget::getEffectiveBackend() const
 {
-	return AudioStream::ParseBackendName(m_dialog->getEffectiveStringValue("SPU2/Output", "Backend",
-													 AudioStream::GetBackendName(Pcsx2Config::SPU2Options::DEFAULT_BACKEND))
-											 .c_str())
-		.value_or(Pcsx2Config::SPU2Options::DEFAULT_BACKEND);
+	return AudioStream::ParseBackendName(
+		dialog()->getEffectiveStringValue("SPU2/Output", "Backend",
+					AudioStream::GetBackendName(Pcsx2Config::SPU2Options::DEFAULT_BACKEND))
+			.c_str())
+	    .value_or(Pcsx2Config::SPU2Options::DEFAULT_BACKEND);
 }
 
 void AudioSettingsWidget::updateDriverNames()
@@ -194,7 +193,7 @@ void AudioSettingsWidget::updateDriverNames()
 		for (const std::pair<std::string, std::string>& it : names)
 			m_ui.driver->addItem(QString::fromStdString(it.second), QString::fromStdString(it.first));
 
-		SettingWidgetBinder::BindWidgetToStringSetting(m_dialog->getSettingsInterface(), m_ui.driver, "SPU2/Output", "DriverName",
+		SettingWidgetBinder::BindWidgetToStringSetting(dialog()->getSettingsInterface(), m_ui.driver, "SPU2/Output", "DriverName",
 			std::move(names.front().first));
 		connect(m_ui.driver, &QComboBox::currentIndexChanged, this, &AudioSettingsWidget::updateDeviceNames);
 	}
@@ -205,8 +204,8 @@ void AudioSettingsWidget::updateDriverNames()
 void AudioSettingsWidget::updateDeviceNames()
 {
 	const AudioBackend backend = getEffectiveBackend();
-	const std::string driver_name = m_dialog->getEffectiveStringValue("SPU2/Output", "DriverName", "");
-	const std::string current_device = m_dialog->getEffectiveStringValue("SPU2/Output", "DeviceName", "");
+	const std::string driver_name = dialog()->getEffectiveStringValue("SPU2/Output", "DriverName", "");
+	const std::string current_device = dialog()->getEffectiveStringValue("SPU2/Output", "DeviceName", "");
 	const std::vector<AudioStream::DeviceInfo> devices = AudioStream::GetOutputDevices(backend, driver_name.c_str());
 
 	m_ui.outputDevice->disconnect();
@@ -239,7 +238,7 @@ void AudioSettingsWidget::updateDeviceNames()
 				QString::fromStdString(current_device));
 		}
 
-		SettingWidgetBinder::BindWidgetToStringSetting(m_dialog->getSettingsInterface(), m_ui.outputDevice, "SPU2/Output",
+		SettingWidgetBinder::BindWidgetToStringSetting(dialog()->getSettingsInterface(), m_ui.outputDevice, "SPU2/Output",
 			"DeviceName", std::move(devices.front().name));
 	}
 
@@ -249,9 +248,9 @@ void AudioSettingsWidget::updateDeviceNames()
 void AudioSettingsWidget::updateLatencyLabel()
 {
 	const u32 expand_buffer_ms = AudioStream::GetMSForBufferSize(SPU2::SAMPLE_RATE, getEffectiveExpansionBlockSize());
-	const u32 config_buffer_ms = m_dialog->getEffectiveIntValue("SPU2/Output", "BufferMS", AudioStreamParameters::DEFAULT_BUFFER_MS);
-	const u32 config_output_latency_ms = m_dialog->getEffectiveIntValue("SPU2/Output", "OutputLatencyMS", AudioStreamParameters::DEFAULT_OUTPUT_LATENCY_MS);
-	const bool minimal_output = m_dialog->getEffectiveBoolValue("SPU2/Output", "OutputLatencyMinimal", false);
+	const u32 config_buffer_ms = dialog()->getEffectiveIntValue("SPU2/Output", "BufferMS", AudioStreamParameters::DEFAULT_BUFFER_MS);
+	const u32 config_output_latency_ms = dialog()->getEffectiveIntValue("SPU2/Output", "OutputLatencyMS", AudioStreamParameters::DEFAULT_OUTPUT_LATENCY_MS);
+	const bool minimal_output = dialog()->getEffectiveBoolValue("SPU2/Output", "OutputLatencyMinimal", false);
 
 	//: Preserve the %1 variable, adapt the latter ms (and/or any possible spaces in between) to your language's ruleset.
 	m_ui.outputLatencyLabel->setText(minimal_output ? tr("N/A") : tr("%1 ms").arg(config_output_latency_ms));
@@ -299,7 +298,7 @@ void AudioSettingsWidget::updateVolumeLabel()
 
 void AudioSettingsWidget::onMinimalOutputLatencyChanged()
 {
-	const bool minimal = m_dialog->getEffectiveBoolValue("SPU2/Output", "OutputLatencyMinimal", false);
+	const bool minimal = dialog()->getEffectiveBoolValue("SPU2/Output", "OutputLatencyMinimal", false);
 	m_ui.outputLatencyMS->setEnabled(!minimal);
 	updateLatencyLabel();
 }
@@ -307,7 +306,7 @@ void AudioSettingsWidget::onMinimalOutputLatencyChanged()
 void AudioSettingsWidget::onOutputVolumeChanged(int new_value)
 {
 	// only called for base settings
-	pxAssert(!m_dialog->isPerGameSettings());
+	pxAssert(!dialog()->isPerGameSettings());
 	Host::SetBaseIntSettingValue("SPU2/Output", "OutputVolume", new_value);
 	Host::CommitBaseSettingChanges();
 	g_emu_thread->applySettings();
@@ -318,7 +317,7 @@ void AudioSettingsWidget::onOutputVolumeChanged(int new_value)
 void AudioSettingsWidget::onFastForwardVolumeChanged(int new_value)
 {
 	// only called for base settings
-	pxAssert(!m_dialog->isPerGameSettings());
+	pxAssert(!dialog()->isPerGameSettings());
 	Host::SetBaseIntSettingValue("SPU2/Output", "FastForwardVolume", new_value);
 	Host::CommitBaseSettingChanges();
 	g_emu_thread->applySettings();
@@ -329,7 +328,7 @@ void AudioSettingsWidget::onFastForwardVolumeChanged(int new_value)
 void AudioSettingsWidget::onOutputMutedChanged(int new_state)
 {
 	// only called for base settings
-	pxAssert(!m_dialog->isPerGameSettings());
+	pxAssert(!dialog()->isPerGameSettings());
 
 	const bool muted = (new_state != 0);
 	Host::SetBaseBoolSettingValue("SPU2/Output", "OutputMuted", muted);
@@ -344,7 +343,7 @@ void AudioSettingsWidget::onExpansionSettingsClicked()
 	dlgui.setupUi(&dlg);
 	QtUtils::SetScalableIcon(dlgui.icon, QIcon::fromTheme(QStringLiteral("volume-up-line")), QSize(32, 32));
 
-	SettingsInterface* sif = m_dialog->getSettingsInterface();
+	SettingsInterface* sif = dialog()->getSettingsInterface();
 	SettingWidgetBinder::BindWidgetToIntSetting(sif, dlgui.blockSize, "SPU2/Output", "ExpandBlockSize",
 		AudioStreamParameters::DEFAULT_EXPAND_BLOCK_SIZE, 0);
 	QtUtils::BindLabelToSlider(dlgui.blockSize, dlgui.blockSizeLabel);
@@ -378,42 +377,42 @@ void AudioSettingsWidget::onExpansionSettingsClicked()
 
 	connect(dlgui.buttonBox->button(QDialogButtonBox::Close), &QPushButton::clicked, &dlg, &QDialog::accept);
 	connect(dlgui.buttonBox->button(QDialogButtonBox::RestoreDefaults), &QPushButton::clicked, this, [this, &dlg]() {
-		m_dialog->setIntSettingValue("SPU2/Output", "ExpandBlockSize",
-			m_dialog->isPerGameSettings() ?
+		dialog()->setIntSettingValue("SPU2/Output", "ExpandBlockSize",
+			dialog()->isPerGameSettings() ?
 				std::nullopt :
 				std::optional<int>(AudioStreamParameters::DEFAULT_EXPAND_BLOCK_SIZE));
 
-		m_dialog->setFloatSettingValue("SPU2/Output", "ExpandCircularWrap",
-			m_dialog->isPerGameSettings() ?
+		dialog()->setFloatSettingValue("SPU2/Output", "ExpandCircularWrap",
+			dialog()->isPerGameSettings() ?
 				std::nullopt :
 				std::optional<float>(AudioStreamParameters::DEFAULT_EXPAND_CIRCULAR_WRAP));
-		m_dialog->setFloatSettingValue(
+		dialog()->setFloatSettingValue(
 			"SPU2/Output", "ExpandShift",
-			m_dialog->isPerGameSettings() ? std::nullopt : std::optional<float>(AudioStreamParameters::DEFAULT_EXPAND_SHIFT));
-		m_dialog->setFloatSettingValue(
+			dialog()->isPerGameSettings() ? std::nullopt : std::optional<float>(AudioStreamParameters::DEFAULT_EXPAND_SHIFT));
+		dialog()->setFloatSettingValue(
 			"SPU2/Output", "ExpandDepth",
-			m_dialog->isPerGameSettings() ? std::nullopt : std::optional<float>(AudioStreamParameters::DEFAULT_EXPAND_DEPTH));
-		m_dialog->setFloatSettingValue(
+			dialog()->isPerGameSettings() ? std::nullopt : std::optional<float>(AudioStreamParameters::DEFAULT_EXPAND_DEPTH));
+		dialog()->setFloatSettingValue(
 			"SPU2/Output", "ExpandFocus",
-			m_dialog->isPerGameSettings() ? std::nullopt : std::optional<float>(AudioStreamParameters::DEFAULT_EXPAND_FOCUS));
-		m_dialog->setFloatSettingValue("SPU2/Output", "ExpandCenterImage",
-			m_dialog->isPerGameSettings() ?
+			dialog()->isPerGameSettings() ? std::nullopt : std::optional<float>(AudioStreamParameters::DEFAULT_EXPAND_FOCUS));
+		dialog()->setFloatSettingValue("SPU2/Output", "ExpandCenterImage",
+			dialog()->isPerGameSettings() ?
 				std::nullopt :
 				std::optional<float>(AudioStreamParameters::DEFAULT_EXPAND_CENTER_IMAGE));
-		m_dialog->setFloatSettingValue("SPU2/Output", "ExpandFrontSeparation",
-			m_dialog->isPerGameSettings() ?
+		dialog()->setFloatSettingValue("SPU2/Output", "ExpandFrontSeparation",
+			dialog()->isPerGameSettings() ?
 				std::nullopt :
 				std::optional<float>(AudioStreamParameters::DEFAULT_EXPAND_FRONT_SEPARATION));
-		m_dialog->setFloatSettingValue("SPU2/Output", "ExpandRearSeparation",
-			m_dialog->isPerGameSettings() ?
+		dialog()->setFloatSettingValue("SPU2/Output", "ExpandRearSeparation",
+			dialog()->isPerGameSettings() ?
 				std::nullopt :
 				std::optional<float>(AudioStreamParameters::DEFAULT_EXPAND_REAR_SEPARATION));
-		m_dialog->setIntSettingValue("SPU2/Output", "ExpandLowCutoff",
-			m_dialog->isPerGameSettings() ?
+		dialog()->setIntSettingValue("SPU2/Output", "ExpandLowCutoff",
+			dialog()->isPerGameSettings() ?
 				std::nullopt :
 				std::optional<int>(AudioStreamParameters::DEFAULT_EXPAND_LOW_CUTOFF));
-		m_dialog->setIntSettingValue("SPU2/Output", "ExpandHighCutoff",
-			m_dialog->isPerGameSettings() ?
+		dialog()->setIntSettingValue("SPU2/Output", "ExpandHighCutoff",
+			dialog()->isPerGameSettings() ?
 				std::nullopt :
 				std::optional<int>(AudioStreamParameters::DEFAULT_EXPAND_HIGH_CUTOFF));
 
@@ -433,7 +432,7 @@ void AudioSettingsWidget::onStretchSettingsClicked()
 	dlgui.setupUi(&dlg);
 	QtUtils::SetScalableIcon(dlgui.icon, QIcon::fromTheme(QStringLiteral("volume-up-line")), QSize(32, 32));
 
-	SettingsInterface* sif = m_dialog->getSettingsInterface();
+	SettingsInterface* sif = dialog()->getSettingsInterface();
 	SettingWidgetBinder::BindWidgetToIntSetting(sif, dlgui.sequenceLength, "SPU2/Output", "StretchSequenceLengthMS",
 		AudioStreamParameters::DEFAULT_STRETCH_SEQUENCE_LENGTH, 0);
 	QtUtils::BindLabelToSlider(dlgui.sequenceLength, dlgui.sequenceLengthLabel);
@@ -450,24 +449,24 @@ void AudioSettingsWidget::onStretchSettingsClicked()
 
 	connect(dlgui.buttonBox->button(QDialogButtonBox::Close), &QPushButton::clicked, &dlg, &QDialog::accept);
 	connect(dlgui.buttonBox->button(QDialogButtonBox::RestoreDefaults), &QPushButton::clicked, this, [this, &dlg]() {
-		m_dialog->setIntSettingValue("SPU2/Output", "StretchSequenceLengthMS",
-			m_dialog->isPerGameSettings() ?
+		dialog()->setIntSettingValue("SPU2/Output", "StretchSequenceLengthMS",
+			dialog()->isPerGameSettings() ?
 				std::nullopt :
 				std::optional<int>(AudioStreamParameters::DEFAULT_STRETCH_SEQUENCE_LENGTH));
-		m_dialog->setIntSettingValue("SPU2/Output", "StretchSeekWindowMS",
-			m_dialog->isPerGameSettings() ?
+		dialog()->setIntSettingValue("SPU2/Output", "StretchSeekWindowMS",
+			dialog()->isPerGameSettings() ?
 				std::nullopt :
 				std::optional<int>(AudioStreamParameters::DEFAULT_STRETCH_SEEKWINDOW));
-		m_dialog->setIntSettingValue("SPU2/Output", "StretchOverlapMS",
-			m_dialog->isPerGameSettings() ?
+		dialog()->setIntSettingValue("SPU2/Output", "StretchOverlapMS",
+			dialog()->isPerGameSettings() ?
 				std::nullopt :
 				std::optional<int>(AudioStreamParameters::DEFAULT_STRETCH_OVERLAP));
-		m_dialog->setBoolSettingValue("SPU2/Output", "StretchUseQuickSeek",
-			m_dialog->isPerGameSettings() ?
+		dialog()->setBoolSettingValue("SPU2/Output", "StretchUseQuickSeek",
+			dialog()->isPerGameSettings() ?
 				std::nullopt :
 				std::optional<bool>(AudioStreamParameters::DEFAULT_STRETCH_USE_QUICKSEEK));
-		m_dialog->setBoolSettingValue("SPU2/Output", "StretchUseAAFilter",
-			m_dialog->isPerGameSettings() ?
+		dialog()->setBoolSettingValue("SPU2/Output", "StretchUseAAFilter",
+			dialog()->isPerGameSettings() ?
 				std::nullopt :
 				std::optional<bool>(AudioStreamParameters::DEFAULT_STRETCH_USE_AA_FILTER));
 
@@ -485,11 +484,11 @@ void AudioSettingsWidget::resetVolume(bool fast_forward)
 	QSlider* const slider = fast_forward ? m_ui.fastForwardVolume : m_ui.volume;
 	QLabel* const label = fast_forward ? m_ui.fastForwardVolumeLabel : m_ui.volumeLabel;
 
-	if (m_dialog->isPerGameSettings())
+	if (dialog()->isPerGameSettings())
 	{
-		m_dialog->removeSettingValue("SPU2/Output", key);
+		dialog()->removeSettingValue("SPU2/Output", key);
 
-		const int value = m_dialog->getEffectiveIntValue("SPU2/Output", key, 100);
+		const int value = dialog()->getEffectiveIntValue("SPU2/Output", key, 100);
 		QSignalBlocker sb(slider);
 		slider->setValue(value);
 		label->setText(QStringLiteral("%1%2").arg(value).arg(tr("%")));

pcsx2-qt/Settings/AudioSettingsWidget.h

@@ -5,21 +5,17 @@
 
 #include "ui_AudioSettingsWidget.h"
 
-#include "common/Pcsx2Defs.h"
-
-#include <QtWidgets/QWidget>
+#include "SettingsWidget.h"
 
 enum class AudioBackend : u8;
 enum class AudioExpansionMode : u8;
 
-class SettingsWindow;
-
-class AudioSettingsWidget : public QWidget
+class AudioSettingsWidget : public SettingsWidget
 {
 	Q_OBJECT
 
 public:
-	AudioSettingsWidget(SettingsWindow* dialog, QWidget* parent);
+	AudioSettingsWidget(SettingsWindow* settings_dialog, QWidget* parent);
 	~AudioSettingsWidget();
 
 private Q_SLOTS:
@@ -45,6 +41,5 @@ private:
 	void resetVolume(bool fast_forward);
 
 	Ui::AudioSettingsWidget m_ui;
-	SettingsWindow* m_dialog;
 	u32 m_output_device_latency = 0;
 };

pcsx2-qt/Settings/AudioSettingsWidget.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>523</width>
-    <height>504</height>
+    <width>700</width>
+    <height>500</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
@@ -79,7 +79,7 @@
            <enum>Qt::Horizontal</enum>
           </property>
           <property name="tickPosition">
-           <enum>QSlider::TickPosition::TicksBothSides</enum>
+           <enum>QSlider::TicksBothSides</enum>
           </property>
           <property name="tickInterval">
            <number>20</number>
@@ -125,7 +125,7 @@
          <string>Maximum latency: 0 frames (0.00ms)</string>
         </property>
         <property name="alignment">
-         <set>Qt::AlignmentFlag::AlignCenter</set>
+         <set>Qt::AlignCenter</set>
         </property>
        </widget>
       </item>
@@ -147,10 +147,10 @@
            <number>200</number>
           </property>
           <property name="orientation">
-           <enum>Qt::Orientation::Horizontal</enum>
+           <enum>Qt::Horizontal</enum>
           </property>
           <property name="tickPosition">
-           <enum>QSlider::TickPosition::TicksBothSides</enum>
+           <enum>QSlider::TicksBothSides</enum>
           </property>
           <property name="tickInterval">
            <number>20</number>
@@ -234,10 +234,10 @@
            <number>100</number>
           </property>
           <property name="orientation">
-           <enum>Qt::Orientation::Horizontal</enum>
+           <enum>Qt::Horizontal</enum>
           </property>
           <property name="tickPosition">
-           <enum>QSlider::TickPosition::TicksBothSides</enum>
+           <enum>QSlider::TicksBothSides</enum>
           </property>
           <property name="tickInterval">
            <number>10</number>
@@ -256,7 +256,7 @@
            <string>100%</string>
           </property>
           <property name="alignment">
-           <set>Qt::AlignmentFlag::AlignCenter</set>
+           <set>Qt::AlignCenter</set>
           </property>
          </widget>
         </item>
@@ -283,10 +283,10 @@
            <number>100</number>
           </property>
           <property name="orientation">
-           <enum>Qt::Orientation::Horizontal</enum>
+           <enum>Qt::Horizontal</enum>
           </property>
           <property name="tickPosition">
-           <enum>QSlider::TickPosition::TicksBothSides</enum>
+           <enum>QSlider::TicksBothSides</enum>
           </property>
           <property name="tickInterval">
            <number>10</number>
@@ -305,7 +305,7 @@
            <string>100%</string>
           </property>
           <property name="alignment">
-           <set>Qt::AlignmentFlag::AlignCenter</set>
+           <set>Qt::AlignCenter</set>
           </property>
          </widget>
         </item>
@@ -341,12 +341,12 @@
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
-      <enum>Qt::Orientation::Vertical</enum>
+      <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
-       <height>40</height>
+       <height>0</height>
       </size>
      </property>
     </spacer>

pcsx2-qt/Settings/BIOSSettingsWidget.cpp

@@ -14,25 +14,23 @@
 
 #include <QtGui/QIcon>
 #include <QtWidgets/QFileDialog>
-#include <algorithm>
 
-BIOSSettingsWidget::BIOSSettingsWidget(SettingsWindow* dialog, QWidget* parent)
-	: QWidget(parent)
-	, m_dialog(dialog)
+BIOSSettingsWidget::BIOSSettingsWidget(SettingsWindow* settings_dialog, QWidget* parent)
+	: SettingsWidget(settings_dialog, parent)
 {
-	SettingsInterface* sif = dialog->getSettingsInterface();
+	SettingsInterface* sif = dialog()->getSettingsInterface();
 
-	m_ui.setupUi(this);
+	setupTab(m_ui);
 
 	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.fastBoot, "EmuCore", "EnableFastBoot", true);
 	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.fastBootFastForward, "EmuCore", "EnableFastBootFastForward", false);
 	SettingWidgetBinder::BindWidgetToFolderSetting(sif, m_ui.searchDirectory, m_ui.browseSearchDirectory, m_ui.openSearchDirectory,
 		m_ui.resetSearchDirectory, "Folders", "Bios", Path::Combine(EmuFolders::DataRoot, "bios"));
 
-	dialog->registerWidgetHelp(m_ui.fastBoot, tr("Fast Boot"), tr("Checked"),
+	dialog()->registerWidgetHelp(m_ui.fastBoot, tr("Fast Boot"), tr("Checked"),
 		tr("Patches the BIOS to skip the console's boot animation."));
 
-	dialog->registerWidgetHelp(m_ui.fastBootFastForward, tr("Fast Forward Boot"), tr("Unchecked"),
+	dialog()->registerWidgetHelp(m_ui.fastBootFastForward, tr("Fast Forward Boot"), tr("Unchecked"),
 		tr("Removes emulation speed throttle until the game starts to reduce startup time."));
 
 	refreshList();
@@ -140,6 +138,6 @@ void BIOSSettingsWidget::listItemChanged(const QTreeWidgetItem* current, const Q
 
 void BIOSSettingsWidget::fastBootChanged()
 {
-	const bool enabled = m_dialog->getEffectiveBoolValue("EmuCore", "EnableFastBoot", true);
+	const bool enabled = dialog()->getEffectiveBoolValue("EmuCore", "EnableFastBoot", true);
 	m_ui.fastBootFastForward->setEnabled(enabled);
 }

pcsx2-qt/Settings/BIOSSettingsWidget.h

@@ -3,25 +3,16 @@
 
 #pragma once
 
-#include <QtCore/QDir>
-#include <QtCore/QPair>
-#include <QtCore/QString>
-#include <QtCore/QThread>
-#include <QtCore/QVector>
-#include <QtWidgets/QWidget>
-#include <string>
-
 #include "ui_BIOSSettingsWidget.h"
 
-class SettingsWindow;
-class QThread;
+#include "SettingsWidget.h"
 
-class BIOSSettingsWidget : public QWidget
+class BIOSSettingsWidget : public SettingsWidget
 {
 	Q_OBJECT
 
 public:
-	BIOSSettingsWidget(SettingsWindow* dialog, QWidget* parent);
+	BIOSSettingsWidget(SettingsWindow* settings_dialog, QWidget* parent);
 	~BIOSSettingsWidget();
 
 	static void populateList(QTreeWidget* list, const std::string& directory);
@@ -35,5 +26,4 @@ private Q_SLOTS:
 
 private:
 	Ui::BIOSSettingsWidget m_ui;
-	SettingsWindow* m_dialog;
 };

pcsx2-qt/Settings/BIOSSettingsWidget.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>618</width>
-    <height>408</height>
+    <width>700</width>
+    <height>500</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -161,7 +161,7 @@
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
-       <height>40</height>
+       <height>0</height>
       </size>
      </property>
     </spacer>

pcsx2-qt/Settings/ControllerSettingsWindow.cpp

@@ -206,7 +206,7 @@ void ControllerSettingsWindow::onRenameProfileClicked()
 	{
 		std::string game_settings_path(game_settings.FileName.c_str());
 		std::unique_ptr<INISettingsInterface> update_sif(std::make_unique<INISettingsInterface>(std::move(game_settings_path)));
-		
+
 		update_sif->Load();
 
 		if (!old_profile_name.compare(update_sif->GetStringValue("EmuCore", "InputProfileName")))
@@ -458,9 +458,9 @@ void ControllerSettingsWindow::createWidgets()
 
 		QListWidgetItem* item = new QListWidgetItem();
 		//: Controller Port is an official term from Sony. Find the official translation for your language inside the console's manual.
-		item->setText(mtap_enabled[port] ? (tr("Controller Port %1%2\n%3").arg(port + 1).arg(s_mtap_slot_names[slot]).arg(display_name)) :
-                                           //: Controller Port is an official term from Sony. Find the official translation for your language inside the console's manual.
-                                           tr("Controller Port %1\n%2").arg(port + 1).arg(display_name));
+		item->setText(mtap_enabled[port] ? (tr("Controller Port %1%2\n%3").arg(port + 1).arg(s_mtap_slot_names[slot]).arg(display_name))
+		//: Controller Port is an official term from Sony. Find the official translation for your language inside the console's manual.
+		                                 : tr("Controller Port %1\n%2").arg(port + 1).arg(display_name));
 		item->setIcon(m_port_bindings[global_slot]->getIcon());
 		item->setData(Qt::UserRole, QVariant(global_slot));
 		m_ui.settingsCategory->addItem(item);
@@ -514,9 +514,9 @@ void ControllerSettingsWindow::updateListDescription(u32 global_slot, Controller
 			const QString display_name = QString::fromUtf8(ci ? ci->GetLocalizedName() : "Unknown");
 
 			//: Controller Port is an official term from Sony. Find the official translation for your language inside the console's manual.
-			item->setText(mtap_enabled ? (tr("Controller Port %1%2\n%3").arg(port + 1).arg(s_mtap_slot_names[slot]).arg(display_name)) :
-                                         //: Controller Port is an official term from Sony. Find the official translation for your language inside the console's manual.
-                                         tr("Controller Port %1\n%2").arg(port + 1).arg(display_name));
+			item->setText(mtap_enabled ? (tr("Controller Port %1%2\n%3").arg(port + 1).arg(s_mtap_slot_names[slot]).arg(display_name))
+			//: Controller Port is an official term from Sony. Find the official translation for your language inside the console's manual.
+			                           : tr("Controller Port %1\n%2").arg(port + 1).arg(display_name));
 			item->setIcon(widget->getIcon());
 			break;
 		}

pcsx2-qt/Settings/DEV9SettingsWidget.cpp

@@ -44,13 +44,12 @@ static const char* s_dns_name[] = {
 
 using PacketReader::IP::IP_Address;
 
-DEV9SettingsWidget::DEV9SettingsWidget(SettingsWindow* dialog, QWidget* parent)
-	: QWidget(parent)
-	, m_dialog{dialog}
+DEV9SettingsWidget::DEV9SettingsWidget(SettingsWindow* settings_dialog, QWidget* parent)
+	: SettingsWidget(settings_dialog, parent)
 {
-	SettingsInterface* sif = dialog->getSettingsInterface();
+	SettingsInterface* sif = dialog()->getSettingsInterface();
 
-	m_ui.setupUi(this);
+	setupTab(m_ui);
 
 	//////////////////////////////////////////////////////////////////////////
 	// Eth Enabled
@@ -75,7 +74,7 @@ DEV9SettingsWidget::DEV9SettingsWidget(SettingsWindow* dialog, QWidget* parent)
 	connect(m_ui.ethInterceptDHCP, &QCheckBox::checkStateChanged, this, &DEV9SettingsWidget::onEthDHCPInterceptChanged);
 
 	//IP settings
-	const IPValidator* ipValidator = new IPValidator(this, m_dialog->isPerGameSettings());
+	const IPValidator* ipValidator = new IPValidator(this, dialog()->isPerGameSettings());
 
 	// clang-format off
 	m_ui.ethPS2Addr    ->setValidator(ipValidator);
@@ -84,13 +83,13 @@ DEV9SettingsWidget::DEV9SettingsWidget(SettingsWindow* dialog, QWidget* parent)
 	m_ui.ethDNS1Addr   ->setValidator(ipValidator);
 	m_ui.ethDNS2Addr   ->setValidator(ipValidator);
 
-	if (m_dialog->isPerGameSettings())
+	if (dialog()->isPerGameSettings())
 	{
-		m_ui.ethPS2Addr    ->setText(QString::fromUtf8(m_dialog->getStringValue("DEV9/Eth", "PS2IP",   "").value().c_str()));
-		m_ui.ethNetMask    ->setText(QString::fromUtf8(m_dialog->getStringValue("DEV9/Eth", "Mask",    "").value().c_str()));
-		m_ui.ethGatewayAddr->setText(QString::fromUtf8(m_dialog->getStringValue("DEV9/Eth", "Gateway", "").value().c_str()));
-		m_ui.ethDNS1Addr   ->setText(QString::fromUtf8(m_dialog->getStringValue("DEV9/Eth", "DNS1",    "").value().c_str()));
-		m_ui.ethDNS2Addr   ->setText(QString::fromUtf8(m_dialog->getStringValue("DEV9/Eth", "DNS2",    "").value().c_str()));
+		m_ui.ethPS2Addr    ->setText(QString::fromUtf8(dialog()->getStringValue("DEV9/Eth", "PS2IP",   "").value().c_str()));
+		m_ui.ethNetMask    ->setText(QString::fromUtf8(dialog()->getStringValue("DEV9/Eth", "Mask",    "").value().c_str()));
+		m_ui.ethGatewayAddr->setText(QString::fromUtf8(dialog()->getStringValue("DEV9/Eth", "Gateway", "").value().c_str()));
+		m_ui.ethDNS1Addr   ->setText(QString::fromUtf8(dialog()->getStringValue("DEV9/Eth", "DNS1",    "").value().c_str()));
+		m_ui.ethDNS2Addr   ->setText(QString::fromUtf8(dialog()->getStringValue("DEV9/Eth", "DNS2",    "").value().c_str()));
 
 		m_ui.ethPS2Addr    ->setPlaceholderText(QString::fromUtf8(Host::GetBaseStringSettingValue("DEV9/Eth", "PS2IP",   "0.0.0.0").c_str()));
 		m_ui.ethNetMask    ->setPlaceholderText(QString::fromUtf8(Host::GetBaseStringSettingValue("DEV9/Eth", "Mask",    "0.0.0.0").c_str()));
@@ -100,11 +99,11 @@ DEV9SettingsWidget::DEV9SettingsWidget(SettingsWindow* dialog, QWidget* parent)
 	}
 	else
 	{
-		m_ui.ethPS2Addr    ->setText(QString::fromUtf8(m_dialog->getStringValue("DEV9/Eth", "PS2IP",   "0.0.0.0").value().c_str()));
-		m_ui.ethNetMask    ->setText(QString::fromUtf8(m_dialog->getStringValue("DEV9/Eth", "Mask",    "0.0.0.0").value().c_str()));
-		m_ui.ethGatewayAddr->setText(QString::fromUtf8(m_dialog->getStringValue("DEV9/Eth", "Gateway", "0.0.0.0").value().c_str()));
-		m_ui.ethDNS1Addr   ->setText(QString::fromUtf8(m_dialog->getStringValue("DEV9/Eth", "DNS1",    "0.0.0.0").value().c_str()));
-		m_ui.ethDNS2Addr   ->setText(QString::fromUtf8(m_dialog->getStringValue("DEV9/Eth", "DNS2",    "0.0.0.0").value().c_str()));
+		m_ui.ethPS2Addr    ->setText(QString::fromUtf8(dialog()->getStringValue("DEV9/Eth", "PS2IP",   "0.0.0.0").value().c_str()));
+		m_ui.ethNetMask    ->setText(QString::fromUtf8(dialog()->getStringValue("DEV9/Eth", "Mask",    "0.0.0.0").value().c_str()));
+		m_ui.ethGatewayAddr->setText(QString::fromUtf8(dialog()->getStringValue("DEV9/Eth", "Gateway", "0.0.0.0").value().c_str()));
+		m_ui.ethDNS1Addr   ->setText(QString::fromUtf8(dialog()->getStringValue("DEV9/Eth", "DNS1",    "0.0.0.0").value().c_str()));
+		m_ui.ethDNS2Addr   ->setText(QString::fromUtf8(dialog()->getStringValue("DEV9/Eth", "DNS2",    "0.0.0.0").value().c_str()));
 	}
 
 	connect(m_ui.ethPS2Addr,     &QLineEdit::editingFinished, this, [&]() { onEthIPChanged(m_ui.ethPS2Addr,     "DEV9/Eth", "PS2IP"  ); });
@@ -171,13 +170,13 @@ DEV9SettingsWidget::DEV9SettingsWidget(SettingsWindow* dialog, QWidget* parent)
 	connect(m_ui.hddEnabled, &QCheckBox::checkStateChanged, this, &DEV9SettingsWidget::onHddEnabledChanged);
 	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.hddEnabled, "DEV9/Hdd", "HddEnable", false);
 
-	if (m_dialog->isPerGameSettings())
+	if (dialog()->isPerGameSettings())
 	{
-		m_ui.hddFile->setText(QString::fromUtf8(m_dialog->getStringValue("DEV9/Hdd", "HddFile", "").value().c_str()));
+		m_ui.hddFile->setText(QString::fromUtf8(dialog()->getStringValue("DEV9/Hdd", "HddFile", "").value().c_str()));
 		m_ui.hddFile->setPlaceholderText(QString::fromUtf8(Host::GetBaseStringSettingValue("DEV9/Hdd", "HddFile", "DEV9hdd.raw")));
 	}
 	else
-		m_ui.hddFile->setText(QString::fromUtf8(m_dialog->getStringValue("DEV9/Hdd", "HddFile", "DEV9hdd.raw").value().c_str()));
+		m_ui.hddFile->setText(QString::fromUtf8(dialog()->getStringValue("DEV9/Hdd", "HddFile", "DEV9hdd.raw").value().c_str()));
 
 	connect(m_ui.hddLBA48, &QCheckBox::checkStateChanged, this, &DEV9SettingsWidget::onHddLBA48Changed);
 
@@ -221,7 +220,7 @@ void DEV9SettingsWidget::onEthDeviceTypeChanged(int index)
 	{
 		std::vector<AdapterEntry> list = m_adapter_list[static_cast<u32>(m_api_list[index])];
 
-		const std::string value = m_dialog->getEffectiveStringValue("DEV9/Eth", "EthDevice", "");
+		const std::string value = dialog()->getEffectiveStringValue("DEV9/Eth", "EthDevice", "");
 		for (size_t i = 0; i < list.size(); i++)
 		{
 			m_ui.ethDev->addItem(QString::fromUtf8(list[i].name));
@@ -232,7 +231,7 @@ void DEV9SettingsWidget::onEthDeviceTypeChanged(int index)
 		selectedApi = m_api_list[index];
 	}
 
-	if (m_dialog->isPerGameSettings())
+	if (dialog()->isPerGameSettings())
 	{
 		if (index == 0)
 		{
@@ -277,20 +276,20 @@ void DEV9SettingsWidget::onEthDeviceChanged(int index)
 	{
 		const AdapterEntry& adapter = m_adapter_list[static_cast<u32>(m_api_list[m_ui.ethDevType->currentIndex()])][index];
 
-		m_dialog->setStringSettingValue("DEV9/Eth", "EthApi", Pcsx2Config::DEV9Options::NetApiNames[static_cast<int>(adapter.type)]);
-		m_dialog->setStringSettingValue("DEV9/Eth", "EthDevice", adapter.guid.c_str());
+		dialog()->setStringSettingValue("DEV9/Eth", "EthApi", Pcsx2Config::DEV9Options::NetApiNames[static_cast<int>(adapter.type)]);
+		dialog()->setStringSettingValue("DEV9/Eth", "EthDevice", adapter.guid.c_str());
 	}
-	else if (m_dialog->isPerGameSettings() && m_ui.ethDevType->currentIndex() == 0 && index == 0)
+	else if (dialog()->isPerGameSettings() && m_ui.ethDevType->currentIndex() == 0 && index == 0)
 	{
-		m_dialog->setStringSettingValue("DEV9/Eth", "EthApi", std::nullopt);
-		m_dialog->setStringSettingValue("DEV9/Eth", "EthDevice", std::nullopt);
+		dialog()->setStringSettingValue("DEV9/Eth", "EthApi", std::nullopt);
+		dialog()->setStringSettingValue("DEV9/Eth", "EthDevice", std::nullopt);
 	}
 }
 
 void DEV9SettingsWidget::onEthDHCPInterceptChanged(Qt::CheckState state)
 {
 	const bool enabled = (state == Qt::CheckState::PartiallyChecked ? Host::GetBaseBoolSettingValue("DEV9/Eth", "InterceptDHCP", false) : state) ||
-						 ((m_adapter_options & AdapterOptions::DHCP_ForcedOn) == AdapterOptions::DHCP_ForcedOn);
+	                     ((m_adapter_options & AdapterOptions::DHCP_ForcedOn) == AdapterOptions::DHCP_ForcedOn);
 
 	// clang-format off
 	const bool ipOverride = (m_adapter_options & AdapterOptions::DHCP_OverrideIP)     == AdapterOptions::DHCP_OverrideIP;
@@ -323,8 +322,8 @@ void DEV9SettingsWidget::onEthIPChanged(QLineEdit* sender, const char* section,
 	//Alow clearing a per-game ip setting
 	if (sender->text().isEmpty())
 	{
-		if (m_dialog->getStringValue(section, key, std::nullopt).has_value())
-			m_dialog->setStringSettingValue(section, key, std::nullopt);
+		if (dialog()->getStringValue(section, key, std::nullopt).has_value())
+			dialog()->setStringSettingValue(section, key, std::nullopt);
 		return;
 	}
 
@@ -337,9 +336,9 @@ void DEV9SettingsWidget::onEthIPChanged(QLineEdit* sender, const char* section,
 
 	sender->setText(QString::fromUtf8(neatStr.c_str()));
 
-	std::string oldval = m_dialog->getStringValue(section, key, "0.0.0.0").value();
+	std::string oldval = dialog()->getStringValue(section, key, "0.0.0.0").value();
 	if (neatStr != oldval)
-		m_dialog->setStringSettingValue(section, key, neatStr.c_str());
+		dialog()->setStringSettingValue(section, key, neatStr.c_str());
 }
 
 void DEV9SettingsWidget::onEthAutoChanged(QCheckBox* sender, Qt::CheckState state, QLineEdit* input, const char* section, const char* key)
@@ -357,7 +356,7 @@ void DEV9SettingsWidget::onEthDNSModeChanged(QComboBox* sender, int index, QLine
 {
 	if (sender->isEnabled())
 	{
-		if (m_dialog->isPerGameSettings())
+		if (dialog()->isPerGameSettings())
 		{
 			if (index == 0)
 			{
@@ -522,7 +521,7 @@ void DEV9SettingsWidget::onEthHostImport()
 
 void DEV9SettingsWidget::onEthHostPerGame()
 {
-	const std::optional<int> hostLengthOpt = m_dialog->getIntValue("DEV9/Eth/Hosts", "Count", std::nullopt);
+	const std::optional<int> hostLengthOpt = dialog()->getIntValue("DEV9/Eth/Hosts", "Count", std::nullopt);
 	if (!hostLengthOpt.has_value())
 	{
 		QMessageBox::StandardButton ret = QMessageBox::question(this, tr("Per Game Host list"),
@@ -532,12 +531,12 @@ void DEV9SettingsWidget::onEthHostPerGame()
 		switch (ret)
 		{
 			case QMessageBox::StandardButton::No:
-				m_dialog->setIntSettingValue("DEV9/Eth/Hosts", "Count", 0);
+				dialog()->setIntSettingValue("DEV9/Eth/Hosts", "Count", 0);
 				break;
 
 			case QMessageBox::StandardButton::Yes:
 			{
-				m_dialog->setIntSettingValue("DEV9/Eth/Hosts", "Count", 0);
+				dialog()->setIntSettingValue("DEV9/Eth/Hosts", "Count", 0);
 				std::vector<HostEntryUi> hosts = ListBaseHostsConfig();
 				for (size_t i = 0; i < hosts.size(); i++)
 					AddNewHostConfig(hosts[i]);
@@ -563,7 +562,7 @@ void DEV9SettingsWidget::onEthHostPerGame()
 			for (int i = hostLength - 1; i >= 0; i--)
 				DeleteHostConfig(i);
 		}
-		m_dialog->setIntSettingValue("DEV9/Eth/Hosts", nullptr, std::nullopt);
+		dialog()->setIntSettingValue("DEV9/Eth/Hosts", nullptr, std::nullopt);
 	}
 
 	RefreshHostList();
@@ -576,16 +575,16 @@ void DEV9SettingsWidget::onEthHostEdit(QStandardItem* item)
 	switch (item->column())
 	{
 		case 0: //Name
-			m_dialog->setStringSettingValue(section.c_str(), "Desc", item->text().toUtf8().constData());
+			dialog()->setStringSettingValue(section.c_str(), "Desc", item->text().toUtf8().constData());
 			break;
 		case 1: //URL
-			m_dialog->setStringSettingValue(section.c_str(), "Url", item->text().toUtf8().constData());
+			dialog()->setStringSettingValue(section.c_str(), "Url", item->text().toUtf8().constData());
 			break;
 		case 2: //IP
-			m_dialog->setStringSettingValue(section.c_str(), "Address", item->text().toUtf8().constData());
+			dialog()->setStringSettingValue(section.c_str(), "Address", item->text().toUtf8().constData());
 			break;
 		case 3: //Enabled
-			m_dialog->setBoolSettingValue(section.c_str(), "Enabled", item->checkState() == Qt::CheckState::Checked);
+			dialog()->setBoolSettingValue(section.c_str(), "Enabled", item->checkState() == Qt::CheckState::Checked);
 			break;
 		default:
 			break;
@@ -634,9 +633,9 @@ void DEV9SettingsWidget::onHddFileEdit()
 	// Also save the hddPath setting
 	std::string hddPath(m_ui.hddFile->text().toStdString());
 	if (hddPath.empty())
-		m_dialog->setStringSettingValue("DEV9/Hdd", "HddFile", std::nullopt);
+		dialog()->setStringSettingValue("DEV9/Hdd", "HddFile", std::nullopt);
 	else
-		m_dialog->setStringSettingValue("DEV9/Hdd", "HddFile", hddPath.c_str());
+		dialog()->setStringSettingValue("DEV9/Hdd", "HddFile", hddPath.c_str());
 
 	UpdateHddSizeUIValues();
 }
@@ -716,7 +715,7 @@ void DEV9SettingsWidget::UpdateHddSizeUIEnabled()
 	std::string hddPath(m_ui.hddFile->text().toStdString());
 
 	bool enableSizeUI;
-	if (m_dialog->isPerGameSettings() && hddPath.empty())
+	if (dialog()->isPerGameSettings() && hddPath.empty())
 		enableSizeUI = false;
 	else
 		enableSizeUI = m_ui.hddFile->isEnabled();
@@ -733,7 +732,7 @@ void DEV9SettingsWidget::UpdateHddSizeUIValues()
 {
 	std::string hddPath(m_ui.hddFile->text().toStdString());
 
-	if (m_dialog->isPerGameSettings() && hddPath.empty())
+	if (dialog()->isPerGameSettings() && hddPath.empty())
 		hddPath = m_ui.hddFile->placeholderText().toStdString();
 
 	if (!Path::IsAbsolute(hddPath))
@@ -770,7 +769,7 @@ void DEV9SettingsWidget::showEvent(QShowEvent* event)
 	{
 		//The API combobox dosn't set the EthApi field, that is performed by the device combobox (in addition to saving the device)
 		//This means that this setting can get out of sync with true value, so revert to that if the ui is closed and opened
-		const std::string value = m_dialog->getStringValue("DEV9/Eth", "EthApi", Pcsx2Config::DEV9Options::NetApiNames[static_cast<int>(Pcsx2Config::DEV9Options::NetApi::Unset)]).value();
+		const std::string value = dialog()->getStringValue("DEV9/Eth", "EthApi", Pcsx2Config::DEV9Options::NetApiNames[static_cast<int>(Pcsx2Config::DEV9Options::NetApi::Unset)]).value();
 
 		//SignalBlocker to prevent saving a value already in the config file
 		QSignalBlocker sb(m_ui.ethDev);
@@ -864,7 +863,7 @@ void DEV9SettingsWidget::LoadAdapters()
 	m_api_valuelist.push_back(nullptr);
 
 	//We replace the blank entry with one for global settings
-	if (m_dialog->isPerGameSettings())
+	if (dialog()->isPerGameSettings())
 	{
 		const std::string valueAPI = Host::GetBaseStringSettingValue("DEV9/Eth", "EthApi", Pcsx2Config::DEV9Options::NetApiNames[static_cast<int>(Pcsx2Config::DEV9Options::NetApi::Unset)]);
 		for (int i = 0; Pcsx2Config::DEV9Options::NetApiNames[i] != nullptr; i++)
@@ -892,7 +891,7 @@ void DEV9SettingsWidget::LoadAdapters()
 		m_adapter_list[static_cast<u32>(Pcsx2Config::DEV9Options::NetApi::Unset)][0].name = baseAdapter;
 	}
 
-	if (m_dialog->isPerGameSettings())
+	if (dialog()->isPerGameSettings())
 		m_ui.ethDevType->addItem(tr("Use Global Setting [%1]").arg(QString::fromUtf8(Pcsx2Config::DEV9Options::NetApiNames[static_cast<u32>(m_global_api)])));
 	else
 		m_ui.ethDevType->addItem(qApp->translate("DEV9SettingsWidget", m_api_namelist[0]));
@@ -900,7 +899,7 @@ void DEV9SettingsWidget::LoadAdapters()
 	for (int i = 1; m_api_namelist[i] != nullptr; i++)
 		m_ui.ethDevType->addItem(qApp->translate("DEV9SettingsWidget", m_api_namelist[i]));
 
-	const std::string value = m_dialog->getStringValue("DEV9/Eth", "EthApi", Pcsx2Config::DEV9Options::NetApiNames[static_cast<int>(Pcsx2Config::DEV9Options::NetApi::Unset)]).value();
+	const std::string value = dialog()->getStringValue("DEV9/Eth", "EthApi", Pcsx2Config::DEV9Options::NetApiNames[static_cast<int>(Pcsx2Config::DEV9Options::NetApi::Unset)]).value();
 
 	for (int i = 0; m_api_namelist[i] != nullptr; i++)
 	{
@@ -924,7 +923,7 @@ void DEV9SettingsWidget::RefreshHostList()
 
 	std::vector<HostEntryUi> hosts;
 
-	if (m_dialog->isPerGameSettings())
+	if (dialog()->isPerGameSettings())
 	{
 		m_ui.ethHostPerGame->setVisible(true);
 
@@ -988,7 +987,7 @@ void DEV9SettingsWidget::RefreshHostList()
 
 int DEV9SettingsWidget::CountHostsConfig()
 {
-	return m_dialog->getIntValue("DEV9/Eth/Hosts", "Count", 0).value();
+	return dialog()->getIntValue("DEV9/Eth/Hosts", "Count", 0).value();
 }
 
 std::optional<std::vector<HostEntryUi>> DEV9SettingsWidget::ListHostsConfig()
@@ -996,14 +995,14 @@ std::optional<std::vector<HostEntryUi>> DEV9SettingsWidget::ListHostsConfig()
 	std::vector<HostEntryUi> hosts;
 
 	std::optional<int> hostLengthOpt;
-	if (m_dialog->isPerGameSettings())
+	if (dialog()->isPerGameSettings())
 	{
-		hostLengthOpt = m_dialog->getIntValue("DEV9/Eth/Hosts", "Count", std::nullopt);
+		hostLengthOpt = dialog()->getIntValue("DEV9/Eth/Hosts", "Count", std::nullopt);
 		if (!hostLengthOpt.has_value())
 			return std::nullopt;
 	}
 	else
-		hostLengthOpt = m_dialog->getIntValue("DEV9/Eth/Hosts", "Count", 0);
+		hostLengthOpt = dialog()->getIntValue("DEV9/Eth/Hosts", "Count", 0);
 
 	const int hostLength = hostLengthOpt.value();
 	for (int i = 0; i < hostLength; i++)
@@ -1011,10 +1010,10 @@ std::optional<std::vector<HostEntryUi>> DEV9SettingsWidget::ListHostsConfig()
 		std::string section = "DEV9/Eth/Hosts/Host" + std::to_string(i);
 
 		HostEntryUi entry;
-		entry.Url = m_dialog->getStringValue(section.c_str(), "Url", "").value();
-		entry.Desc = m_dialog->getStringValue(section.c_str(), "Desc", "").value();
-		entry.Address = m_dialog->getStringValue(section.c_str(), "Address", "").value();
-		entry.Enabled = m_dialog->getBoolValue(section.c_str(), "Enabled", false).value();
+		entry.Url = dialog()->getStringValue(section.c_str(), "Url", "").value();
+		entry.Desc = dialog()->getStringValue(section.c_str(), "Desc", "").value();
+		entry.Address = dialog()->getStringValue(section.c_str(), "Address", "").value();
+		entry.Enabled = dialog()->getBoolValue(section.c_str(), "Enabled", false).value();
 		hosts.push_back(entry);
 	}
 
@@ -1046,12 +1045,12 @@ void DEV9SettingsWidget::AddNewHostConfig(const HostEntryUi& host)
 	const int hostLength = CountHostsConfig();
 	std::string section = "DEV9/Eth/Hosts/Host" + std::to_string(hostLength);
 	// clang-format off
-	m_dialog->setStringSettingValue(section.c_str(), "Url",     host.Url.c_str());
-	m_dialog->setStringSettingValue(section.c_str(), "Desc",    host.Desc.c_str());
-	m_dialog->setStringSettingValue(section.c_str(), "Address", host.Address.c_str());
-	m_dialog->setBoolSettingValue  (section.c_str(), "Enabled", host.Enabled);
+	dialog()->setStringSettingValue(section.c_str(), "Url",     host.Url.c_str());
+	dialog()->setStringSettingValue(section.c_str(), "Desc",    host.Desc.c_str());
+	dialog()->setStringSettingValue(section.c_str(), "Address", host.Address.c_str());
+	dialog()->setBoolSettingValue  (section.c_str(), "Enabled", host.Enabled);
 	// clang-format on
-	m_dialog->setIntSettingValue("DEV9/Eth/Hosts", "Count", hostLength + 1);
+	dialog()->setIntSettingValue("DEV9/Eth/Hosts", "Count", hostLength + 1);
 	RefreshHostList();
 }
 
@@ -1066,10 +1065,10 @@ void DEV9SettingsWidget::DeleteHostConfig(int index)
 		std::string sectionAhead = "DEV9/Eth/Hosts/Host" + std::to_string(i + 1);
 
 		// clang-format off
-		m_dialog->setStringSettingValue(section.c_str(), "Url",     m_dialog->getStringValue(sectionAhead.c_str(), "Url",     "").value().c_str());
-		m_dialog->setStringSettingValue(section.c_str(), "Desc",    m_dialog->getStringValue(sectionAhead.c_str(), "Desc",    "").value().c_str());
-		m_dialog->setStringSettingValue(section.c_str(), "Address", m_dialog->getStringValue(sectionAhead.c_str(), "Address", "0.0.0.0").value().c_str());
-		m_dialog->setBoolSettingValue  (section.c_str(), "Enabled", m_dialog->getBoolValue  (sectionAhead.c_str(), "Enabled", false).value());
+		dialog()->setStringSettingValue(section.c_str(), "Url",     dialog()->getStringValue(sectionAhead.c_str(), "Url",     "").value().c_str());
+		dialog()->setStringSettingValue(section.c_str(), "Desc",    dialog()->getStringValue(sectionAhead.c_str(), "Desc",    "").value().c_str());
+		dialog()->setStringSettingValue(section.c_str(), "Address", dialog()->getStringValue(sectionAhead.c_str(), "Address", "0.0.0.0").value().c_str());
+		dialog()->setBoolSettingValue  (section.c_str(), "Enabled", dialog()->getBoolValue  (sectionAhead.c_str(), "Enabled", false).value());
 		// clang-format on
 	}
 
@@ -1077,9 +1076,9 @@ void DEV9SettingsWidget::DeleteHostConfig(int index)
 	std::string section = "DEV9/Eth/Hosts/Host" + std::to_string(hostLength - 1);
 	//Specifying a value of nullopt will delete the key
 	//if the key is a nullptr, the whole section is deleted
-	m_dialog->setStringSettingValue(section.c_str(), nullptr, std::nullopt);
+	dialog()->setStringSettingValue(section.c_str(), nullptr, std::nullopt);
 
-	m_dialog->setIntSettingValue("DEV9/Eth/Hosts", "Count", hostLength - 1);
+	dialog()->setIntSettingValue("DEV9/Eth/Hosts", "Count", hostLength - 1);
 	RefreshHostList();
 }
 

pcsx2-qt/Settings/DEV9SettingsWidget.h

@@ -3,18 +3,17 @@
 
 #pragma once
 
-#include <QtWidgets/QWidget>
-#include <QtGui/QStandardItemModel>
-
 #include "ui_DEV9SettingsWidget.h"
 
+#include "SettingsWidget.h"
+
 #include "DEV9UiCommon.h"
 #include "DEV9DnsHostDialog.h"
 #include "DEV9/net.h"
 
-class SettingsWindow;
+#include <QtGui/QStandardItemModel>
 
-class DEV9SettingsWidget : public QWidget
+class DEV9SettingsWidget : public SettingsWidget
 {
 	Q_OBJECT
 
@@ -43,7 +42,7 @@ private Q_SLOTS:
 	void onHddCreateClicked();
 
 public:
-	DEV9SettingsWidget(SettingsWindow* dialog, QWidget* parent);
+	DEV9SettingsWidget(SettingsWindow* settings_dialog, QWidget* parent);
 	~DEV9SettingsWidget();
 
 protected:
@@ -63,8 +62,6 @@ private:
 	void UpdateHddSizeUIEnabled();
 	void UpdateHddSizeUIValues();
 
-	SettingsWindow* m_dialog;
-
 	Ui::DEV9SettingsWidget m_ui;
 
 	bool m_firstShow{true};

pcsx2-qt/Settings/DEV9SettingsWidget.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>600</width>
-    <height>482</height>
+    <width>700</width>
+    <height>700</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
@@ -218,7 +218,7 @@
               <property name="sizeHint" stdset="0">
                <size>
                 <width>20</width>
-                <height>40</height>
+                <height>0</height>
                </size>
               </property>
              </spacer>
@@ -387,7 +387,7 @@
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
-       <height>68</height>
+       <height>0</height>
       </size>
      </property>
     </spacer>

pcsx2-qt/Settings/DebugAnalysisSettingsTab.ui

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DebugAnalysisSettingsTab</class>
+ <widget class="QWidget" name="DebugAnalysisSettingsTab">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>700</width>
+    <height>500</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string/>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLabel" name="analysisLabel">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>These settings control what and when analysis passes should be performed on the program running in the virtual machine so that the resultant information can be shown in the debugger.</string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="analysisGroupBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title">
+      <string>Analysis</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_5">
+      <item>
+       <layout class="QFormLayout" name="analysisForm">
+        <item row="0" column="0">
+         <widget class="QLabel" name="analysisConditionLabel">
+          <property name="text">
+           <string>Automatically Analyze Program:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <widget class="QComboBox" name="analysisCondition">
+          <item>
+           <property name="text">
+            <string>Always</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>If Debugger Is Open</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Never</string>
+           </property>
+          </item>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="generateSymbolsForIRXExportTables">
+        <property name="text">
+         <string>Generate Symbols For IRX Exports</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QWidget" name="analysisSettings" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

pcsx2-qt/Settings/DebugAnalysisSettingsWidget.ui

@@ -413,7 +413,7 @@
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
-       <height>40</height>
+       <height>0</height>
       </size>
      </property>
     </spacer>

pcsx2-qt/Settings/DebugGSSettingsTab.ui

@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DebugGSSettingsTab</class>
+ <widget class="QWidget" name="DebugGSSettingsTab">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>700</width>
+    <height>500</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string/>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>Draw Dumping</string>
+     </property>
+     <layout class="QFormLayout" name="formLayout">
+      <item row="0" column="0" colspan="2">
+       <layout class="QGridLayout" name="gridLayout">
+        <item row="0" column="0">
+         <widget class="QCheckBox" name="dumpGSData">
+          <property name="text">
+           <string>Dump GS Draws</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <widget class="QCheckBox" name="saveRT">
+          <property name="text">
+           <string>Save RT</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0">
+         <widget class="QCheckBox" name="saveFrame">
+          <property name="text">
+           <string>Save Frame</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="1">
+         <widget class="QCheckBox" name="saveTexture">
+          <property name="text">
+           <string>Save Texture</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="0">
+         <widget class="QCheckBox" name="saveDepth">
+          <property name="text">
+           <string>Save Depth</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="0">
+         <widget class="QCheckBox" name="saveAlpha">
+          <property name="text">
+           <string>Save Alpha</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="1">
+         <widget class="QCheckBox" name="saveInfo">
+          <property name="text">
+           <string>Save Info</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_1">
+        <property name="text">
+         <string>Save Draw Start:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QSpinBox" name="saveDrawStart">
+        <property name="maximum">
+         <number>99999999</number>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+         <string>Save Draw Count:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QSpinBox" name="saveDrawCount">
+        <property name="minimum">
+         <number>1</number>
+        </property>
+        <property name="maximum">
+         <number>99999999</number>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0">
+       <widget class="QLabel" name="label_3">
+        <property name="text">
+         <string>Save Frame Start:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
+       <widget class="QSpinBox" name="saveFrameStart">
+        <property name="maximum">
+         <number>99999999</number>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0">
+       <widget class="QLabel" name="label_4">
+        <property name="text">
+         <string>Save Frame Count:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1">
+       <widget class="QSpinBox" name="saveFrameCount">
+        <property name="minimum">
+         <number>1</number>
+        </property>
+        <property name="maximum">
+         <number>99999999</number>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0">
+       <widget class="QLabel" name="label_5">
+        <property name="text">
+         <string>Hardware Dump Directory:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="0">
+       <widget class="QLabel" name="label_6">
+        <property name="text">
+         <string>Software Dump Directory:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="1">
+       <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,0,0">
+        <item>
+         <widget class="QLineEdit" name="hwDumpDirectory"/>
+        </item>
+        <item>
+         <widget class="QPushButton" name="hwDumpBrowse">
+          <property name="text">
+           <string>Browse...</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="hwDumpOpen">
+          <property name="text">
+           <string>Open...</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="6" column="1">
+       <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="1,0,0">
+        <item>
+         <widget class="QLineEdit" name="swDumpDirectory"/>
+        </item>
+        <item>
+         <widget class="QPushButton" name="swDumpBrowse">
+          <property name="text">
+           <string>Browse...</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="swDumpOpen">
+          <property name="text">
+           <string>Open...</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>0</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

pcsx2-qt/Settings/DebugLoggingSettingsTab.ui

@@ -0,0 +1,321 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DebugLoggingSettingsTab</class>
+ <widget class="QWidget" name="DebugLoggingSettingsTab">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>700</width>
+    <height>500</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string/>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QCheckBox" name="chkEnable">
+     <property name="text">
+      <string>Enable</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="traceLogHorizontalLayout">
+     <item>
+      <widget class="QGroupBox" name="grpEELogging">
+       <property name="title">
+        <string>EE</string>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_3">
+        <item>
+         <layout class="QGridLayout" name="grpEELoggingGrid">
+          <item row="4" column="1">
+           <widget class="QCheckBox" name="chkEEDMACTRL">
+            <property name="text">
+             <string>DMA Control</string>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="1">
+           <widget class="QCheckBox" name="chkEEMFIFO">
+            <property name="text">
+             <string>SPR / MFIFO</string>
+            </property>
+           </widget>
+          </item>
+          <item row="9" column="0">
+           <widget class="QCheckBox" name="chkEEVIF">
+            <property name="text">
+             <string>VIF</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QCheckBox" name="chkEECOP1">
+            <property name="text">
+             <string>COP1 (FPU)</string>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="0">
+           <widget class="QCheckBox" name="chkEEMSKPATH3">
+            <property name="text">
+             <string>MSKPATH3</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QCheckBox" name="chkEECache">
+            <property name="text">
+             <string>Cache</string>
+            </property>
+           </widget>
+          </item>
+          <item row="9" column="1">
+           <widget class="QCheckBox" name="chkEEGIF">
+            <property name="text">
+             <string>GIF</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QCheckBox" name="chkEER5900">
+            <property name="text">
+             <string>R5900</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="0">
+           <widget class="QCheckBox" name="chkEECOP0">
+            <property name="text">
+             <string>COP0</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QCheckBox" name="chkEEMMIO">
+            <property name="text">
+             <string>HW Regs (MMIO)</string>
+            </property>
+           </widget>
+          </item>
+          <item row="7" column="1">
+           <widget class="QCheckBox" name="chkEECounters">
+            <property name="text">
+             <string>Counters</string>
+            </property>
+           </widget>
+          </item>
+          <item row="10" column="1">
+           <widget class="QCheckBox" name="chkEESIF">
+            <property name="text">
+             <string>SIF</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QCheckBox" name="chkEECOP2">
+            <property name="text">
+             <string>COP2 (VU0 Macro)</string>
+            </property>
+           </widget>
+          </item>
+          <item row="8" column="0">
+           <widget class="QCheckBox" name="chkEEVIFCodes">
+            <property name="text">
+             <string>VIFCodes</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QCheckBox" name="chkEEMemory">
+            <property name="text">
+             <string>Memory</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="QCheckBox" name="chkEEUNKNWNMMIO">
+            <property name="text">
+             <string>Unknown MMIO</string>
+            </property>
+           </widget>
+          </item>
+          <item row="7" column="0">
+           <widget class="QCheckBox" name="chkEEIPU">
+            <property name="text">
+             <string>IPU</string>
+            </property>
+           </widget>
+          </item>
+          <item row="10" column="0">
+           <widget class="QCheckBox" name="chkEEBIOS">
+            <property name="text">
+             <string>BIOS</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="0">
+           <widget class="QCheckBox" name="chkEEDMARegs">
+            <property name="text">
+             <string>DMA Registers</string>
+            </property>
+           </widget>
+          </item>
+          <item row="8" column="1">
+           <widget class="QCheckBox" name="chkEEGIFTags">
+            <property name="text">
+             <string>GIFTags</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <spacer name="eeLoggingSpacer">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>0</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="QGroupBox" name="grpIOPLogging">
+       <property name="title">
+        <string>IOP</string>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_7">
+        <item>
+         <layout class="QGridLayout" name="grpIOPLoggingGrid">
+          <item row="4" column="0">
+           <widget class="QCheckBox" name="chkIOPCounters">
+            <property name="text">
+             <string>Counters</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="QCheckBox" name="chkIOPUNKNWNMMIO">
+            <property name="text">
+             <string>Unknown MMIO</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QCheckBox" name="chkIOPMMIO">
+            <property name="text">
+             <string>HW Regs (MMIO)</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="1">
+           <widget class="QCheckBox" name="chkIOPCDVD">
+            <property name="text">
+             <string>CDVD</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QCheckBox" name="chkIOPR3000A">
+            <property name="text">
+             <string>R3000A</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QCheckBox" name="chkIOPMemcards">
+            <property name="text">
+             <string>Memcards</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QCheckBox" name="chkIOPDMARegs">
+            <property name="text">
+             <string>DMA Registers</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QCheckBox" name="chkIOPPad">
+            <property name="text">
+             <string>Pad</string>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="1">
+           <widget class="QCheckBox" name="chkIOPBIOS">
+            <property name="text">
+             <string>BIOS</string>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="0">
+           <widget class="QCheckBox" name="chkIOPMDEC">
+            <property name="text">
+             <string>MDEC</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QCheckBox" name="chkIOPDMACTRL">
+            <property name="text">
+             <string>DMA Control</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="0">
+           <widget class="QCheckBox" name="chkIOPCOP2">
+            <property name="text">
+             <string>COP2 (GPU)</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <spacer name="iopLoggingSpacer">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>0</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>0</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

pcsx2-qt/Settings/DebugSettingsWidget.cpp

@@ -3,161 +3,202 @@
 
 #include "DebugSettingsWidget.h"
 
-#include "DebugUserInterfaceSettingsWidget.h"
-#include "DebugAnalysisSettingsWidget.h"
 #include "QtUtils.h"
 #include "SettingWidgetBinder.h"
-#include "SettingsWindow.h"
+#include "Debugger/DebuggerWindow.h"
+#include "Settings/DebugAnalysisSettingsWidget.h"
+#include "Settings/SettingsWindow.h"
 
 #include "pcsx2/Host.h"
 
 #include <QtWidgets/QMessageBox>
 
-DebugSettingsWidget::DebugSettingsWidget(SettingsWindow* dialog, QWidget* parent)
-	: QWidget(parent)
-	, m_dialog(dialog)
-{
-	SettingsInterface* sif = dialog->getSettingsInterface();
+static const char* s_drop_indicators[] = {
+	QT_TRANSLATE_NOOP("DebugSettingsWidget", "Classic"),
+	QT_TRANSLATE_NOOP("DebugSettingsWidget", "Segmented"),
+	QT_TRANSLATE_NOOP("DebugSettingsWidget", "Minimalistic"),
+	nullptr,
+};
 
-	m_ui.setupUi(this);
+DebugSettingsWidget::DebugSettingsWidget(SettingsWindow* settings_dialog, QWidget* parent)
+	: SettingsWidget(settings_dialog, parent)
+{
+	SettingsInterface* sif = dialog()->getSettingsInterface();
+
+	m_user_interface_tab = setupTab(m_user_interface, tr("User Interface"));
+	setupTab(m_analysis, tr("Analysis"));
+	setupTab(m_gs, tr("GS"));
+	m_logging_tab = setupTab(m_logging, tr("Logging"));
 
 	//////////////////////////////////////////////////////////////////////////
 	// User Interface Settings
 	//////////////////////////////////////////////////////////////////////////
-	if (!dialog->isPerGameSettings())
+	if (!dialog()->isPerGameSettings())
 	{
-		m_user_interface_settings = new DebugUserInterfaceSettingsWidget(dialog);
-		m_ui.userInterfaceTabWidget->setLayout(new QVBoxLayout());
-		m_ui.userInterfaceTabWidget->layout()->addWidget(m_user_interface_settings);
+		SettingWidgetBinder::BindWidgetToIntSetting(
+			sif, m_user_interface.refreshInterval, "Debugger/UserInterface", "RefreshInterval", 1000);
+		connect(m_user_interface.refreshInterval, &QSpinBox::valueChanged, this, []() {
+			if (g_debugger_window)
+				g_debugger_window->updateFromSettings();
+		});
+		dialog()->registerWidgetHelp(
+			m_user_interface.refreshInterval, tr("Refresh Interval"), tr("1000ms"),
+			tr("The amount of time to wait between subsequent attempts to update the user interface to reflect the state "
+			   "of the virtual machine."));
+
+		SettingWidgetBinder::BindWidgetToBoolSetting(
+			sif, m_user_interface.showOnStartup, "Debugger/UserInterface", "ShowOnStartup", false);
+		dialog()->registerWidgetHelp(
+			m_user_interface.showOnStartup, tr("Show On Startup"), tr("Unchecked"),
+			tr("Open the debugger window automatically when PCSX2 starts."));
+
+		SettingWidgetBinder::BindWidgetToBoolSetting(
+			sif, m_user_interface.saveWindowGeometry, "Debugger/UserInterface", "SaveWindowGeometry", true);
+		dialog()->registerWidgetHelp(
+			m_user_interface.saveWindowGeometry, tr("Save Window Geometry"), tr("Checked"),
+			tr("Save the position and size of the debugger window when it is closed so that it can be restored later."));
+
+		SettingWidgetBinder::BindWidgetToEnumSetting(
+			sif,
+			m_user_interface.dropIndicator,
+			"Debugger/UserInterface",
+			"DropIndicatorStyle",
+			s_drop_indicators,
+			s_drop_indicators,
+			s_drop_indicators[0],
+			"DebugUserInterfaceSettingsWidget");
+		dialog()->registerWidgetHelp(
+			m_user_interface.dropIndicator, tr("Drop Indicator Style"), tr("Classic"),
+			tr("Choose how the drop indicators that appear when you drag dock windows in the debugger are styled. "
+			   "You will have to restart the debugger for this option to take effect."));
 	}
 	else
 	{
-		m_ui.debugTabs->removeTab(m_ui.debugTabs->indexOf(m_ui.userInterfaceTabWidget));
+		setTabVisible(m_user_interface_tab, false);
 	}
 
 	//////////////////////////////////////////////////////////////////////////
 	// Analysis Settings
 	//////////////////////////////////////////////////////////////////////////
+
 	SettingWidgetBinder::BindWidgetToEnumSetting(
-		sif, m_ui.analysisCondition, "Debugger/Analysis", "RunCondition",
+		sif, m_analysis.analysisCondition, "Debugger/Analysis", "RunCondition",
 		Pcsx2Config::DebugAnalysisOptions::RunConditionNames, DebugAnalysisCondition::IF_DEBUGGER_IS_OPEN);
 	SettingWidgetBinder::BindWidgetToBoolSetting(
-		sif, m_ui.generateSymbolsForIRXExportTables, "Debugger/Analysis", "GenerateSymbolsForIRXExports", true);
+		sif, m_analysis.generateSymbolsForIRXExportTables, "Debugger/Analysis", "GenerateSymbolsForIRXExports", true);
 
-	dialog->registerWidgetHelp(m_ui.analysisCondition, tr("Analyze Program"), tr("If Debugger Is Open"),
+	dialog()->registerWidgetHelp(m_analysis.analysisCondition, tr("Analyze Program"), tr("If Debugger Is Open"),
 		tr("Choose when the analysis passes should be run: Always (to save time when opening the debugger), If "
 		   "Debugger Is Open (to save memory if you never open the debugger), or Never."));
-	dialog->registerWidgetHelp(m_ui.generateSymbolsForIRXExportTables, tr("Generate Symbols for IRX Export Tables"), tr("Checked"),
+	dialog()->registerWidgetHelp(m_analysis.generateSymbolsForIRXExportTables, tr("Generate Symbols for IRX Export Tables"), tr("Checked"),
 		tr("Hook IRX module loading/unloading and generate symbols for exported functions on the fly."));
 
-	m_analysis_settings = new DebugAnalysisSettingsWidget(dialog);
+	m_analysis_settings = new DebugAnalysisSettingsWidget(dialog());
 
-	m_ui.analysisSettings->setLayout(new QVBoxLayout());
-	m_ui.analysisSettings->layout()->setContentsMargins(0, 0, 0, 0);
-	m_ui.analysisSettings->layout()->addWidget(m_analysis_settings);
+	m_analysis.analysisSettings->setLayout(new QVBoxLayout());
+	m_analysis.analysisSettings->layout()->setContentsMargins(0, 0, 0, 0);
+	m_analysis.analysisSettings->layout()->addWidget(m_analysis_settings);
 
 	//////////////////////////////////////////////////////////////////////////
 	// GS Settings
 	//////////////////////////////////////////////////////////////////////////
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.dumpGSData, "EmuCore/GS", "DumpGSData", false);
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.saveRT, "EmuCore/GS", "SaveRT", false);
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.saveFrame, "EmuCore/GS", "SaveFrame", false);
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.saveTexture, "EmuCore/GS", "SaveTexture", false);
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.saveDepth, "EmuCore/GS", "SaveDepth", false);
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.saveAlpha, "EmuCore/GS", "SaveAlpha", false);
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.saveInfo, "EmuCore/GS", "SaveInfo", false);
-	SettingWidgetBinder::BindWidgetToIntSetting(sif, m_ui.saveDrawStart, "EmuCore/GS", "SaveDrawStart", 0);
-	SettingWidgetBinder::BindWidgetToIntSetting(sif, m_ui.saveDrawCount, "EmuCore/GS", "SaveDrawCount", 5000);
-	SettingWidgetBinder::BindWidgetToIntSetting(sif, m_ui.saveFrameStart, "EmuCore/GS", "SaveFrameStart", 0);
-	SettingWidgetBinder::BindWidgetToIntSetting(sif, m_ui.saveFrameCount, "EmuCore/GS", "SaveFrameCount", 999999);
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_gs.dumpGSData, "EmuCore/GS", "DumpGSData", false);
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_gs.saveRT, "EmuCore/GS", "SaveRT", false);
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_gs.saveFrame, "EmuCore/GS", "SaveFrame", false);
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_gs.saveTexture, "EmuCore/GS", "SaveTexture", false);
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_gs.saveDepth, "EmuCore/GS", "SaveDepth", false);
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_gs.saveAlpha, "EmuCore/GS", "SaveAlpha", false);
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_gs.saveInfo, "EmuCore/GS", "SaveInfo", false);
+	SettingWidgetBinder::BindWidgetToIntSetting(sif, m_gs.saveDrawStart, "EmuCore/GS", "SaveDrawStart", 0);
+	SettingWidgetBinder::BindWidgetToIntSetting(sif, m_gs.saveDrawCount, "EmuCore/GS", "SaveDrawCount", 5000);
+	SettingWidgetBinder::BindWidgetToIntSetting(sif, m_gs.saveFrameStart, "EmuCore/GS", "SaveFrameStart", 0);
+	SettingWidgetBinder::BindWidgetToIntSetting(sif, m_gs.saveFrameCount, "EmuCore/GS", "SaveFrameCount", 999999);
 	SettingWidgetBinder::BindWidgetToFolderSetting(
-		sif, m_ui.hwDumpDirectory, m_ui.hwDumpBrowse, m_ui.hwDumpOpen, nullptr, "EmuCore/GS", "HWDumpDirectory", std::string(), false);
+		sif, m_gs.hwDumpDirectory, m_gs.hwDumpBrowse, m_gs.hwDumpOpen, nullptr, "EmuCore/GS", "HWDumpDirectory", std::string(), false);
 	SettingWidgetBinder::BindWidgetToFolderSetting(
-		sif, m_ui.swDumpDirectory, m_ui.swDumpBrowse, m_ui.swDumpOpen, nullptr, "EmuCore/GS", "SWDumpDirectory", std::string(), false);
+		sif, m_gs.swDumpDirectory, m_gs.swDumpBrowse, m_gs.swDumpOpen, nullptr, "EmuCore/GS", "SWDumpDirectory", std::string(), false);
 
-	connect(m_ui.dumpGSData, &QCheckBox::checkStateChanged, this, &DebugSettingsWidget::onDrawDumpingChanged);
+	connect(m_gs.dumpGSData, &QCheckBox::checkStateChanged, this, &DebugSettingsWidget::onDrawDumpingChanged);
 	onDrawDumpingChanged();
 
 #ifdef PCSX2_DEVBUILD
 	//////////////////////////////////////////////////////////////////////////
-	// Trace Logging Settings
+	// Logging Settings
 	//////////////////////////////////////////////////////////////////////////
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_logging.chkEnable, "EmuCore/TraceLog", "Enabled", false);
+	dialog()->registerWidgetHelp(m_logging.chkEnable, tr("Enable Trace Logging"), tr("Unchecked"), tr("Globally enable / disable trace logging."));
 
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.chkEnable, "EmuCore/TraceLog", "Enabled", false);
-	dialog->registerWidgetHelp(m_ui.chkEnable, tr("Enable Trace Logging"), tr("Unchecked"), tr("Globally enable / disable trace logging."));
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_logging.chkEEBIOS, "EmuCore/TraceLog", "EE.bios", false);
+	dialog()->registerWidgetHelp(m_logging.chkEEBIOS, tr("EE BIOS"), tr("Unchecked"), tr("Log SYSCALL and DECI2 activity."));
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_logging.chkEEMemory, "EmuCore/TraceLog", "EE.memory", false);
+	dialog()->registerWidgetHelp(m_logging.chkEEMemory, tr("EE Memory"), tr("Unchecked"), tr("Log memory access to unknown or unmapped EE memory."));
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_logging.chkEER5900, "EmuCore/TraceLog", "EE.r5900", false);
+	dialog()->registerWidgetHelp(m_logging.chkEER5900, tr("EE R5900"), tr("Unchecked"), tr("Log R5900 core instructions (excluding COPs). Requires modifying the PCSX2 source and enabling the interpreter."));
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_logging.chkEECOP0, "EmuCore/TraceLog", "EE.cop0", false);
+	dialog()->registerWidgetHelp(m_logging.chkEECOP0, tr("EE COP0"), tr("Unchecked"), tr("Log COP0 (MMU, CPU status, etc) instructions."));
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_logging.chkEECOP1, "EmuCore/TraceLog", "EE.cop1", false);
+	dialog()->registerWidgetHelp(m_logging.chkEECOP1, tr("EE COP1"), tr("Unchecked"), tr("Log COP1 (FPU) instructions."));
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_logging.chkEECOP2, "EmuCore/TraceLog", "EE.cop2", false);
+	dialog()->registerWidgetHelp(m_logging.chkEECOP2, tr("EE COP2"), tr("Unchecked"), tr("Log COP2 (VU0 Macro mode) instructions."));
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_logging.chkEECache, "EmuCore/TraceLog", "EE.cache", false);
+	dialog()->registerWidgetHelp(m_logging.chkEECache, tr("EE Cache"), tr("Unchecked"), tr("Log EE cache activity."));
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_logging.chkEEMMIO, "EmuCore/TraceLog", "EE.knownhw", false);
+	dialog()->registerWidgetHelp(m_logging.chkEEMMIO, tr("EE Known MMIO"), tr("Unchecked"), tr("Log known MMIO accesses."));
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_logging.chkEEUNKNWNMMIO, "EmuCore/TraceLog", "EE.unknownhw", false);
+	dialog()->registerWidgetHelp(m_logging.chkEEUNKNWNMMIO, tr("EE Unknown MMIO"), tr("Unchecked"), tr("Log unknown or unimplemented MMIO accesses."));
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_logging.chkEEDMARegs, "EmuCore/TraceLog", "EE.dmahw", false);
+	dialog()->registerWidgetHelp(m_logging.chkEEDMARegs, tr("EE DMA Registers"), tr("Unchecked"), tr("Log DMA-related MMIO accesses."));
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_logging.chkEEIPU, "EmuCore/TraceLog", "EE.ipu", false);
+	dialog()->registerWidgetHelp(m_logging.chkEEIPU, tr("EE IPU"), tr("Unchecked"), tr("Log IPU activity; MMIO, decoding operations, DMA status, etc."));
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_logging.chkEEGIFTags, "EmuCore/TraceLog", "EE.giftag", false);
+	dialog()->registerWidgetHelp(m_logging.chkEEGIFTags, tr("EE GIF Tags"), tr("Unchecked"), tr("Log GIFtag parsing activity."));
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_logging.chkEEVIFCodes, "EmuCore/TraceLog", "EE.vifcode", false);
+	dialog()->registerWidgetHelp(m_logging.chkEEVIFCodes, tr("EE VIF Codes"), tr("Unchecked"), tr("Log VIFcode processing; command, tag style, interrupts."));
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_logging.chkEEMSKPATH3, "EmuCore/TraceLog", "EE.mskpath3", false);
+	dialog()->registerWidgetHelp(m_logging.chkEEMSKPATH3, tr("EE MSKPATH3"), tr("Unchecked"), tr("Log Path3 Masking processing."));
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_logging.chkEEMFIFO, "EmuCore/TraceLog", "EE.spr", false);
+	dialog()->registerWidgetHelp(m_logging.chkEEMFIFO, tr("EE MFIFO"), tr("Unchecked"), tr("Log Scratchpad MFIFO activity."));
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_logging.chkEEDMACTRL, "EmuCore/TraceLog", "EE.dmac", false);
+	dialog()->registerWidgetHelp(m_logging.chkEEDMACTRL, tr("EE DMA Controller"), tr("Unchecked"), tr("Log DMA transfer activity. Stalls, bus right arbitration, etc."));
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_logging.chkEECounters, "EmuCore/TraceLog", "EE.counters", false);
+	dialog()->registerWidgetHelp(m_logging.chkEECounters, tr("EE Counters"), tr("Unchecked"), tr("Log all EE counters events and some counter register activity."));
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_logging.chkEEVIF, "EmuCore/TraceLog", "EE.vif", false);
+	dialog()->registerWidgetHelp(m_logging.chkEEVIF, tr("EE VIF"), tr("Unchecked"), tr("Log various VIF and VIFcode processing data."));
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_logging.chkEEGIF, "EmuCore/TraceLog", "EE.gif", false);
+	dialog()->registerWidgetHelp(m_logging.chkEEGIF, tr("EE GIF"), tr("Unchecked"), tr("Log various GIF and GIFtag parsing data."));
 
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.chkEEBIOS, "EmuCore/TraceLog", "EE.bios", false);
-	dialog->registerWidgetHelp(m_ui.chkEEBIOS, tr("EE BIOS"), tr("Unchecked"), tr("Log SYSCALL and DECI2 activity."));
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.chkEEMemory, "EmuCore/TraceLog", "EE.memory", false);
-	dialog->registerWidgetHelp(m_ui.chkEEMemory, tr("EE Memory"), tr("Unchecked"), tr("Log memory access to unknown or unmapped EE memory."));
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.chkEER5900, "EmuCore/TraceLog", "EE.r5900", false);
-	dialog->registerWidgetHelp(m_ui.chkEER5900, tr("EE R5900"), tr("Unchecked"), tr("Log R5900 core instructions (excluding COPs). Requires modifying the PCSX2 source and enabling the interpreter."));
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.chkEECOP0, "EmuCore/TraceLog", "EE.cop0", false);
-	dialog->registerWidgetHelp(m_ui.chkEECOP0, tr("EE COP0"), tr("Unchecked"), tr("Log COP0 (MMU, CPU status, etc) instructions."));
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.chkEECOP1, "EmuCore/TraceLog", "EE.cop1", false);
-	dialog->registerWidgetHelp(m_ui.chkEECOP1, tr("EE COP1"), tr("Unchecked"), tr("Log COP1 (FPU) instructions."));
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.chkEECOP2, "EmuCore/TraceLog", "EE.cop2", false);
-	dialog->registerWidgetHelp(m_ui.chkEECOP2, tr("EE COP2"), tr("Unchecked"), tr("Log COP2 (VU0 Macro mode) instructions."));
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.chkEECache, "EmuCore/TraceLog", "EE.cache", false);
-	dialog->registerWidgetHelp(m_ui.chkEECache, tr("EE Cache"), tr("Unchecked"), tr("Log EE cache activity."));
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.chkEEMMIO, "EmuCore/TraceLog", "EE.knownhw", false);
-	dialog->registerWidgetHelp(m_ui.chkEEMMIO, tr("EE Known MMIO"), tr("Unchecked"), tr("Log known MMIO accesses."));
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.chkEEUNKNWNMMIO, "EmuCore/TraceLog", "EE.unknownhw", false);
-	dialog->registerWidgetHelp(m_ui.chkEEUNKNWNMMIO, tr("EE Unknown MMIO"), tr("Unchecked"), tr("Log unknown or unimplemented MMIO accesses."));
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.chkEEDMARegs, "EmuCore/TraceLog", "EE.dmahw", false);
-	dialog->registerWidgetHelp(m_ui.chkEEDMARegs, tr("EE DMA Registers"), tr("Unchecked"), tr("Log DMA-related MMIO accesses."));
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.chkEEIPU, "EmuCore/TraceLog", "EE.ipu", false);
-	dialog->registerWidgetHelp(m_ui.chkEEIPU, tr("EE IPU"), tr("Unchecked"), tr("Log IPU activity; MMIO, decoding operations, DMA status, etc."));
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.chkEEGIFTags, "EmuCore/TraceLog", "EE.giftag", false);
-	dialog->registerWidgetHelp(m_ui.chkEEGIFTags, tr("EE GIF Tags"), tr("Unchecked"), tr("Log GIFtag parsing activity."));
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.chkEEVIFCodes, "EmuCore/TraceLog", "EE.vifcode", false);
-	dialog->registerWidgetHelp(m_ui.chkEEVIFCodes, tr("EE VIF Codes"), tr("Unchecked"), tr("Log VIFcode processing; command, tag style, interrupts."));
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.chkEEMSKPATH3, "EmuCore/TraceLog", "EE.mskpath3", false);
-	dialog->registerWidgetHelp(m_ui.chkEEMSKPATH3, tr("EE MSKPATH3"), tr("Unchecked"), tr("Log Path3 Masking processing."));
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.chkEEMFIFO, "EmuCore/TraceLog", "EE.spr", false);
-	dialog->registerWidgetHelp(m_ui.chkEEMFIFO, tr("EE MFIFO"), tr("Unchecked"), tr("Log Scratchpad MFIFO activity."));
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.chkEEDMACTRL, "EmuCore/TraceLog", "EE.dmac", false);
-	dialog->registerWidgetHelp(m_ui.chkEEDMACTRL, tr("EE DMA Controller"), tr("Unchecked"), tr("Log DMA transfer activity. Stalls, bus right arbitration, etc."));
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.chkEECounters, "EmuCore/TraceLog", "EE.counters", false);
-	dialog->registerWidgetHelp(m_ui.chkEECounters, tr("EE Counters"), tr("Unchecked"), tr("Log all EE counters events and some counter register activity."));
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.chkEEVIF, "EmuCore/TraceLog", "EE.vif", false);
-	dialog->registerWidgetHelp(m_ui.chkEEVIF, tr("EE VIF"), tr("Unchecked"), tr("Log various VIF and VIFcode processing data."));
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.chkEEGIF, "EmuCore/TraceLog", "EE.gif", false);
-	dialog->registerWidgetHelp(m_ui.chkEEGIF, tr("EE GIF"), tr("Unchecked"), tr("Log various GIF and GIFtag parsing data."));
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_logging.chkIOPBIOS, "EmuCore/TraceLog", "IOP.Bios", false);
+	dialog()->registerWidgetHelp(m_logging.chkIOPBIOS, tr("IOP BIOS"), tr("Unchecked"), tr("Log SYSCALL and IRX activity."));
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_logging.chkIOPMemcards, "EmuCore/TraceLog", "IOP.memcards", false);
+	dialog()->registerWidgetHelp(m_logging.chkIOPMemcards, tr("IOP Memcards"), tr("Unchecked"), tr("Log memory card activity. Reads, Writes, erases, etc."));
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_logging.chkIOPR3000A, "EmuCore/TraceLog", "IOP.r3000a", false);
+	dialog()->registerWidgetHelp(m_logging.chkIOPR3000A, tr("IOP R3000A"), tr("Unchecked"), tr("Log R3000A core instructions (excluding COPs)."));
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_logging.chkIOPCOP2, "EmuCore/TraceLog", "IOP.cop2", false);
+	dialog()->registerWidgetHelp(m_logging.chkIOPCOP2, tr("IOP COP2"), tr("Unchecked"), tr("Log IOP GPU co-processor instructions."));
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_logging.chkIOPMMIO, "EmuCore/TraceLog", "IOP.knownhw", false);
+	dialog()->registerWidgetHelp(m_logging.chkIOPMMIO, tr("IOP Known MMIO"), tr("Unchecked"), tr("Log known MMIO accesses."));
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_logging.chkIOPUNKNWNMMIO, "EmuCore/TraceLog", "IOP.unknownhw", false);
+	dialog()->registerWidgetHelp(m_logging.chkIOPUNKNWNMMIO, tr("IOP Unknown MMIO"), tr("Unchecked"), tr("Log unknown or unimplemented MMIO accesses."));
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_logging.chkIOPDMARegs, "EmuCore/TraceLog", "IOP.dmahw", false);
+	dialog()->registerWidgetHelp(m_logging.chkIOPDMARegs, tr("IOP DMA Registers"), tr("Unchecked"), tr("Log DMA-related MMIO accesses."));
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_logging.chkIOPPad, "EmuCore/TraceLog", "IOP.pad", false);
+	dialog()->registerWidgetHelp(m_logging.chkIOPPad, tr("IOP PAD"), tr("Unchecked"), tr("Log PAD activity."));
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_logging.chkIOPDMACTRL, "EmuCore/TraceLog", "IOP.dmac", false);
+	dialog()->registerWidgetHelp(m_logging.chkIOPDMACTRL, tr("IOP DMA Controller"), tr("Unchecked"), tr("Log DMA transfer activity. Stalls, bus right arbitration, etc."));
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_logging.chkIOPCounters, "EmuCore/TraceLog", "IOP.counters", false);
+	dialog()->registerWidgetHelp(m_logging.chkIOPCounters, tr("IOP Counters"), tr("Unchecked"), tr("Log all IOP counters events and some counter register activity."));
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_logging.chkIOPCDVD, "EmuCore/TraceLog", "IOP.cdvd", false);
+	dialog()->registerWidgetHelp(m_logging.chkIOPCDVD, tr("IOP CDVD"), tr("Unchecked"), tr("Log CDVD hardware activity."));
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_logging.chkIOPMDEC, "EmuCore/TraceLog", "IOP.mdec", false);
+	dialog()->registerWidgetHelp(m_logging.chkIOPMDEC, tr("IOP MDEC"), tr("Unchecked"), tr("Log Motion (FMV) Decoder hardware unit activity."));
 
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.chkIOPBIOS, "EmuCore/TraceLog", "IOP.Bios", false);
-	dialog->registerWidgetHelp(m_ui.chkIOPBIOS, tr("IOP BIOS"), tr("Unchecked"), tr("Log SYSCALL and IRX activity."));
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.chkIOPMemcards, "EmuCore/TraceLog", "IOP.memcards", false);
-	dialog->registerWidgetHelp(m_ui.chkIOPMemcards, tr("IOP Memcards"), tr("Unchecked"), tr("Log memory card activity. Reads, Writes, erases, etc."));
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.chkIOPR3000A, "EmuCore/TraceLog", "IOP.r3000a", false);
-	dialog->registerWidgetHelp(m_ui.chkIOPR3000A, tr("IOP R3000A"), tr("Unchecked"), tr("Log R3000A core instructions (excluding COPs)."));
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.chkIOPCOP2, "EmuCore/TraceLog", "IOP.cop2", false);
-	dialog->registerWidgetHelp(m_ui.chkIOPCOP2, tr("IOP COP2"), tr("Unchecked"), tr("Log IOP GPU co-processor instructions."));
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.chkIOPMMIO, "EmuCore/TraceLog", "IOP.knownhw", false);
-	dialog->registerWidgetHelp(m_ui.chkIOPMMIO, tr("IOP Known MMIO"), tr("Unchecked"), tr("Log known MMIO accesses."));
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.chkIOPUNKNWNMMIO, "EmuCore/TraceLog", "IOP.unknownhw", false);
-	dialog->registerWidgetHelp(m_ui.chkIOPUNKNWNMMIO, tr("IOP Unknown MMIO"), tr("Unchecked"), tr("Log unknown or unimplemented MMIO accesses."));
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.chkIOPDMARegs, "EmuCore/TraceLog", "IOP.dmahw", false);
-	dialog->registerWidgetHelp(m_ui.chkIOPDMARegs, tr("IOP DMA Registers"), tr("Unchecked"), tr("Log DMA-related MMIO accesses."));
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.chkIOPPad, "EmuCore/TraceLog", "IOP.pad", false);
-	dialog->registerWidgetHelp(m_ui.chkIOPPad, tr("IOP PAD"), tr("Unchecked"), tr("Log PAD activity."));
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.chkIOPDMACTRL, "EmuCore/TraceLog", "IOP.dmac", false);
-	dialog->registerWidgetHelp(m_ui.chkIOPDMACTRL, tr("IOP DMA Controller"), tr("Unchecked"), tr("Log DMA transfer activity. Stalls, bus right arbitration, etc."));
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.chkIOPCounters, "EmuCore/TraceLog", "IOP.counters", false);
-	dialog->registerWidgetHelp(m_ui.chkIOPCounters, tr("IOP Counters"), tr("Unchecked"), tr("Log all IOP counters events and some counter register activity."));
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.chkIOPCDVD, "EmuCore/TraceLog", "IOP.cdvd", false);
-	dialog->registerWidgetHelp(m_ui.chkIOPCDVD, tr("IOP CDVD"), tr("Unchecked"), tr("Log CDVD hardware activity."));
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.chkIOPMDEC, "EmuCore/TraceLog", "IOP.mdec", false);
-	dialog->registerWidgetHelp(m_ui.chkIOPMDEC, tr("IOP MDEC"), tr("Unchecked"), tr("Log Motion (FMV) Decoder hardware unit activity."));
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_logging.chkEESIF, "EmuCore/TraceLog", "MISC.sif", false);
+	dialog()->registerWidgetHelp(m_logging.chkEESIF, tr("EE SIF"), tr("Unchecked"), tr("Log SIF (EE <-> IOP) activity."));
 
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.chkEESIF, "EmuCore/TraceLog", "MISC.sif", false);
-	dialog->registerWidgetHelp(m_ui.chkEESIF, tr("EE SIF"), tr("Unchecked"), tr("Log SIF (EE <-> IOP) activity."));
-
-	connect(m_ui.chkEnable, &QCheckBox::checkStateChanged, this, &DebugSettingsWidget::onLoggingEnableChanged);
+	connect(m_logging.chkEnable, &QCheckBox::checkStateChanged, this, &DebugSettingsWidget::onLoggingEnableChanged);
 	onLoggingEnableChanged();
-
 #else
-	m_ui.debugTabs->removeTab(m_ui.debugTabs->indexOf(m_ui.traceLogTabWidget));
+	setTabVisible(m_logging_tab, false);
 #endif
 }
 
@@ -165,64 +206,64 @@ DebugSettingsWidget::~DebugSettingsWidget() = default;
 
 void DebugSettingsWidget::onDrawDumpingChanged()
 {
-	const bool enabled = m_dialog->getEffectiveBoolValue("EmuCore/GS", "DumpGSData", false);
-	m_ui.saveRT->setEnabled(enabled);
-	m_ui.saveFrame->setEnabled(enabled);
-	m_ui.saveTexture->setEnabled(enabled);
-	m_ui.saveDepth->setEnabled(enabled);
-	m_ui.saveAlpha->setEnabled(enabled);
-	m_ui.saveInfo->setEnabled(enabled);
-	m_ui.saveDrawStart->setEnabled(enabled);
-	m_ui.saveDrawCount->setEnabled(enabled);
-	m_ui.saveFrameStart->setEnabled(enabled);
-	m_ui.saveFrameCount->setEnabled(enabled);
-	m_ui.hwDumpDirectory->setEnabled(enabled);
-	m_ui.hwDumpBrowse->setEnabled(enabled);
-	m_ui.hwDumpOpen->setEnabled(enabled);
-	m_ui.swDumpDirectory->setEnabled(enabled);
-	m_ui.swDumpBrowse->setEnabled(enabled);
-	m_ui.swDumpOpen->setEnabled(enabled);
+	const bool enabled = dialog()->getEffectiveBoolValue("EmuCore/GS", "DumpGSData", false);
+	m_gs.saveRT->setEnabled(enabled);
+	m_gs.saveFrame->setEnabled(enabled);
+	m_gs.saveTexture->setEnabled(enabled);
+	m_gs.saveDepth->setEnabled(enabled);
+	m_gs.saveAlpha->setEnabled(enabled);
+	m_gs.saveInfo->setEnabled(enabled);
+	m_gs.saveDrawStart->setEnabled(enabled);
+	m_gs.saveDrawCount->setEnabled(enabled);
+	m_gs.saveFrameStart->setEnabled(enabled);
+	m_gs.saveFrameCount->setEnabled(enabled);
+	m_gs.hwDumpDirectory->setEnabled(enabled);
+	m_gs.hwDumpBrowse->setEnabled(enabled);
+	m_gs.hwDumpOpen->setEnabled(enabled);
+	m_gs.swDumpDirectory->setEnabled(enabled);
+	m_gs.swDumpBrowse->setEnabled(enabled);
+	m_gs.swDumpOpen->setEnabled(enabled);
 }
 
 #ifdef PCSX2_DEVBUILD
 void DebugSettingsWidget::onLoggingEnableChanged()
 {
-	const bool enabled = m_dialog->getEffectiveBoolValue("EmuCore/TraceLog", "Enabled", false);
+	const bool enabled = dialog()->getEffectiveBoolValue("EmuCore/TraceLog", "Enabled", false);
 
-	m_ui.chkEEBIOS->setEnabled(enabled);
-	m_ui.chkEEMemory->setEnabled(enabled);
-	m_ui.chkEER5900->setEnabled(enabled);
-	m_ui.chkEECOP0->setEnabled(enabled);
-	m_ui.chkEECOP1->setEnabled(enabled);
-	m_ui.chkEECOP2->setEnabled(enabled);
-	m_ui.chkEECache->setEnabled(enabled);
-	m_ui.chkEEMMIO->setEnabled(enabled);
-	m_ui.chkEEUNKNWNMMIO->setEnabled(enabled);
-	m_ui.chkEEDMARegs->setEnabled(enabled);
-	m_ui.chkEEIPU->setEnabled(enabled);
-	m_ui.chkEEGIFTags->setEnabled(enabled);
-	m_ui.chkEEVIFCodes->setEnabled(enabled);
-	m_ui.chkEEMSKPATH3->setEnabled(enabled);
-	m_ui.chkEEMFIFO->setEnabled(enabled);
-	m_ui.chkEEDMACTRL->setEnabled(enabled);
-	m_ui.chkEECounters->setEnabled(enabled);
-	m_ui.chkEEVIF->setEnabled(enabled);
-	m_ui.chkEEGIF->setEnabled(enabled);
-	m_ui.chkEESIF->setEnabled(enabled);
+	m_logging.chkEEBIOS->setEnabled(enabled);
+	m_logging.chkEEMemory->setEnabled(enabled);
+	m_logging.chkEER5900->setEnabled(enabled);
+	m_logging.chkEECOP0->setEnabled(enabled);
+	m_logging.chkEECOP1->setEnabled(enabled);
+	m_logging.chkEECOP2->setEnabled(enabled);
+	m_logging.chkEECache->setEnabled(enabled);
+	m_logging.chkEEMMIO->setEnabled(enabled);
+	m_logging.chkEEUNKNWNMMIO->setEnabled(enabled);
+	m_logging.chkEEDMARegs->setEnabled(enabled);
+	m_logging.chkEEIPU->setEnabled(enabled);
+	m_logging.chkEEGIFTags->setEnabled(enabled);
+	m_logging.chkEEVIFCodes->setEnabled(enabled);
+	m_logging.chkEEMSKPATH3->setEnabled(enabled);
+	m_logging.chkEEMFIFO->setEnabled(enabled);
+	m_logging.chkEEDMACTRL->setEnabled(enabled);
+	m_logging.chkEECounters->setEnabled(enabled);
+	m_logging.chkEEVIF->setEnabled(enabled);
+	m_logging.chkEEGIF->setEnabled(enabled);
+	m_logging.chkEESIF->setEnabled(enabled);
 
-	m_ui.chkIOPBIOS->setEnabled(enabled);
-	m_ui.chkIOPMemcards->setEnabled(enabled);
-	m_ui.chkIOPR3000A->setEnabled(enabled);
-	m_ui.chkIOPCOP2->setEnabled(enabled);
-	m_ui.chkIOPMMIO->setEnabled(enabled);
-	m_ui.chkIOPUNKNWNMMIO->setEnabled(enabled);
-	m_ui.chkIOPDMARegs->setEnabled(enabled);
-	m_ui.chkIOPMemcards->setEnabled(enabled);
-	m_ui.chkIOPPad->setEnabled(enabled);
-	m_ui.chkIOPDMACTRL->setEnabled(enabled);
-	m_ui.chkIOPCounters->setEnabled(enabled);
-	m_ui.chkIOPCDVD->setEnabled(enabled);
-	m_ui.chkIOPMDEC->setEnabled(enabled);
+	m_logging.chkIOPBIOS->setEnabled(enabled);
+	m_logging.chkIOPMemcards->setEnabled(enabled);
+	m_logging.chkIOPR3000A->setEnabled(enabled);
+	m_logging.chkIOPCOP2->setEnabled(enabled);
+	m_logging.chkIOPMMIO->setEnabled(enabled);
+	m_logging.chkIOPUNKNWNMMIO->setEnabled(enabled);
+	m_logging.chkIOPDMARegs->setEnabled(enabled);
+	m_logging.chkIOPMemcards->setEnabled(enabled);
+	m_logging.chkIOPPad->setEnabled(enabled);
+	m_logging.chkIOPDMACTRL->setEnabled(enabled);
+	m_logging.chkIOPCounters->setEnabled(enabled);
+	m_logging.chkIOPCDVD->setEnabled(enabled);
+	m_logging.chkIOPMDEC->setEnabled(enabled);
 
 	g_emu_thread->applySettings();
 }

pcsx2-qt/Settings/DebugSettingsWidget.h

@@ -3,20 +3,22 @@
 
 #pragma once
 
-#include <QtWidgets/QWidget>
+#include "ui_DebugAnalysisSettingsTab.h"
+#include "ui_DebugGSSettingsTab.h"
+#include "ui_DebugLoggingSettingsTab.h"
+#include "ui_DebugUserInterfaceSettingsTab.h"
 
-#include "ui_DebugSettingsWidget.h"
+#include "SettingsWidget.h"
 
-class SettingsWindow;
 class DebugUserInterfaceSettingsWidget;
 class DebugAnalysisSettingsWidget;
 
-class DebugSettingsWidget : public QWidget
+class DebugSettingsWidget : public SettingsWidget
 {
 	Q_OBJECT
 
 public:
-	DebugSettingsWidget(SettingsWindow* dialog, QWidget* parent);
+	DebugSettingsWidget(SettingsWindow* settings_dialog, QWidget* parent);
 	~DebugSettingsWidget();
 
 private Q_SLOTS:
@@ -26,10 +28,14 @@ private Q_SLOTS:
 #endif
 
 private:
-	SettingsWindow* m_dialog;
-
 	DebugUserInterfaceSettingsWidget* m_user_interface_settings;
 	DebugAnalysisSettingsWidget* m_analysis_settings;
 
-	Ui::DebugSettingsWidget m_ui;
+	Ui::DebugUserInterfaceSettingsTab m_user_interface;
+	Ui::DebugAnalysisSettingsTab m_analysis;
+	Ui::DebugGSSettingsTab m_gs;
+	Ui::DebugLoggingSettingsTab m_logging;
+
+	QWidget* m_user_interface_tab = nullptr;
+	QWidget* m_logging_tab = nullptr;
 };

pcsx2-qt/Settings/DebugSettingsWidget.ui

@@ -1,642 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DebugSettingsWidget</class>
- <widget class="QWidget" name="DebugSettingsWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>647</width>
-    <height>501</height>
-   </rect>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QTabWidget" name="debugTabs">
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <property name="documentMode">
-      <bool>true</bool>
-     </property>
-     <widget class="QWidget" name="userInterfaceTabWidget">
-      <attribute name="title">
-       <string>User Interface</string>
-      </attribute>
-     </widget>
-     <widget class="QWidget" name="analysisTabWidget">
-      <attribute name="title">
-       <string>Analysis</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_6">
-       <property name="leftMargin">
-        <number>0</number>
-       </property>
-       <property name="topMargin">
-        <number>0</number>
-       </property>
-       <property name="rightMargin">
-        <number>0</number>
-       </property>
-       <property name="bottomMargin">
-        <number>0</number>
-       </property>
-       <item>
-        <widget class="QScrollArea" name="analysisScrollArea">
-         <property name="widgetResizable">
-          <bool>true</bool>
-         </property>
-         <widget class="QWidget" name="analysisScrollAreaContents">
-          <property name="geometry">
-           <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>645</width>
-            <height>469</height>
-           </rect>
-          </property>
-          <layout class="QVBoxLayout" name="verticalLayout_4">
-           <item>
-            <widget class="QLabel" name="analysisLabel">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="text">
-              <string>These settings control what and when analysis passes should be performed on the program running in the virtual machine so that the resultant information can be shown in the debugger.</string>
-             </property>
-             <property name="wordWrap">
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QGroupBox" name="analysisGroupBox">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="title">
-              <string>Analysis</string>
-             </property>
-             <layout class="QVBoxLayout" name="verticalLayout_5">
-              <item>
-               <layout class="QFormLayout" name="analysisForm">
-                <item row="0" column="0">
-                 <widget class="QLabel" name="analysisConditionLabel">
-                  <property name="text">
-                   <string>Automatically Analyze Program:</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="0" column="1">
-                 <widget class="QComboBox" name="analysisCondition">
-                  <item>
-                   <property name="text">
-                    <string>Always</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>If Debugger Is Open</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>Never</string>
-                   </property>
-                  </item>
-                 </widget>
-                </item>
-               </layout>
-              </item>
-              <item>
-               <widget class="QCheckBox" name="generateSymbolsForIRXExportTables">
-                <property name="text">
-                 <string>Generate Symbols For IRX Exports</string>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </widget>
-           </item>
-           <item>
-            <widget class="QWidget" name="analysisSettings" native="true">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="gsTabWidget">
-      <attribute name="title">
-       <string>GS</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_2">
-       <item>
-        <widget class="QGroupBox" name="drawDumpingGroupBox">
-         <property name="title">
-          <string>Draw Dumping</string>
-         </property>
-         <layout class="QFormLayout" name="formLayout">
-          <item row="0" column="0" colspan="2">
-           <layout class="QGridLayout" name="gridLayout">
-            <item row="0" column="0">
-             <widget class="QCheckBox" name="dumpGSData">
-              <property name="text">
-               <string>Dump GS Draws</string>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="1">
-             <widget class="QCheckBox" name="saveRT">
-              <property name="text">
-               <string>Save RT</string>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="0">
-             <widget class="QCheckBox" name="saveFrame">
-              <property name="text">
-               <string>Save Frame</string>
-              </property>
-             </widget>
-            </item>
-            <item row="2" column="1">
-             <widget class="QCheckBox" name="saveTexture">
-              <property name="text">
-               <string>Save Texture</string>
-              </property>
-             </widget>
-            </item>
-            <item row="2" column="0">
-             <widget class="QCheckBox" name="saveDepth">
-              <property name="text">
-               <string>Save Depth</string>
-              </property>
-             </widget>
-            </item>
-            <item row="3" column="0">
-             <widget class="QCheckBox" name="saveAlpha">
-              <property name="text">
-               <string>Save Alpha</string>
-              </property>
-             </widget>
-            </item>
-            <item row="3" column="1">
-             <widget class="QCheckBox" name="saveInfo">
-              <property name="text">
-               <string>Save Info</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="label_1">
-            <property name="text">
-             <string>Save Draw Start:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QSpinBox" name="saveDrawStart">
-            <property name="maximum">
-             <number>99999999</number>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="label_2">
-            <property name="text">
-             <string>Save Draw Count:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1">
-           <widget class="QSpinBox" name="saveDrawCount">
-            <property name="minimum">
-             <number>1</number>
-            </property>
-            <property name="maximum">
-             <number>99999999</number>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="0">
-           <widget class="QLabel" name="label_3">
-            <property name="text">
-             <string>Save Frame Start:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="1">
-           <widget class="QSpinBox" name="saveFrameStart">
-            <property name="maximum">
-             <number>99999999</number>
-            </property>
-           </widget>
-          </item>
-          <item row="4" column="0">
-           <widget class="QLabel" name="label_4">
-            <property name="text">
-             <string>Save Frame Count:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="4" column="1">
-           <widget class="QSpinBox" name="saveFrameCount">
-            <property name="minimum">
-             <number>1</number>
-            </property>
-            <property name="maximum">
-             <number>99999999</number>
-            </property>
-           </widget>
-          </item>
-          <item row="5" column="0">
-           <widget class="QLabel" name="label_5">
-            <property name="text">
-             <string>Hardware Dump Directory:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="6" column="0">
-           <widget class="QLabel" name="label_6">
-            <property name="text">
-             <string>Software Dump Directory:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="5" column="1">
-           <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,0,0">
-            <item>
-             <widget class="QLineEdit" name="hwDumpDirectory"/>
-            </item>
-            <item>
-             <widget class="QPushButton" name="hwDumpBrowse">
-              <property name="text">
-               <string>Browse...</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QPushButton" name="hwDumpOpen">
-              <property name="text">
-               <string>Open...</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item row="6" column="1">
-           <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="1,0,0">
-            <item>
-             <widget class="QLineEdit" name="swDumpDirectory"/>
-            </item>
-            <item>
-             <widget class="QPushButton" name="swDumpBrowse">
-              <property name="text">
-               <string>Browse...</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QPushButton" name="swDumpOpen">
-              <property name="text">
-               <string>Open...</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-         </layout>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="traceLogTabWidget">
-      <attribute name="title">
-       <string>Trace Logging</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_8">
-       <item>
-        <widget class="QCheckBox" name="chkEnable">
-         <property name="text">
-          <string>Enable</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <layout class="QHBoxLayout" name="traceLogHorizontalLayout">
-         <item>
-          <widget class="QGroupBox" name="grpEELogging">
-           <property name="title">
-            <string>EE</string>
-           </property>
-           <layout class="QVBoxLayout" name="verticalLayout_3">
-            <item>
-             <layout class="QGridLayout" name="grpEELoggingGrid">
-              <item row="4" column="1">
-               <widget class="QCheckBox" name="chkEEDMACTRL">
-                <property name="text">
-                 <string>DMA Control</string>
-                </property>
-               </widget>
-              </item>
-              <item row="6" column="1">
-               <widget class="QCheckBox" name="chkEEMFIFO">
-                <property name="text">
-                 <string>SPR / MFIFO</string>
-                </property>
-               </widget>
-              </item>
-              <item row="9" column="0">
-               <widget class="QCheckBox" name="chkEEVIF">
-                <property name="text">
-                 <string>VIF</string>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="1">
-               <widget class="QCheckBox" name="chkEECOP1">
-                <property name="text">
-                 <string>COP1 (FPU)</string>
-                </property>
-               </widget>
-              </item>
-              <item row="6" column="0">
-               <widget class="QCheckBox" name="chkEEMSKPATH3">
-                <property name="text">
-                 <string>MSKPATH3</string>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="0">
-               <widget class="QCheckBox" name="chkEECache">
-                <property name="text">
-                 <string>Cache</string>
-                </property>
-               </widget>
-              </item>
-              <item row="9" column="1">
-               <widget class="QCheckBox" name="chkEEGIF">
-                <property name="text">
-                 <string>GIF</string>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="1">
-               <widget class="QCheckBox" name="chkEER5900">
-                <property name="text">
-                 <string>R5900</string>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="0">
-               <widget class="QCheckBox" name="chkEECOP0">
-                <property name="text">
-                 <string>COP0</string>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="0">
-               <widget class="QCheckBox" name="chkEEMMIO">
-                <property name="text">
-                 <string>HW Regs (MMIO)</string>
-                </property>
-               </widget>
-              </item>
-              <item row="7" column="1">
-               <widget class="QCheckBox" name="chkEECounters">
-                <property name="text">
-                 <string>Counters</string>
-                </property>
-               </widget>
-              </item>
-              <item row="10" column="1">
-               <widget class="QCheckBox" name="chkEESIF">
-                <property name="text">
-                 <string>SIF</string>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="0">
-               <widget class="QCheckBox" name="chkEECOP2">
-                <property name="text">
-                 <string>COP2 (VU0 Macro)</string>
-                </property>
-               </widget>
-              </item>
-              <item row="8" column="0">
-               <widget class="QCheckBox" name="chkEEVIFCodes">
-                <property name="text">
-                 <string>VIFCodes</string>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="1">
-               <widget class="QCheckBox" name="chkEEMemory">
-                <property name="text">
-                 <string>Memory</string>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="1">
-               <widget class="QCheckBox" name="chkEEUNKNWNMMIO">
-                <property name="text">
-                 <string>Unknown MMIO</string>
-                </property>
-               </widget>
-              </item>
-              <item row="7" column="0">
-               <widget class="QCheckBox" name="chkEEIPU">
-                <property name="text">
-                 <string>IPU</string>
-                </property>
-               </widget>
-              </item>
-              <item row="10" column="0">
-               <widget class="QCheckBox" name="chkEEBIOS">
-                <property name="text">
-                 <string>BIOS</string>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="0">
-               <widget class="QCheckBox" name="chkEEDMARegs">
-                <property name="text">
-                 <string>DMA Registers</string>
-                </property>
-               </widget>
-              </item>
-              <item row="8" column="1">
-               <widget class="QCheckBox" name="chkEEGIFTags">
-                <property name="text">
-                 <string>GIFTags</string>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </item>
-            <item>
-             <spacer name="eeLoggingSpacer">
-              <property name="orientation">
-               <enum>Qt::Vertical</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>20</width>
-                <height>0</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
-          </widget>
-         </item>
-         <item>
-          <widget class="QGroupBox" name="grpIOPLogging">
-           <property name="title">
-            <string>IOP</string>
-           </property>
-           <layout class="QVBoxLayout" name="verticalLayout_7">
-            <item>
-             <layout class="QGridLayout" name="grpIOPLoggingGrid">
-              <item row="4" column="0">
-               <widget class="QCheckBox" name="chkIOPCounters">
-                <property name="text">
-                 <string>Counters</string>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="1">
-               <widget class="QCheckBox" name="chkIOPUNKNWNMMIO">
-                <property name="text">
-                 <string>Unknown MMIO</string>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="0">
-               <widget class="QCheckBox" name="chkIOPMMIO">
-                <property name="text">
-                 <string>HW Regs (MMIO)</string>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="1">
-               <widget class="QCheckBox" name="chkIOPCDVD">
-                <property name="text">
-                 <string>CDVD</string>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="1">
-               <widget class="QCheckBox" name="chkIOPR3000A">
-                <property name="text">
-                 <string>R3000A</string>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="0">
-               <widget class="QCheckBox" name="chkIOPMemcards">
-                <property name="text">
-                 <string>Memcards</string>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="0">
-               <widget class="QCheckBox" name="chkIOPDMARegs">
-                <property name="text">
-                 <string>DMA Registers</string>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="1">
-               <widget class="QCheckBox" name="chkIOPPad">
-                <property name="text">
-                 <string>Pad</string>
-                </property>
-               </widget>
-              </item>
-              <item row="5" column="1">
-               <widget class="QCheckBox" name="chkIOPBIOS">
-                <property name="text">
-                 <string>BIOS</string>
-                </property>
-               </widget>
-              </item>
-              <item row="5" column="0">
-               <widget class="QCheckBox" name="chkIOPMDEC">
-                <property name="text">
-                 <string>MDEC</string>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="1">
-               <widget class="QCheckBox" name="chkIOPDMACTRL">
-                <property name="text">
-                 <string>DMA Control</string>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="0">
-               <widget class="QCheckBox" name="chkIOPCOP2">
-                <property name="text">
-                 <string>COP2 (GPU)</string>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </item>
-            <item>
-             <spacer name="iopLoggingSpacer">
-              <property name="orientation">
-               <enum>Qt::Vertical</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>20</width>
-                <height>40</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
-          </widget>
-         </item>
-        </layout>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>

pcsx2-qt/Settings/DebugUserInterfaceSettingsTab.ui

@@ -1,31 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>DebugUserInterfaceSettingsWidget</class>
- <widget class="QWidget" name="DebugUserInterfaceSettingsWidget">
+ <class>DebugUserInterfaceSettingsTab</class>
+ <widget class="QWidget" name="DebugUserInterfaceSettingsTab">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>500</width>
-    <height>750</height>
+    <width>700</width>
+    <height>600</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string/>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
    <item>
     <widget class="QGroupBox" name="windowGroup">
      <property name="sizePolicy">
@@ -117,7 +105,7 @@
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
-       <height>40</height>
+       <height>0</height>
       </size>
      </property>
     </spacer>

pcsx2-qt/Settings/DebugUserInterfaceSettingsWidget.cpp

@@ -1,59 +0,0 @@
-// SPDX-FileCopyrightText: 2002-2025 PCSX2 Dev Team
-// SPDX-License-Identifier: GPL-3.0+
-
-#include "DebugUserInterfaceSettingsWidget.h"
-
-#include "SettingWidgetBinder.h"
-#include "Debugger/DebuggerWindow.h"
-
-static const char* s_drop_indicators[] = {
-	QT_TRANSLATE_NOOP("DebugUserInterfaceSettingsWidget", "Classic"),
-	QT_TRANSLATE_NOOP("DebugUserInterfaceSettingsWidget", "Segmented"),
-	QT_TRANSLATE_NOOP("DebugUserInterfaceSettingsWidget", "Minimalistic"),
-	nullptr,
-};
-
-DebugUserInterfaceSettingsWidget::DebugUserInterfaceSettingsWidget(SettingsWindow* dialog, QWidget* parent)
-	: QWidget(parent)
-{
-	SettingsInterface* sif = dialog->getSettingsInterface();
-
-	m_ui.setupUi(this);
-
-	SettingWidgetBinder::BindWidgetToIntSetting(
-		sif, m_ui.refreshInterval, "Debugger/UserInterface", "RefreshInterval", 1000);
-	connect(m_ui.refreshInterval, &QSpinBox::valueChanged, this, []() {
-		if (g_debugger_window)
-			g_debugger_window->updateFromSettings();
-	});
-	dialog->registerWidgetHelp(
-		m_ui.refreshInterval, tr("Refresh Interval"), tr("1000ms"),
-		tr("The amount of time to wait between subsequent attempts to update the user interface to reflect the state "
-		   "of the virtual machine."));
-
-	SettingWidgetBinder::BindWidgetToBoolSetting(
-		sif, m_ui.showOnStartup, "Debugger/UserInterface", "ShowOnStartup", false);
-	dialog->registerWidgetHelp(
-		m_ui.showOnStartup, tr("Show On Startup"), tr("Unchecked"),
-		tr("Open the debugger window automatically when PCSX2 starts."));
-
-	SettingWidgetBinder::BindWidgetToBoolSetting(
-		sif, m_ui.saveWindowGeometry, "Debugger/UserInterface", "SaveWindowGeometry", true);
-	dialog->registerWidgetHelp(
-		m_ui.saveWindowGeometry, tr("Save Window Geometry"), tr("Checked"),
-		tr("Save the position and size of the debugger window when it is closed so that it can be restored later."));
-
-	SettingWidgetBinder::BindWidgetToEnumSetting(
-		sif,
-		m_ui.dropIndicator,
-		"Debugger/UserInterface",
-		"DropIndicatorStyle",
-		s_drop_indicators,
-		s_drop_indicators,
-		s_drop_indicators[0],
-		"DebugUserInterfaceSettingsWidget");
-	dialog->registerWidgetHelp(
-		m_ui.dropIndicator, tr("Drop Indicator Style"), tr("Classic"),
-		tr("Choose how the drop indicators that appear when you drag dock windows in the debugger are styled. "
-		   "You will have to restart the debugger for this option to take effect."));
-}

pcsx2-qt/Settings/DebugUserInterfaceSettingsWidget.h

@@ -1,19 +0,0 @@
-// SPDX-FileCopyrightText: 2002-2025 PCSX2 Dev Team
-// SPDX-License-Identifier: GPL-3.0+
-
-#pragma once
-
-#include "ui_DebugUserInterfaceSettingsWidget.h"
-
-class SettingsWindow;
-
-class DebugUserInterfaceSettingsWidget : public QWidget
-{
-	Q_OBJECT
-
-public:
-	DebugUserInterfaceSettingsWidget(SettingsWindow* dialog, QWidget* parent = nullptr);
-
-private:
-	Ui::DebugUserInterfaceSettingsWidget m_ui;
-};

pcsx2-qt/Settings/EmulationSettingsWidget.cpp

@@ -3,7 +3,6 @@
 
 #include <QtWidgets/QInputDialog>
 #include <QtWidgets/QMessageBox>
-#include <limits>
 
 #include "pcsx2/Host.h"
 
@@ -18,13 +17,12 @@ static constexpr int DEFAULT_EE_CYCLE_RATE = 0;
 static constexpr int DEFAULT_EE_CYCLE_SKIP = 0;
 static constexpr u32 DEFAULT_FRAME_LATENCY = 2;
 
-EmulationSettingsWidget::EmulationSettingsWidget(SettingsWindow* dialog, QWidget* parent)
-	: QWidget(parent)
-	, m_dialog(dialog)
+EmulationSettingsWidget::EmulationSettingsWidget(SettingsWindow* settings_dialog, QWidget* parent)
+	: SettingsWidget(settings_dialog, parent)
 {
-	SettingsInterface* sif = dialog->getSettingsInterface();
+	SettingsInterface* sif = dialog()->getSettingsInterface();
 
-	m_ui.setupUi(this);
+	setupTab(m_ui);
 
 	initializeSpeedCombo(m_ui.normalSpeed, "Framerate", "NominalScalar", 1.0f);
 	initializeSpeedCombo(m_ui.fastForwardSpeed, "Framerate", "TurboScalar", 2.0f);
@@ -38,7 +36,7 @@ EmulationSettingsWidget::EmulationSettingsWidget(SettingsWindow* dialog, QWidget
 	connect(m_ui.optimalFramePacing, &QCheckBox::checkStateChanged, this, &EmulationSettingsWidget::onOptimalFramePacingChanged);
 	connect(m_ui.vsync, &QCheckBox::checkStateChanged, this, &EmulationSettingsWidget::updateUseVSyncForTimingEnabled);
 	connect(m_ui.syncToHostRefreshRate, &QCheckBox::checkStateChanged, this, &EmulationSettingsWidget::updateUseVSyncForTimingEnabled);
-	m_ui.optimalFramePacing->setTristate(dialog->isPerGameSettings());
+	m_ui.optimalFramePacing->setTristate(dialog()->isPerGameSettings());
 
 	SettingWidgetBinder::BindWidgetToIntSetting(sif, m_ui.eeCycleSkipping, "EmuCore/Speedhacks", "EECycleSkip", DEFAULT_EE_CYCLE_SKIP);
 
@@ -47,7 +45,7 @@ EmulationSettingsWidget::EmulationSettingsWidget(SettingsWindow* dialog, QWidget
 	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.fastCDVD, "EmuCore/Speedhacks", "fastCDVD", false);
 	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.precacheCDVD, "EmuCore", "CdvdPrecache", false);
 
-	if (m_dialog->isPerGameSettings())
+	if (dialog()->isPerGameSettings())
 	{
 		SettingWidgetBinder::BindWidgetToDateTimeSetting(sif, m_ui.rtcDateTime, "EmuCore");
 		m_ui.rtcDateTime->setDateRange(QDate(2000, 1, 1), QDate(2099, 12, 31));
@@ -55,11 +53,11 @@ EmulationSettingsWidget::EmulationSettingsWidget(SettingsWindow* dialog, QWidget
 		connect(m_ui.manuallySetRealTimeClock, &QCheckBox::checkStateChanged, this, &EmulationSettingsWidget::onManuallySetRealTimeClockChanged);
 		EmulationSettingsWidget::onManuallySetRealTimeClockChanged();
 
-		m_ui.eeCycleRate->insertItem(
-			0, tr("Use Global Setting [%1]")
-				   .arg(m_ui.eeCycleRate->itemText(
-					   std::clamp(Host::GetBaseIntSettingValue("EmuCore/Speedhacks", "EECycleRate", DEFAULT_EE_CYCLE_RATE) - MINIMUM_EE_CYCLE_RATE,
-						   0, MAXIMUM_EE_CYCLE_RATE - MINIMUM_EE_CYCLE_RATE))));
+		m_ui.eeCycleRate->insertItem(0,
+			tr("Use Global Setting [%1]")
+				.arg(m_ui.eeCycleRate->itemText(
+					std::clamp(Host::GetBaseIntSettingValue("EmuCore/Speedhacks", "EECycleRate", DEFAULT_EE_CYCLE_RATE) - MINIMUM_EE_CYCLE_RATE,
+						0, MAXIMUM_EE_CYCLE_RATE - MINIMUM_EE_CYCLE_RATE))));
 
 		// Disable cheats, use the cheats panel instead (move fastcvd up in its spot).
 		const int count = m_ui.systemSettingsLayout->count();
@@ -91,82 +89,80 @@ EmulationSettingsWidget::EmulationSettingsWidget(SettingsWindow* dialog, QWidget
 	}
 
 	const std::optional<int> cycle_rate =
-		m_dialog->getIntValue("EmuCore/Speedhacks", "EECycleRate", sif ? std::nullopt : std::optional<int>(DEFAULT_EE_CYCLE_RATE));
-	m_ui.eeCycleRate->setCurrentIndex(cycle_rate.has_value() ? (std::clamp(cycle_rate.value(), MINIMUM_EE_CYCLE_RATE, MAXIMUM_EE_CYCLE_RATE) +
-																   (0 - MINIMUM_EE_CYCLE_RATE) + static_cast<int>(m_dialog->isPerGameSettings())) :
-                                                               0);
-	connect(m_ui.eeCycleRate, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this](int index) {
+		dialog()->getIntValue("EmuCore/Speedhacks", "EECycleRate", sif ? std::nullopt : std::optional<int>(DEFAULT_EE_CYCLE_RATE));
+	m_ui.eeCycleRate->setCurrentIndex(cycle_rate.has_value() ? (std::clamp(cycle_rate.value(), MINIMUM_EE_CYCLE_RATE, MAXIMUM_EE_CYCLE_RATE) + (0 - MINIMUM_EE_CYCLE_RATE) + static_cast<int>(dialog()->isPerGameSettings())) : 0);
+	connect(m_ui.eeCycleRate, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [&](int index) {
 		std::optional<int> value;
-		if (!m_dialog->isPerGameSettings() || index > 0)
-			value = MINIMUM_EE_CYCLE_RATE + index - static_cast<int>(m_dialog->isPerGameSettings());
-		m_dialog->setIntSettingValue("EmuCore/Speedhacks", "EECycleRate", value);
+		if (!dialog()->isPerGameSettings() || index > 0)
+			value = MINIMUM_EE_CYCLE_RATE + index - static_cast<int>(dialog()->isPerGameSettings());
+		dialog()->setIntSettingValue("EmuCore/Speedhacks", "EECycleRate", value);
 	});
 
 	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.hostFilesystem, "EmuCore", "HostFs", false);
 
-	dialog->registerWidgetHelp(m_ui.normalSpeed, tr("Normal Speed"), tr("100%"),
+	dialog()->registerWidgetHelp(m_ui.normalSpeed, tr("Normal Speed"), tr("100%"),
 		tr("Sets the target emulation speed. It is not guaranteed that this speed will be reached, "
 		   "and if not, the emulator will run as fast as it can manage."));
 	//: The "User Preference" string will appear after the text "Recommended Value:"
-	dialog->registerWidgetHelp(m_ui.fastForwardSpeed, tr("Fast-Forward Speed"), tr("User Preference"),
+	dialog()->registerWidgetHelp(m_ui.fastForwardSpeed, tr("Fast-Forward Speed"), tr("User Preference"),
 		tr("Sets the fast-forward speed. This speed will be used when the fast-forward hotkey is pressed/toggled."));
 	//: The "User Preference" string will appear after the text "Recommended Value:"
-	dialog->registerWidgetHelp(m_ui.slowMotionSpeed, tr("Slow-Motion Speed"), tr("User Preference"),
+	dialog()->registerWidgetHelp(m_ui.slowMotionSpeed, tr("Slow-Motion Speed"), tr("User Preference"),
 		tr("Sets the slow-motion speed. This speed will be used when the slow-motion hotkey is pressed/toggled."));
 
-	dialog->registerWidgetHelp(m_ui.eeCycleRate, tr("EE Cycle Rate"), tr("100% (Normal Speed)"),
+	dialog()->registerWidgetHelp(m_ui.eeCycleRate, tr("EE Cycle Rate"), tr("100% (Normal Speed)"),
 		tr("Higher values may increase internal framerate in games, but will increase CPU requirements substantially. "
 		   "Lower values will reduce the CPU load allowing lightweight games to run full speed on weaker CPUs."));
-	dialog->registerWidgetHelp(m_ui.eeCycleSkipping, tr("EE Cycle Skip"), tr("Disabled"),
+	dialog()->registerWidgetHelp(m_ui.eeCycleSkipping, tr("EE Cycle Skip"), tr("Disabled"),
 		tr("Makes the emulated Emotion Engine skip cycles. "
 		   //: SOTC = Shadow of the Colossus. A game's title, should not be translated unless an official translation exists.
 		   "Helps a small subset of games like SOTC. Most of the time it's harmful to performance."));
-	dialog->registerWidgetHelp(m_ui.threadPinning, tr("Enable Thread Pinning"), tr("Unchecked"),
+	dialog()->registerWidgetHelp(m_ui.threadPinning, tr("Enable Thread Pinning"), tr("Unchecked"),
 		tr("Sets the priority for specific threads in a specific order ignoring the system scheduler. "
 		   //: P-Core = Performance Core, E-Core = Efficiency Core. See if Intel has official translations for these terms.
 		   "May help CPUs with big (P) and little (E) cores (e.g., Intel 12th or newer generation CPUs or other vendors such as AMD)."));
-	dialog->registerWidgetHelp(m_ui.MTVU, tr("Enable Multithreaded VU1 (MTVU1)"), tr("Checked"),
+	dialog()->registerWidgetHelp(m_ui.MTVU, tr("Enable Multithreaded VU1 (MTVU1)"), tr("Checked"),
 		tr("Generally a speedup on CPUs with 4 or more cores. "
 		   "Safe for most games, but a few are incompatible and may hang."));
-	dialog->registerWidgetHelp(m_ui.fastCDVD, tr("Enable Fast CDVD"), tr("Unchecked"),
+	dialog()->registerWidgetHelp(m_ui.fastCDVD, tr("Enable Fast CDVD"), tr("Unchecked"),
 		tr("Fast disc access, shorter loading times. Check HDLoader compatibility lists for games that are known to have issues with this."));
-	dialog->registerWidgetHelp(m_ui.precacheCDVD, tr("Enable CDVD Precaching"), tr("Unchecked"),
+	dialog()->registerWidgetHelp(m_ui.precacheCDVD, tr("Enable CDVD Precaching"), tr("Unchecked"),
 		tr("Loads the disc image into RAM before starting the virtual machine. Can reduce stutter on systems with hard drives that "
 		   "have long wake times, but significantly increases boot times."));
-	dialog->registerWidgetHelp(m_ui.cheats, tr("Enable Cheats"), tr("Unchecked"),
+	dialog()->registerWidgetHelp(m_ui.cheats, tr("Enable Cheats"), tr("Unchecked"),
 		tr("Automatically loads and applies cheats on game start."));
-	dialog->registerWidgetHelp(m_ui.hostFilesystem, tr("Enable Host Filesystem"), tr("Unchecked"),
+	dialog()->registerWidgetHelp(m_ui.hostFilesystem, tr("Enable Host Filesystem"), tr("Unchecked"),
 		tr("Allows games and homebrew to access files / folders directly on the host computer."));
 
-	dialog->registerWidgetHelp(m_ui.optimalFramePacing, tr("Optimal Frame Pacing"), tr("Unchecked"),
+	dialog()->registerWidgetHelp(m_ui.optimalFramePacing, tr("Optimal Frame Pacing"), tr("Unchecked"),
 		tr("Sets the VSync queue size to 0, making every frame be completed and presented by the GS before input is polled and the next frame begins. "
 		   "Using this setting can reduce input lag at the cost of measurably higher CPU and GPU requirements."));
-	dialog->registerWidgetHelp(m_ui.maxFrameLatency, tr("Maximum Frame Latency"), tr("2 Frames"),
+	dialog()->registerWidgetHelp(m_ui.maxFrameLatency, tr("Maximum Frame Latency"), tr("2 Frames"),
 		tr("Sets the maximum number of frames that can be queued up to the GS, before the CPU thread will wait for one of them to complete before continuing. "
 		   "Higher values can assist with smoothing out irregular frame times, but increase input lag."));
-	dialog->registerWidgetHelp(m_ui.syncToHostRefreshRate, tr("Sync to Host Refresh Rate"), tr("Unchecked"),
+	dialog()->registerWidgetHelp(m_ui.syncToHostRefreshRate, tr("Sync to Host Refresh Rate"), tr("Unchecked"),
 		tr("Speeds up emulation so that the guest refresh rate matches the host. This results in the smoothest animations possible, at the cost of "
 		   "potentially increasing the emulation speed by less than 1%. Sync to Host Refresh Rate will not take effect if "
 		   "the console's refresh rate is too far from the host's refresh rate. Users with variable refresh rate displays "
 		   "should disable this option."));
-	dialog->registerWidgetHelp(m_ui.vsync, tr("Vertical Sync (VSync)"), tr("Unchecked"),
+	dialog()->registerWidgetHelp(m_ui.vsync, tr("Vertical Sync (VSync)"), tr("Unchecked"),
 		tr("Enable this option to match PCSX2's refresh rate with your current monitor or screen. VSync is automatically disabled when "
 		   "it is not possible (e.g., running at non-100% speed)."));
-	dialog->registerWidgetHelp(m_ui.useVSyncForTiming, tr("Use Host VSync Timing"), tr("Unchecked"),
+	dialog()->registerWidgetHelp(m_ui.useVSyncForTiming, tr("Use Host VSync Timing"), tr("Unchecked"),
 		tr("When synchronizing with the host refresh rate, this option disables PCSX2's internal frame timing and uses the host instead. "
 		   "Can result in smoother frame pacing, <strong>but at the cost of increased input latency</strong>."));
-	dialog->registerWidgetHelp(m_ui.skipPresentingDuplicateFrames, tr("Skip Presenting Duplicate Frames"), tr("Unchecked"),
+	dialog()->registerWidgetHelp(m_ui.skipPresentingDuplicateFrames, tr("Skip Presenting Duplicate Frames"), tr("Unchecked"),
 		tr("Detects when idle frames are being presented in 25/30fps games, and skips presenting those frames. The frame is still "
 		   "rendered, it just means the GPU has more time to complete it (this is NOT frame skipping). Can smooth out frame time "
 		   "fluctuations when the CPU/GPU are near maximum utilization, but makes frame pacing more inconsistent and can increase "
 		   "input lag. Helps when using frame generation on 25/30fps games."));
-	dialog->registerWidgetHelp(m_ui.manuallySetRealTimeClock, tr("Manually Set Real-Time Clock"), tr("Unchecked"),
+	dialog()->registerWidgetHelp(m_ui.manuallySetRealTimeClock, tr("Manually Set Real-Time Clock"), tr("Unchecked"),
 		tr("Manually set a real-time clock to use for the virtual PlayStation 2 instead of using your OS' system clock."));
-	dialog->registerWidgetHelp(m_ui.rtcDateTime, tr("Real-Time Clock"), tr("Current date and time"),
+	dialog()->registerWidgetHelp(m_ui.rtcDateTime, tr("Real-Time Clock"), tr("Current date and time"),
 		tr("Real-time clock (RTC) used by the virtual PlayStation 2. Date format is the same as the one used by your OS. "
-			"This time is only applied upon booting the PS2; changing it while in-game will have no effect. "
-			"NOTE: This assumes you have your PS2 set to the default timezone of GMT+0 and default DST of Summer Time. "
-			"Some games require an RTC date/time set after their release date."));
+		   "This time is only applied upon booting the PS2; changing it while in-game will have no effect. "
+		   "NOTE: This assumes you have your PS2 set to the default timezone of GMT+0 and default DST of Summer Time. "
+		   "Some games require an RTC date/time set after their release date."));
 
 	updateOptimalFramePacing();
 	updateUseVSyncForTimingEnabled();
@@ -177,10 +173,10 @@ EmulationSettingsWidget::~EmulationSettingsWidget() = default;
 void EmulationSettingsWidget::initializeSpeedCombo(QComboBox* cb, const char* section, const char* key, float default_value)
 {
 	float value = Host::GetBaseFloatSettingValue(section, key, default_value);
-	if (m_dialog->isPerGameSettings())
+	if (dialog()->isPerGameSettings())
 	{
 		cb->addItem(tr("Use Global Setting [%1%]").arg(value * 100.0f, 0, 'f', 0));
-		if (!m_dialog->getSettingsInterface()->GetFloatValue(section, key, &value))
+		if (!dialog()->getSettingsInterface()->GetFloatValue(section, key, &value))
 		{
 			// set to something without data
 			value = -1.0f;
@@ -236,10 +232,10 @@ void EmulationSettingsWidget::handleSpeedComboChange(QComboBox* cb, const char*
 		if (!ok)
 		{
 			// we need to set back to the old value
-			float value = m_dialog->getEffectiveFloatValue(section, key, 1.0f);
+			float value = dialog()->getEffectiveFloatValue(section, key, 1.0f);
 
 			QSignalBlocker sb(cb);
-			if (m_dialog->isPerGameSettings() && !m_dialog->getSettingsInterface()->GetFloatValue(section, key, &value))
+			if (dialog()->isPerGameSettings() && !dialog()->getSettingsInterface()->GetFloatValue(section, key, &value))
 				cb->setCurrentIndex(0);
 			else if (const int index = cb->findData(QVariant(value)); index >= 0)
 				cb->setCurrentIndex(index);
@@ -253,12 +249,12 @@ void EmulationSettingsWidget::handleSpeedComboChange(QComboBox* cb, const char*
 										  .arg((50 * custom_value) / 100));
 		new_value = static_cast<float>(custom_value / 100.0);
 	}
-	else if (current_index > 0 || !m_dialog->isPerGameSettings())
+	else if (current_index > 0 || !dialog()->isPerGameSettings())
 	{
 		new_value = cb->currentData().toFloat();
 	}
 
-	m_dialog->setFloatSettingValue(section, key, new_value);
+	dialog()->setFloatSettingValue(section, key, new_value);
 }
 
 void EmulationSettingsWidget::onOptimalFramePacingChanged()
@@ -274,15 +270,15 @@ void EmulationSettingsWidget::onOptimalFramePacingChanged()
 	}
 	else
 	{
-		value = m_dialog->getEffectiveIntValue("EmuCore/GS", "VsyncQueueSize", DEFAULT_FRAME_LATENCY);
+		value = dialog()->getEffectiveIntValue("EmuCore/GS", "VsyncQueueSize", DEFAULT_FRAME_LATENCY);
 		optimal = (value == 0);
 	}
 
 	m_ui.maxFrameLatency->setMinimum(optimal ? 0 : 1);
 	m_ui.maxFrameLatency->setValue(optimal ? 0 : DEFAULT_FRAME_LATENCY);
-	m_ui.maxFrameLatency->setEnabled(!m_dialog->isPerGameSettings() && !m_ui.optimalFramePacing->isChecked());
+	m_ui.maxFrameLatency->setEnabled(!dialog()->isPerGameSettings() && !m_ui.optimalFramePacing->isChecked());
 
-	m_dialog->setIntSettingValue("EmuCore/GS", "VsyncQueueSize", value);
+	dialog()->setIntSettingValue("EmuCore/GS", "VsyncQueueSize", value);
 }
 
 void EmulationSettingsWidget::updateOptimalFramePacing()
@@ -290,9 +286,9 @@ void EmulationSettingsWidget::updateOptimalFramePacing()
 	const QSignalBlocker sb(m_ui.optimalFramePacing);
 	const QSignalBlocker sb2(m_ui.maxFrameLatency);
 
-	int value = m_dialog->getEffectiveIntValue("EmuCore/GS", "VsyncQueueSize", DEFAULT_FRAME_LATENCY);
+	int value = dialog()->getEffectiveIntValue("EmuCore/GS", "VsyncQueueSize", DEFAULT_FRAME_LATENCY);
 	bool optimal = (value == 0);
-	if (m_dialog->isPerGameSettings() && !m_dialog->getSettingsInterface()->GetIntValue("EmuCore/GS", "VsyncQueueSize", &value))
+	if (dialog()->isPerGameSettings() && !dialog()->getSettingsInterface()->GetIntValue("EmuCore/GS", "VsyncQueueSize", &value))
 	{
 		m_ui.optimalFramePacing->setCheckState(Qt::PartiallyChecked);
 		m_ui.maxFrameLatency->setEnabled(false);
@@ -309,13 +305,13 @@ void EmulationSettingsWidget::updateOptimalFramePacing()
 
 void EmulationSettingsWidget::updateUseVSyncForTimingEnabled()
 {
-	const bool vsync = m_dialog->getEffectiveBoolValue("EmuCore/GS", "VsyncEnable", false);
-	const bool sync_to_host_refresh = m_dialog->getEffectiveBoolValue("EmuCore/GS", "SyncToHostRefreshRate", false);
+	const bool vsync = dialog()->getEffectiveBoolValue("EmuCore/GS", "VsyncEnable", false);
+	const bool sync_to_host_refresh = dialog()->getEffectiveBoolValue("EmuCore/GS", "SyncToHostRefreshRate", false);
 	m_ui.useVSyncForTiming->setEnabled(vsync && sync_to_host_refresh);
 }
 
 void EmulationSettingsWidget::onManuallySetRealTimeClockChanged()
 {
-	const bool enabled = m_dialog->getEffectiveBoolValue("EmuCore", "ManuallySetRealTimeClock", false);
+	const bool enabled = dialog()->getEffectiveBoolValue("EmuCore", "ManuallySetRealTimeClock", false);
 	m_ui.rtcDateTime->setEnabled(enabled);
 }

pcsx2-qt/Settings/EmulationSettingsWidget.h

@@ -3,18 +3,16 @@
 
 #pragma once
 
-#include <QtWidgets/QWidget>
-
 #include "ui_EmulationSettingsWidget.h"
 
-class SettingsWindow;
+#include "SettingsWidget.h"
 
-class EmulationSettingsWidget : public QWidget
+class EmulationSettingsWidget : public SettingsWidget
 {
 	Q_OBJECT
 
 public:
-	EmulationSettingsWidget(SettingsWindow* dialog, QWidget* parent);
+	EmulationSettingsWidget(SettingsWindow* settings_dialog, QWidget* parent);
 	~EmulationSettingsWidget();
 
 private Q_SLOTS:
@@ -27,7 +25,5 @@ private:
 	void updateUseVSyncForTimingEnabled();
 	void onManuallySetRealTimeClockChanged();
 
-	SettingsWindow* m_dialog;
-
 	Ui::EmulationSettingsWidget m_ui;
 };

pcsx2-qt/Settings/EmulationSettingsWidget.ui

@@ -6,23 +6,11 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>672</width>
-    <height>500</height>
+    <width>700</width>
+    <height>800</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
    <item>
     <widget class="QGroupBox" name="speedGroup">
      <property name="title">
@@ -262,19 +250,6 @@
      </layout>
     </widget>
    </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Orientation::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
    <item>
     <widget class="QGroupBox" name="rtcGroup">
      <property name="title">
@@ -294,6 +269,19 @@
      </layout>
     </widget>
    </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>0</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <resources>

pcsx2-qt/Settings/FolderSettingsWidget.cpp

@@ -1,20 +1,19 @@
 // SPDX-FileCopyrightText: 2002-2025 PCSX2 Dev Team
 // SPDX-License-Identifier: GPL-3.0+
 
-#include <QtWidgets/QMessageBox>
-#include <algorithm>
-
 #include "FolderSettingsWidget.h"
 #include "pcsx2/GS/GS.h"
 #include "SettingWidgetBinder.h"
 #include "SettingsWindow.h"
 
-FolderSettingsWidget::FolderSettingsWidget(SettingsWindow* dialog, QWidget* parent)
-	: QWidget(parent)
-{
-	SettingsInterface* sif = dialog->getSettingsInterface();
+#include <QtWidgets/QMessageBox>
 
-	m_ui.setupUi(this);
+FolderSettingsWidget::FolderSettingsWidget(SettingsWindow* settings_dialog, QWidget* parent)
+	: SettingsWidget(settings_dialog, parent)
+{
+	SettingsInterface* sif = dialog()->getSettingsInterface();
+
+	setupTab(m_ui);
 
 	SettingWidgetBinder::BindWidgetToFolderSetting(sif, m_ui.cache, m_ui.cacheBrowse, m_ui.cacheOpen, m_ui.cacheReset, "Folders", "Cache", Path::Combine(EmuFolders::DataRoot, "cache"));
 	SettingWidgetBinder::BindWidgetToFolderSetting(sif, m_ui.cheats, m_ui.cheatsBrowse, m_ui.cheatsOpen, m_ui.cheatsReset, "Folders", "Cheats", Path::Combine(EmuFolders::DataRoot, "cheats"));
@@ -26,7 +25,7 @@ FolderSettingsWidget::FolderSettingsWidget(SettingsWindow* dialog, QWidget* pare
 	});
 	SettingWidgetBinder::BindWidgetToFolderSetting(sif, m_ui.saveStates, m_ui.saveStatesBrowse, m_ui.saveStatesOpen, m_ui.saveStatesReset, "Folders", "SaveStates", Path::Combine(EmuFolders::DataRoot, "sstates"));
 	SettingWidgetBinder::BindWidgetToFolderSetting(sif, m_ui.videoDumpingDirectory, m_ui.videoDumpingDirectoryBrowse, m_ui.videoDumpingDirectoryOpen, m_ui.videoDumpingDirectoryReset, "Folders", "Videos", Path::Combine(EmuFolders::DataRoot, "videos"));
-	dialog->registerWidgetHelp(m_ui.organizeScreenshotsByGame, tr("Organize Screenshots by Game"), tr("Unchecked"),
+	dialog()->registerWidgetHelp(m_ui.organizeScreenshotsByGame, tr("Organize Screenshots by Game"), tr("Unchecked"),
 		tr("When enabled, screenshots will be saved in a folder with the game's name, instead of all being saved in the Snapshots folder"));
 }
 

pcsx2-qt/Settings/FolderSettingsWidget.h

@@ -3,13 +3,11 @@
 
 #pragma once
 
-#include <QtWidgets/QWidget>
-
 #include "ui_FolderSettingsWidget.h"
 
-class SettingsWindow;
+#include "SettingsWidget.h"
 
-class FolderSettingsWidget : public QWidget
+class FolderSettingsWidget : public SettingsWidget
 {
 	Q_OBJECT
 

pcsx2-qt/Settings/FolderSettingsWidget.ui

@@ -6,175 +6,123 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>648</width>
-    <height>487</height>
+    <width>700</width>
+    <height>700</height>
    </rect>
   </property>
-  <layout class="QGridLayout" name="gridLayout_6">
-   <item row="0" column="0" rowspan="2">
-    <widget class="QScrollArea" name="scrollArea">
-     <widget class="QWidget" name="scrollAreaWidgetContents">
-      <property name="geometry">
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>665</width>
-        <height>600</height>
-       </rect>
-      </property>
-      <layout class="QGridLayout" name="gridLayout_8">
-       <item row="0" column="0">
-        <widget class="QGroupBox" name="cacheGroup">
-         <property name="title">
-          <string>Cache Directory</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_3">
-          <item row="1" column="0">
-           <widget class="QLineEdit" name="cache"/>
-          </item>
-          <item row="1" column="1">
-           <widget class="QPushButton" name="cacheBrowse">
-            <property name="text">
-             <string>Browse...</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="2">
-           <widget class="QPushButton" name="cacheOpen">
-            <property name="text">
-             <string>Open...</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="3">
-           <widget class="QPushButton" name="cacheReset">
-            <property name="text">
-             <string>Reset</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="0" colspan="4">
-           <widget class="QLabel" name="cacheLabel">
-            <property name="text">
-             <string>Used for storing shaders, game list, and achievement data.</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="4" column="0">
-        <widget class="QGroupBox" name="saveStatesGroup">
-         <property name="title">
-          <string>Save States Directory</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_2">
-          <item row="0" column="0" colspan="4">
-           <widget class="QLabel" name="saveStatesLabel">
-            <property name="text">
-             <string>Used for storing save states.</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QPushButton" name="saveStatesBrowse">
-            <property name="text">
-             <string>Browse...</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="3">
-           <widget class="QPushButton" name="saveStatesReset">
-            <property name="text">
-             <string>Reset</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLineEdit" name="saveStates"/>
-          </item>
-          <item row="1" column="2">
-           <widget class="QPushButton" name="saveStatesOpen">
-            <property name="text">
-             <string>Open...</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="1" column="0">
-        <widget class="QGroupBox" name="cheatsGroup">
-         <property name="title">
-          <string>Cheats Directory</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_5">
-          <item row="1" column="0">
-           <widget class="QLineEdit" name="cheats"/>
-          </item>
-          <item row="1" column="1">
-           <widget class="QPushButton" name="cheatsBrowse">
-            <property name="text">
-             <string>Browse...</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="2">
-           <widget class="QPushButton" name="cheatsOpen">
-            <property name="text">
-             <string>Open...</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="3">
-           <widget class="QPushButton" name="cheatsReset">
-            <property name="text">
-             <string>Reset</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="0" colspan="4">
-           <widget class="QLabel" name="cheatsLabel">
-            <property name="text">
-             <string>Used for storing .pnach files containing game cheats.</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="2" column="0">
-        <widget class="QGroupBox" name="snapshotsGroup">
-         <property name="title">
-          <string>Snapshots Directory</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout">
-          <item row="1" column="0">
-           <widget class="QLineEdit" name="snapshots"/>
-          </item>
-          <item row="1" column="1">
-           <widget class="QPushButton" name="snapshotsBrowse">
-            <property name="text">
-             <string>Browse...</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="2">
-           <widget class="QPushButton" name="snapshotsOpen">
-            <property name="text">
-             <string>Open...</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="3">
-           <widget class="QPushButton" name="snapshotsReset">
-            <property name="text">
-             <string>Reset</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="0" colspan="4">
-           <widget class="QLabel" name="snaphotsLabel">
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QGroupBox" name="cacheGroup">
+     <property name="title">
+      <string>Cache Directory</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_3">
+      <item row="1" column="0">
+       <widget class="QLineEdit" name="cache"/>
+      </item>
+      <item row="1" column="1">
+       <widget class="QPushButton" name="cacheBrowse">
+        <property name="text">
+         <string>Browse...</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2">
+       <widget class="QPushButton" name="cacheOpen">
+        <property name="text">
+         <string>Open...</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="3">
+       <widget class="QPushButton" name="cacheReset">
+        <property name="text">
+         <string>Reset</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" colspan="4">
+       <widget class="QLabel" name="cacheLabel">
+        <property name="text">
+         <string>Used for storing shaders, game list, and achievement data.</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="cheatsGroup">
+     <property name="title">
+      <string>Cheats Directory</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_5">
+      <item row="1" column="0">
+       <widget class="QLineEdit" name="cheats"/>
+      </item>
+      <item row="1" column="1">
+       <widget class="QPushButton" name="cheatsBrowse">
+        <property name="text">
+         <string>Browse...</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2">
+       <widget class="QPushButton" name="cheatsOpen">
+        <property name="text">
+         <string>Open...</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="3">
+       <widget class="QPushButton" name="cheatsReset">
+        <property name="text">
+         <string>Reset</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" colspan="4">
+       <widget class="QLabel" name="cheatsLabel">
+        <property name="text">
+         <string>Used for storing .pnach files containing game cheats.</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="snapshotsGroup">
+     <property name="title">
+      <string>Snapshots Directory</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="1" column="0">
+       <widget class="QLineEdit" name="snapshots"/>
+      </item>
+      <item row="1" column="1">
+       <widget class="QPushButton" name="snapshotsBrowse">
+        <property name="text">
+         <string>Browse...</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2">
+       <widget class="QPushButton" name="snapshotsOpen">
+        <property name="text">
+         <string>Open...</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="3">
+       <widget class="QPushButton" name="snapshotsReset">
+        <property name="text">
+         <string>Reset</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" colspan="4">
+       <widget class="QLabel" name="snaphotsLabel">
         <property name="text">
          <string>Used for screenshots and saving GS dumps.</string>
         </property>
@@ -183,97 +131,146 @@
       <item row="2" column="0" colspan="4">
        <widget class="QCheckBox" name="organizeScreenshotsByGame">
         <property name="text">
-         <string>Save Screenshots in Game-Specific Folders</string>
+         <string>Save Snapshots in Game-Specific Folders</string>
         </property>
        </widget>
       </item>
      </layout>
-        </widget>
-       </item>
-       <item row="3" column="0">
-        <widget class="QGroupBox" name="coversGroup">
-         <property name="title">
-          <string>Covers Directory</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_4">
-          <item row="1" column="0">
-           <widget class="QLineEdit" name="covers"/>
-          </item>
-          <item row="1" column="1">
-           <widget class="QPushButton" name="coversBrowse">
-            <property name="text">
-             <string>Browse...</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="2">
-           <widget class="QPushButton" name="coversOpen">
-            <property name="text">
-             <string>Open...</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="3">
-           <widget class="QPushButton" name="coversReset">
-            <property name="text">
-             <string>Reset</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="0" colspan="4">
-           <widget class="QLabel" name="coversLabel">
-            <property name="text">
-             <string>Used for storing covers in the game grid/Big Picture UIs.</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="5" column="0">
-        <widget class="QGroupBox" name="videoDumpDirectory">
-         <property name="title">
-          <string>Video Dumping Directory</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_7">
-          <item row="3" column="2">
-           <widget class="QPushButton" name="videoDumpingDirectoryOpen">
-            <property name="text">
-             <string>Open...</string>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="0">
-           <widget class="QLineEdit" name="videoDumpingDirectory"/>
-          </item>
-          <item row="3" column="1">
-           <widget class="QPushButton" name="videoDumpingDirectoryBrowse">
-            <property name="text">
-             <string>Browse...</string>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="3">
-           <widget class="QPushButton" name="videoDumpingDirectoryReset">
-            <property name="text">
-             <string>Reset</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="0">
-           <widget class="QLabel" name="videoDumpLabel">
-            <property name="text">
-             <string>Used for storing video captures.</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-      </layout>
-     </widget>
     </widget>
    </item>
+   <item>
+    <widget class="QGroupBox" name="saveStatesGroup">
+     <property name="title">
+      <string>Save States Directory</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_2">
+      <item row="0" column="0" colspan="4">
+       <widget class="QLabel" name="saveStatesLabel">
+        <property name="text">
+         <string>Used for storing save states.</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QPushButton" name="saveStatesBrowse">
+        <property name="text">
+         <string>Browse...</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="3">
+       <widget class="QPushButton" name="saveStatesReset">
+        <property name="text">
+         <string>Reset</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLineEdit" name="saveStates"/>
+      </item>
+      <item row="1" column="2">
+       <widget class="QPushButton" name="saveStatesOpen">
+        <property name="text">
+         <string>Open...</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="coversGroup">
+     <property name="title">
+      <string>Covers Directory</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_4">
+      <item row="1" column="0">
+       <widget class="QLineEdit" name="covers"/>
+      </item>
+      <item row="1" column="1">
+       <widget class="QPushButton" name="coversBrowse">
+        <property name="text">
+         <string>Browse...</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2">
+       <widget class="QPushButton" name="coversOpen">
+        <property name="text">
+         <string>Open...</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="3">
+       <widget class="QPushButton" name="coversReset">
+        <property name="text">
+         <string>Reset</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" colspan="4">
+       <widget class="QLabel" name="coversLabel">
+        <property name="text">
+         <string>Used for storing covers in the game grid/Big Picture UIs.</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="videoDumpDirectory">
+     <property name="title">
+      <string>Video Dumping Directory</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_7">
+      <item row="3" column="2">
+       <widget class="QPushButton" name="videoDumpingDirectoryOpen">
+        <property name="text">
+         <string>Open...</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0">
+       <widget class="QLineEdit" name="videoDumpingDirectory"/>
+      </item>
+      <item row="3" column="1">
+       <widget class="QPushButton" name="videoDumpingDirectoryBrowse">
+        <property name="text">
+         <string>Browse...</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="3">
+       <widget class="QPushButton" name="videoDumpingDirectoryReset">
+        <property name="text">
+         <string>Reset</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QLabel" name="videoDumpLabel">
+        <property name="text">
+         <string>Used for storing video captures.</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>0</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <resources>

pcsx2-qt/Settings/GameCheatSettingsWidget.cpp

@@ -16,10 +16,10 @@
 #include <QtCore/QSortFilterProxyModel>
 #include <QtGui/QStandardItemModel>
 
-GameCheatSettingsWidget::GameCheatSettingsWidget(SettingsWindow* dialog, QWidget* parent)
-	: m_dialog(dialog)
+GameCheatSettingsWidget::GameCheatSettingsWidget(SettingsWindow* settings_dialog, QWidget* parent)
+	: SettingsWidget(settings_dialog, parent)
 {
-	m_ui.setupUi(this);
+	setupTab(m_ui);
 
 	m_model = new QStandardItemModel(this);
 
@@ -40,7 +40,7 @@ GameCheatSettingsWidget::GameCheatSettingsWidget(SettingsWindow* dialog, QWidget
 
 	m_ui.cheatList->expandAll();
 
-	SettingsInterface* sif = m_dialog->getSettingsInterface();
+	SettingsInterface* sif = dialog()->getSettingsInterface();
 	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.enableCheats, "EmuCore", "EnableCheats", false);
 	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.allCRCsCheckbox, "EmuCore", "ShowCheatsForAllCRCs", false);
 	updateListEnabled();
@@ -56,9 +56,9 @@ GameCheatSettingsWidget::GameCheatSettingsWidget(SettingsWindow* dialog, QWidget
 		m_model_proxy->setFilterFixedString(text);
 		m_ui.cheatList->expandAll();
 	});
-	connect(m_dialog, &SettingsWindow::discSerialChanged, this, &GameCheatSettingsWidget::reloadList);
+	connect(dialog(), &SettingsWindow::discSerialChanged, this, &GameCheatSettingsWidget::reloadList);
 
-	dialog->registerWidgetHelp(m_ui.allCRCsCheckbox, tr("Show Cheats For All CRCs"), tr("Checked"),
+	dialog()->registerWidgetHelp(m_ui.allCRCsCheckbox, tr("Show Cheats For All CRCs"), tr("Checked"),
 		tr("Toggles scanning patch files for all CRCs of the game. With this enabled available patches for the game serial with different CRCs will also be loaded."));
 }
 
@@ -120,18 +120,18 @@ void GameCheatSettingsWidget::onReloadClicked()
 
 void GameCheatSettingsWidget::updateListEnabled()
 {
-	const bool cheats_enabled = m_dialog->getEffectiveBoolValue("EmuCore", "EnableCheats", false);
+	const bool cheats_enabled = dialog()->getEffectiveBoolValue("EmuCore", "EnableCheats", false);
 	m_ui.cheatList->setEnabled(cheats_enabled);
 	m_ui.enableAll->setEnabled(cheats_enabled);
 	m_ui.disableAll->setEnabled(cheats_enabled);
 	m_ui.reloadCheats->setEnabled(cheats_enabled);
-	m_ui.allCRCsCheckbox->setEnabled(cheats_enabled && !m_dialog->getSerial().empty());
+	m_ui.allCRCsCheckbox->setEnabled(cheats_enabled && !dialog()->getSerial().empty());
 	m_ui.searchText->setEnabled(cheats_enabled);
 }
 
 void GameCheatSettingsWidget::disableAllCheats()
 {
-	SettingsInterface* si = m_dialog->getSettingsInterface();
+	SettingsInterface* si = dialog()->getSettingsInterface();
 	si->ClearSection(Patch::CHEATS_CONFIG_SECTION);
 	si->Save();
 }
@@ -144,7 +144,7 @@ void GameCheatSettingsWidget::resizeEvent(QResizeEvent* event)
 
 void GameCheatSettingsWidget::setCheatEnabled(std::string name, bool enabled, bool save_and_reload_settings)
 {
-	SettingsInterface* si = m_dialog->getSettingsInterface();
+	SettingsInterface* si = dialog()->getSettingsInterface();
 	auto it = std::find(m_enabled_patches.begin(), m_enabled_patches.end(), name);
 
 	if (enabled)
@@ -173,7 +173,7 @@ void GameCheatSettingsWidget::setStateForAll(bool enabled)
 	disconnect(m_model, &QStandardItemModel::itemChanged, this, &GameCheatSettingsWidget::onCheatListItemChanged);
 
 	setStateRecursively(nullptr, enabled);
-	m_dialog->getSettingsInterface()->Save();
+	dialog()->getSettingsInterface()->Save();
 	g_emu_thread->reloadGameSettings();
 
 	connect(m_model, &QStandardItemModel::itemChanged, this, &GameCheatSettingsWidget::onCheatListItemChanged);
@@ -205,13 +205,13 @@ void GameCheatSettingsWidget::reloadList()
 {
 	u32 num_unlabelled_codes = 0;
 	bool showAllCRCS = m_ui.allCRCsCheckbox->isChecked();
-	m_patches = Patch::GetPatchInfo(m_dialog->getSerial(), m_dialog->getDiscCRC(), true, showAllCRCS, & num_unlabelled_codes);
+	m_patches = Patch::GetPatchInfo(dialog()->getSerial(), dialog()->getDiscCRC(), true, showAllCRCS, &num_unlabelled_codes);
 	m_enabled_patches =
-		m_dialog->getSettingsInterface()->GetStringList(Patch::CHEATS_CONFIG_SECTION, Patch::PATCH_ENABLE_CONFIG_KEY);
+		dialog()->getSettingsInterface()->GetStringList(Patch::CHEATS_CONFIG_SECTION, Patch::PATCH_ENABLE_CONFIG_KEY);
 
 	m_parent_map.clear();
 	m_model->removeRows(0, m_model->rowCount());
-	m_ui.allCRCsCheckbox->setEnabled(!m_dialog->getSerial().empty() && m_ui.cheatList->isEnabled());
+	m_ui.allCRCsCheckbox->setEnabled(!dialog()->getSerial().empty() && m_ui.cheatList->isEnabled());
 
 	for (const Patch::PatchInfo& pi : m_patches)
 	{

pcsx2-qt/Settings/GameCheatSettingsWidget.h

@@ -8,6 +8,8 @@
 
 #include "ui_GameCheatSettingsWidget.h"
 
+#include "SettingsWidget.h"
+
 #include "pcsx2/Patch.h"
 
 #include "common/HeterogeneousContainers.h"
@@ -21,14 +23,12 @@ namespace GameList
 	struct Entry;
 }
 
-class SettingsWindow;
-
-class GameCheatSettingsWidget : public QWidget
+class GameCheatSettingsWidget : public SettingsWidget
 {
 	Q_OBJECT
 
 public:
-	GameCheatSettingsWidget(SettingsWindow* dialog, QWidget* parent);
+	GameCheatSettingsWidget(SettingsWindow* settings_dialog, QWidget* parent);
 	~GameCheatSettingsWidget();
 
 	void disableAllCheats();
@@ -51,7 +51,6 @@ private:
 	void setStateRecursively(QStandardItem* parent, bool enabled);
 
 	Ui::GameCheatSettingsWidget m_ui;
-	SettingsWindow* m_dialog;
 	QStandardItemModel* m_model = nullptr;
 	QSortFilterProxyModel* m_model_proxy = nullptr;
 

pcsx2-qt/Settings/GameCheatSettingsWidget.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>697</width>
-    <height>361</height>
+    <width>700</width>
+    <height>600</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
@@ -98,7 +98,7 @@
        <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
-         <height>20</height>
+         <height>0</height>
         </size>
        </property>
       </spacer>

pcsx2-qt/Settings/GameFixSettingsWidget.cpp

@@ -10,12 +10,12 @@
 #include "SettingWidgetBinder.h"
 #include "SettingsWindow.h"
 
-GameFixSettingsWidget::GameFixSettingsWidget(SettingsWindow* dialog, QWidget* parent)
-	: QWidget(parent)
+GameFixSettingsWidget::GameFixSettingsWidget(SettingsWindow* settings_dialog, QWidget* parent)
+	: SettingsWidget(settings_dialog, parent)
 {
-	SettingsInterface* sif = dialog->getSettingsInterface();
+	SettingsInterface* sif = dialog()->getSettingsInterface();
 
-	m_ui.setupUi(this);
+	setupTab(m_ui);
 
 	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.FpuMulHack, "EmuCore/Gamefixes", "FpuMulHack", false);
 	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.GoemonTlbHack, "EmuCore/Gamefixes", "GoemonTlbHack", false);
@@ -36,24 +36,24 @@ GameFixSettingsWidget::GameFixSettingsWidget(SettingsWindow* dialog, QWidget* pa
 	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.XgKickHack, "EmuCore/Gamefixes", "XgKickHack", false);
 	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.BlitInternalFPSHack, "EmuCore/Gamefixes", "BlitInternalFPSHack", false);
 
-	dialog->registerWidgetHelp(m_ui.FpuMulHack, tr("FPU Multiply Hack"), tr("Unchecked"), tr("For Tales of Destiny."));
-	dialog->registerWidgetHelp(m_ui.GoemonTlbHack, tr("Preload TLB Hack"), tr("Unchecked"), tr("To avoid TLB miss on Goemon."));
-	dialog->registerWidgetHelp(m_ui.SoftwareRendererFMVHack, tr("Use Software Renderer For FMVs"), tr("Unchecked"), tr("Needed for some games with complex FMV rendering."));
-	dialog->registerWidgetHelp(m_ui.SkipMPEGHack, tr("Skip MPEG Hack"), tr("Unchecked"), tr("Skips videos/FMVs in games to avoid game hanging/freezes."));
-	dialog->registerWidgetHelp(m_ui.OPHFlagHack, tr("OPH Flag Hack"), tr("Unchecked"), tr("Known to affect following games: Bleach Blade Battlers, Growlanser II and III, Wizardry."));
-	dialog->registerWidgetHelp(m_ui.EETimingHack, tr("EE Timing Hack"), tr("Unchecked"), tr("General-purpose timing hack. Known to affect following games: Digital Devil Saga, SSX."));
-	dialog->registerWidgetHelp(m_ui.InstantDMAHack, tr("Instant DMA Hack"), tr("Unchecked"), tr("Good for cache emulation problems. Known to affect following games: Fire Pro Wrestling Z."));
-	dialog->registerWidgetHelp(m_ui.DMABusyHack, tr("DMA Busy Hack"), tr("Unchecked"), tr("Known to affect following games: Mana Khemia 1, Metal Saga, Pilot Down Behind Enemy Lines."));
-	dialog->registerWidgetHelp(m_ui.GIFFIFOHack, tr("Emulate GIF FIFO"), tr("Unchecked"), tr("Correct but slower. Known to affect the following games: Fifa Street 2."));
-	dialog->registerWidgetHelp(m_ui.VIFFIFOHack, tr("Emulate VIF FIFO"), tr("Unchecked"), tr("Simulate VIF1 FIFO read ahead. Known to affect following games: Test Drive Unlimited, Transformers."));
-	dialog->registerWidgetHelp(m_ui.VIF1StallHack, tr("Delay VIF1 Stalls"), tr("Unchecked"), tr("For SOCOM 2 HUD and Spy Hunter loading hang."));
-	dialog->registerWidgetHelp(m_ui.VuAddSubHack, tr("VU Add Hack"), tr("Unchecked"), tr("For Tri-Ace Games: Star Ocean 3, Radiata Stories, Valkyrie Profile 2."));
-	dialog->registerWidgetHelp(m_ui.IbitHack, tr("VU I Bit Hack"), tr("Unchecked"), tr("Avoids constant recompilation in some games. Known to affect the following games: Scarface The World is Yours, Crash Tag Team Racing."));
-	dialog->registerWidgetHelp(m_ui.FullVU0SyncHack, tr("Full VU0 Synchronization"), tr("Unchecked"), tr("Forces tight VU0 sync on every COP2 instruction."));
-	dialog->registerWidgetHelp(m_ui.VUSyncHack, tr("VU Sync"), tr("Unchecked"), tr("Run behind. To avoid sync problems when reading or writing VU registers."));
-	dialog->registerWidgetHelp(m_ui.VUOverflowHack, tr("VU Overflow Hack"), tr("Unchecked"), tr("To check for possible float overflows (Superman Returns)."));
-	dialog->registerWidgetHelp(m_ui.XgKickHack, tr("VU XGKick Sync"), tr("Unchecked"), tr("Use accurate timing for VU XGKicks (slower)."));
-	dialog->registerWidgetHelp(m_ui.BlitInternalFPSHack, tr("Force Blit Internal FPS Detection"), tr("Unchecked"), tr("Use alternative method to calculate internal FPS to avoid false readings in some games."));
+	dialog()->registerWidgetHelp(m_ui.FpuMulHack, tr("FPU Multiply Hack"), tr("Unchecked"), tr("For Tales of Destiny."));
+	dialog()->registerWidgetHelp(m_ui.GoemonTlbHack, tr("Preload TLB Hack"), tr("Unchecked"), tr("To avoid TLB miss on Goemon."));
+	dialog()->registerWidgetHelp(m_ui.SoftwareRendererFMVHack, tr("Use Software Renderer For FMVs"), tr("Unchecked"), tr("Needed for some games with complex FMV rendering."));
+	dialog()->registerWidgetHelp(m_ui.SkipMPEGHack, tr("Skip MPEG Hack"), tr("Unchecked"), tr("Skips videos/FMVs in games to avoid game hanging/freezes."));
+	dialog()->registerWidgetHelp(m_ui.OPHFlagHack, tr("OPH Flag Hack"), tr("Unchecked"), tr("Known to affect following games: Bleach Blade Battlers, Growlanser II and III, Wizardry."));
+	dialog()->registerWidgetHelp(m_ui.EETimingHack, tr("EE Timing Hack"), tr("Unchecked"), tr("General-purpose timing hack. Known to affect following games: Digital Devil Saga, SSX."));
+	dialog()->registerWidgetHelp(m_ui.InstantDMAHack, tr("Instant DMA Hack"), tr("Unchecked"), tr("Good for cache emulation problems. Known to affect following games: Fire Pro Wrestling Z."));
+	dialog()->registerWidgetHelp(m_ui.DMABusyHack, tr("DMA Busy Hack"), tr("Unchecked"), tr("Known to affect following games: Mana Khemia 1, Metal Saga, Pilot Down Behind Enemy Lines."));
+	dialog()->registerWidgetHelp(m_ui.GIFFIFOHack, tr("Emulate GIF FIFO"), tr("Unchecked"), tr("Correct but slower. Known to affect the following games: Fifa Street 2."));
+	dialog()->registerWidgetHelp(m_ui.VIFFIFOHack, tr("Emulate VIF FIFO"), tr("Unchecked"), tr("Simulate VIF1 FIFO read ahead. Known to affect following games: Test Drive Unlimited, Transformers."));
+	dialog()->registerWidgetHelp(m_ui.VIF1StallHack, tr("Delay VIF1 Stalls"), tr("Unchecked"), tr("For SOCOM 2 HUD and Spy Hunter loading hang."));
+	dialog()->registerWidgetHelp(m_ui.VuAddSubHack, tr("VU Add Hack"), tr("Unchecked"), tr("For Tri-Ace Games: Star Ocean 3, Radiata Stories, Valkyrie Profile 2."));
+	dialog()->registerWidgetHelp(m_ui.IbitHack, tr("VU I Bit Hack"), tr("Unchecked"), tr("Avoids constant recompilation in some games. Known to affect the following games: Scarface The World is Yours, Crash Tag Team Racing."));
+	dialog()->registerWidgetHelp(m_ui.FullVU0SyncHack, tr("Full VU0 Synchronization"), tr("Unchecked"), tr("Forces tight VU0 sync on every COP2 instruction."));
+	dialog()->registerWidgetHelp(m_ui.VUSyncHack, tr("VU Sync"), tr("Unchecked"), tr("Run behind. To avoid sync problems when reading or writing VU registers."));
+	dialog()->registerWidgetHelp(m_ui.VUOverflowHack, tr("VU Overflow Hack"), tr("Unchecked"), tr("To check for possible float overflows (Superman Returns)."));
+	dialog()->registerWidgetHelp(m_ui.XgKickHack, tr("VU XGKick Sync"), tr("Unchecked"), tr("Use accurate timing for VU XGKicks (slower)."));
+	dialog()->registerWidgetHelp(m_ui.BlitInternalFPSHack, tr("Force Blit Internal FPS Detection"), tr("Unchecked"), tr("Use alternative method to calculate internal FPS to avoid false readings in some games."));
 }
 
 GameFixSettingsWidget::~GameFixSettingsWidget() = default;