Comment AppImage builds

It randomly started erroring in GitHub actions with exit code 8 but only sometimes, and I don't have the patience to debug it. I don't even use linux lol

.github/workflows/canary.yml

@@ -106,42 +106,47 @@ jobs:
           gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/canary --command=UploadGenericPackage "Ryubing-Canary|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz"
         shell: bash
         
-      - name: Build AppImage (Linux)
+        # If anyone wants to look into why appimagetool randomly errors with exit code 8, that would be cool
-        if: matrix.platform.os == 'ubuntu-latest'
-        run: |
-          BUILD_VERSION="${{ steps.version_info.outputs.build_version }}"
-          PLATFORM_NAME="${{ matrix.platform.name }}"
       
-          sudo apt install -y zsync desktop-file-utils appstream
+#      - name: Build AppImage (Linux)
-
+#        if: matrix.platform.os == 'ubuntu-latest'
-          mkdir -p tools
+#        run: |
-          export PATH="$PATH:$(readlink -f tools)"
+#          BUILD_VERSION="${{ steps.version_info.outputs.build_version }}"
-
+#          PLATFORM_NAME="${{ matrix.platform.name }}"
-          # Setup appimagetool
+#
-          wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
+#          sudo apt install -y zsync desktop-file-utils appstream
-          chmod +x tools/appimagetool
+#
-          chmod +x distribution/linux/appimage/build-appimage.sh
+#          mkdir -p tools
-
+#          export PATH="$PATH:$(readlink -f tools)"
-          # Explicitly set $ARCH for appimagetool ($ARCH_NAME is for the file name)
+#
-          if [ "$PLATFORM_NAME" = "linux-x64" ]; then
+#          # Setup appimagetool
-            ARCH_NAME=x64
+#          wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
-            export ARCH=x86_64
+#          chmod +x tools/appimagetool
-          elif [ "$PLATFORM_NAME" = "linux-arm64" ]; then
+#          chmod +x distribution/linux/appimage/build-appimage.sh
-            ARCH_NAME=arm64
+#
-            export ARCH=aarch64
+#          # Explicitly set $ARCH for appimagetool ($ARCH_NAME is for the file name)
-          else
+#          if [ "$PLATFORM_NAME" = "linux-x64" ]; then
-            echo "Unexpected PLATFORM_NAME "$PLATFORM_NAME""
+#            ARCH_NAME=x64
-            exit 1
+#            export ARCH=x86_64
-          fi
+#          elif [ "$PLATFORM_NAME" = "linux-arm64" ]; then
-
+#            ARCH_NAME=arm64
-          BUILDDIR=publish OUTDIR=publish_appimage distribution/linux/appimage/build-appimage.sh
+#            export ARCH=aarch64
-
+#          else
-          pushd publish_appimage
+#            echo "Unexpected PLATFORM_NAME "$PLATFORM_NAME""
-          mv Ryujinx.AppImage ../release_output/ryujinx-canary-$BUILD_VERSION-$ARCH_NAME.AppImage
+#            exit 1
-          popd
+#          fi
-
+#
-          gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/canary --command=UploadGenericPackage "Ryubing-Canary|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-canary-$BUILD_VERSION-$ARCH_NAME.AppImage"
+#          export UFLAG="gh-releases-zsync|${{ secrets.RC_OWNER }}${{ secrets.RC_CANARY_NAME }}|latest|*-$ARCH_NAME.AppImage.zsync"
-        shell: bash
+#          BUILDDIR=publish OUTDIR=publish_appimage distribution/linux/appimage/build-appimage.sh
+#
+#          pushd publish_appimage
+#          mv Ryujinx.AppImage ../release_output/ryujinx-canary-$BUILD_VERSION-$ARCH_NAME.AppImage
+#          mv Ryujinx.AppImage.zsync ../release_output/ryujinx-canary-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync
+#          popd
+#          
+#          gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/canary --command=UploadGenericPackage "Ryubing-Canary|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-canary-$BUILD_VERSION-$ARCH_NAME.AppImage"
+#          gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/canary --command=UploadGenericPackage "Ryubing-Canary|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-canary-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync"
+#        shell: bash
 
   macos_release:
     name: Release MacOS universal

.github/workflows/release.yml

@@ -97,42 +97,47 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           
-      - name: Build AppImage (Linux)
+      # If anyone wants to look into why appimagetool randomly errors with exit code 8, that would be cool
-        if: matrix.platform.os == 'ubuntu-latest'
-        run: |
-          BUILD_VERSION="${{ steps.version_info.outputs.build_version }}"
-          PLATFORM_NAME="${{ matrix.platform.name }}"
           
-          sudo apt install -y zsync desktop-file-utils appstream
+#      - name: Build AppImage (Linux)
-
+#        if: matrix.platform.os == 'ubuntu-latest'
-          mkdir -p tools
+#        run: |
-          export PATH="$PATH:$(readlink -f tools)"
+#          BUILD_VERSION="${{ steps.version_info.outputs.build_version }}"
-
+#          PLATFORM_NAME="${{ matrix.platform.name }}"
-          # Setup appimagetool
+#
-          wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
+#          sudo apt install -y zsync desktop-file-utils appstream
-          chmod +x tools/appimagetool
+#
-          chmod +x distribution/linux/appimage/build-appimage.sh
+#          mkdir -p tools
-
+#          export PATH="$PATH:$(readlink -f tools)"
-          # Explicitly set $ARCH for appimagetool ($ARCH_NAME is for the file name)
+#
-          if [ "$PLATFORM_NAME" = "linux-x64" ]; then
+#          # Setup appimagetool
-            ARCH_NAME=x64
+#          wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
-            export ARCH=x86_64
+#          chmod +x tools/appimagetool
-          elif [ "$PLATFORM_NAME" = "linux-arm64" ]; then
+#          chmod +x distribution/linux/appimage/build-appimage.sh
-            ARCH_NAME=arm64
+#
-            export ARCH=aarch64
+#          # Explicitly set $ARCH for appimagetool ($ARCH_NAME is for the file name)
-          else
+#          if [ "$PLATFORM_NAME" = "linux-x64" ]; then
-            echo "Unexpected PLATFORM_NAME "$PLATFORM_NAME""
+#            ARCH_NAME=x64
-            exit 1
+#            export ARCH=x86_64
-          fi
+#          elif [ "$PLATFORM_NAME" = "linux-arm64" ]; then
-
+#            ARCH_NAME=arm64
-          BUILDDIR=publish OUTDIR=publish_appimage distribution/linux/appimage/build-appimage.sh
+#            export ARCH=aarch64
-
+#          else
-          pushd publish_appimage
+#            echo "Unexpected PLATFORM_NAME "$PLATFORM_NAME""
-          mv Ryujinx.AppImage ../release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage
+#            exit 1
-          popd
+#          fi
-
+#
-          gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/ryujinx --command=UploadGenericPackage "Ryubing|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage"
+#          export UFLAG="gh-releases-zsync|${{ github.repository_owner }}|${{ github.event.repository.name }}|latest|*-$ARCH_NAME.AppImage.zsync"
-        shell: bash
+#          BUILDDIR=publish OUTDIR=publish_appimage distribution/linux/appimage/build-appimage.sh
+#
+#          pushd publish_appimage
+#          mv Ryujinx.AppImage ../release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage
+#          mv Ryujinx.AppImage.zsync ../release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync
+#          popd
+#          
+#          gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/ryujinx --command=UploadGenericPackage "Ryubing|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage"
+#          gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/ryujinx --command=UploadGenericPackage "Ryubing|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync"
+#        shell: bash
 
   macos_release:
     name: Release MacOS universal

BuildAndPushLibraries.sh

@@ -0,0 +1,18 @@
+function pub {
+  dotnet publish -c release
+}
+
+function package {
+  cd src/$1
+  pub
+  mv bin/Release/$1.1.0.0.nupkg ../../pkgs/$1.1.0.0.nupkg
+  cd ../../
+}
+
+rm -rf pkgs
+mkdir pkgs
+
+package ARMeilleure
+package Ryujinx.Memory
+
+dotnet nuget push pkgs/*.nupkg --source RyubingPkgs

CHANGELOG.md

@@ -21,8 +21,8 @@ Additionally, 1.2.74 & 75 were fixes for uploading Windows build artifacts.
 
 1.2.76 fixes a rare crash on startup.
 
-## [1.2.72](<https://git.ryujinx.app/ryubing/ryujinx/-/tags/1.2.72>) - 2024-11-03
+## [1.2.72](<https://github.com/GreemDev/Ryujinx/releases/tag/1.2.72>) - 2024-11-03
-PRs [#163](<https://web.archive.org/web/20241123015123/https://github.com/GreemDev/Ryujinx/pull/163>), [#164](<https://web.archive.org/web/20250307192526/https://github.com/Ryubing/Ryujinx/pull/164>), [#139](<https://web.archive.org/web/20250306123457/https://github.com/Ryubing/Ryujinx/pull/139>)
+PRs [#163](<https://github.com/GreemDev/Ryujinx/pull/163>), [#164](<https://github.com/GreemDev/Ryujinx/pull/164>), [#139](<https://github.com/GreemDev/Ryujinx/pull/139>)
 ### HLE:
  - Add DebugMouse HID device.
    - Fixes "Clock Tower Rewind" crashing while loading.
@@ -32,7 +32,7 @@ PRs [#163](<https://web.archive.org/web/20241123015123/https://github.com/GreemD
 ### misc:
  - Update macOS distribution .icns.
 
-## [1.2.69](<https://git.ryujinx.app/ryubing/ryujinx/-/tags/1.2.69>) - 2024-11-01
+## [1.2.69](<https://github.com/GreemDev/Ryujinx/releases/tag/1.2.69>) - 2024-11-01
 ### Infra:
   - Compile the native libraries into the Ryujinx executable.
   - Remove `libarmeilleure-jitsupport.dylib` from Windows & Linux releases (dylibs are macOS-only)
@@ -42,8 +42,8 @@ PRs [#163](<https://web.archive.org/web/20241123015123/https://github.com/GreemD
   - Replace "" with `string.Empty`.
   - Code cleanups & simplifications.
 
-## [1.2.67](<https://git.ryujinx.app/ryubing/ryujinx/-/tags/1.2.67>) - 2024-11-01
+## [1.2.67](<https://github.com/GreemDev/Ryujinx/releases/tag/1.2.67>) - 2024-11-01
-PRs [#36](<https://web.archive.org/web/20250306215917/https://github.com/Ryubing/Ryujinx/pull/36>), [#135](<https://web.archive.org/web/20241122135125/https://github.com/GreemDev/Ryujinx/pull/135>)
+PRs [#36](<https://github.com/GreemDev/Ryujinx/pull/36>), [#135](<https://github.com/GreemDev/Ryujinx/pull/135>)
 
 ### GUI:
   - Set UseFloatingWatermark to false when watermark is empty
@@ -54,8 +54,8 @@ PRs [#36](<https://web.archive.org/web/20250306215917/https://github.com/Ryubing
   - Fix homebrew loading.
 
 
-## [1.2.64](https://git.ryujinx.app/ryubing/ryujinx/-/tags/1.2.64) - 2024-10-30
+## [1.2.64](https://github.com/GreemDev/Ryujinx/releases/tag/1.2.64) - 2024-10-30
-PRs [#92](https://web.archive.org/web/20241118052724/https://github.com/GreemDev/Ryujinx/pull/92), ~~[#96](https://github.com/GreemDev/Ryujinx/pull/96)~~, ~~[#97](https://github.com/GreemDev/Ryujinx/pull/97)~~,  [#101](https://web.archive.org/web/20250306223605/https://github.com/Ryubing/Ryujinx/pull/101), ~~[#103](https://github.com/GreemDev/Ryujinx/pull/103)~~
+PRs [#92](https://github.com/GreemDev/Ryujinx/pull/92), [#96](https://github.com/GreemDev/Ryujinx/pull/96), [#97](https://github.com/GreemDev/Ryujinx/pull/97),  [#101](https://github.com/GreemDev/Ryujinx/pull/101), [#103](https://github.com/GreemDev/Ryujinx/pull/103)
 ### GUI:
 - Option to show classic-style title bar. Requires restart of emulator to take effect.
   - This is only relevant on Windows. Other Operating Systems default to this being on and not being changeable, because the custom (current) title bar only works on Windows in the first place.
@@ -71,14 +71,14 @@ PRs [#92](https://web.archive.org/web/20241118052724/https://github.com/GreemDev
 
 ## 1.2.59 - 2024-10-27
 
-PRs ~~[#88](https://github.com/GreemDev/Ryujinx/pull/88), [#87](https://github.com/GreemDev/Ryujinx/pull/87)~~
+PRs [#88](https://github.com/GreemDev/Ryujinx/pull/88), [#87](https://github.com/GreemDev/Ryujinx/pull/87)
 ### i18n:
 - fr_FR:
   - Add missing translations for new features & fix a couple wrong ones.
   - Fix Ignore Missing Services / Ignore Applet tooltip.
 
 ## 1.2.57 - 2024-10-27
-PRs ~~[#60](https://github.com/GreemDev/Ryujinx/pull/60)~~, [#42](https://web.archive.org/web/20241126203614/https://github.com/GreemDev/Ryujinx/pull/42)
+PRs [#60](https://github.com/GreemDev/Ryujinx/pull/60), [#42](https://github.com/GreemDev/Ryujinx/pull/42)
 ### GUI:
 - Automatically remove invalid DLC & updates as part of autoload.
 - Added Thai translation for Ignore Applet hover tooltip.
@@ -104,7 +104,7 @@ PRs ~~[#60](https://github.com/GreemDev/Ryujinx/pull/60)~~, [#42](https://web.ar
 - Code cleanup.
 
 ## 1.2.44 - 2024-10-25
-PR [#59](https://web.archive.org/web/20241125060420/https://github.com/GreemDev/Ryujinx/pull/59)
+PR [#59](https://github.com/GreemDev/Ryujinx/pull/59)
 ### GUI:
 - Add descriptions for "ignoring applet" translated into other languages.
 
@@ -117,9 +117,9 @@ NOTE: The translation isn't referenced in the code yet, it will be in the next u
 ## 1.2.42 - 2024-10-24
 Sources:
 
-Init function: [archive of github.com/MutantAura/Ryujinx/commit/9cef4ceba40d66492ff775af793ff70e6e7551a9](https://web.archive.org/web/20241122193401/https://github.com/MutantAura/Ryujinx/commit/9cef4ceba40d66492ff775af793ff70e6e7551a9)
+Init function: https://github.com/MutantAura/Ryujinx/commit/9cef4ceba40d66492ff775af793ff70e6e7551a9
 
-Shader counter: ~~https://github.com/MutantAura/Ryujinx/commit/67b873645fd593e83d042a77bf7ab12e5ec97357~~ Original commit has been lost
+Shader counter: https://github.com/MutantAura/Ryujinx/commit/67b873645fd593e83d042a77bf7ab12e5ec97357
 
 Thanks MutantAura :D
 ### GUI:
@@ -127,14 +127,14 @@ Thanks MutantAura :D
 - Remove graphics backend / GPU name event logic in favor of a single init function.
 
 ## 1.2.41 - 2024-10-24
-PR ~~[#54](https://github.com/GreemDev/Ryujinx/pull/54)~~
+PR [#54](https://github.com/GreemDev/Ryujinx/pull/54)
 
 Thanks Whitescatz!
 ### i18n:
 - th_TH (Thai): Added missing translations, reduce transliterated words, fix grammar.
 
 ## 1.2.40 - 2024-10-23
-PR ~~[#40](https://github.com/GreemDev/Ryujinx/pull/40)~~
+PR [#40](https://github.com/GreemDev/Ryujinx/pull/40)
 
 Thanks Вова С!
 ### GUI:
@@ -148,30 +148,30 @@ Thanks Вова С!
   - Should prevent crashing on config loads in some circumstances.
 
 ## 1.2.38 - 2024-10-23
-PR [#51](https://web.archive.org/web/20241127022413/https://github.com/GreemDev/Ryujinx/pull/51)
+PR [#51](https://github.com/GreemDev/Ryujinx/pull/51)
 ### i18n:
 - zh_CH (Simplified Chinese): Add some missing translations.
 
 ## 1.2.37 - 2024-10-23
-PR [#37](https://web.archive.org/web/20241123010103/https://github.com/GreemDev/Ryujinx/pull/37)
+PR [#37](https://github.com/GreemDev/Ryujinx/pull/37)
 
 Thanks Last Breath!
 ### GUI: 
 - Set the default controller to the Pro Controller.
 
 ## 1.2.36 - 2024-10-21
-PR ~~[#30](https://github.com/GreemDev/Ryujinx/pull/30)~~
+PR [#30](https://github.com/GreemDev/Ryujinx/pull/30)
 ### GUI:
 - Fix repeated dialog popup notifying you of new updates when there aren't any, while having a bundled update inside an XCI and an external update file.
 
 ## 1.2.35 - 2024-10-21
-PR [#32](https://web.archive.org/web/20241127010942/https://github.com/GreemDev/Ryujinx/pull/32)
+PR [#32](https://github.com/GreemDev/Ryujinx/pull/32)
 ### GUI:
 - Replace "expand DRAM" option with a DRAM size dropdown.
   - Allows for using mods which require a ridiculous amount of memory to allocate from.
 
 ## 1.2.34 - 2024-10-21
-PR [#29](https://web.archive.org/web/20241125093029/https://github.com/GreemDev/Ryujinx/pull/29)
+PR [#29](https://github.com/GreemDev/Ryujinx/pull/29)
 ### GUI:
 - Fix duplicate controller names when 2 controllers of the same type are connected.
 ### INPUT:
@@ -248,7 +248,7 @@ Added Low-power PPTC mode strings to the translation files.
 ## 1.2.1-1.2.19 - 2024-10-08 - 2024-10-11
 ### GUI/INFRA/MISC:
 - Remove GTK UI.
-- Autoload DLC/Updates from dir ([#12](https://web.archive.org/web/20241127004005/https://github.com/GreemDev/Ryujinx/pull/12)).
+- Autoload DLC/Updates from dir ([#12](https://github.com/GreemDev/Ryujinx/pull/12)).
 - Changed executable icon to rainbow logo.
 - Extract Data > Logo now also extracts the square thumbnail you see for the game in the UI. 
 - The "use random UUID hack" checkbox in the Amiibo screen now remembers its last state when you reopen the window in a given session.

Directory.Packages.props

@@ -19,8 +19,8 @@
     <PackageVersion Include="CommandLineParser" Version="2.9.1" />
     <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0"/>
     <PackageVersion Include="Concentus" Version="2.2.2" />
-    <PackageVersion Include="DiscordRichPresence" Version="1.6.1.70" />
+    <PackageVersion Include="DiscordRichPresence" Version="1.2.1.24" />
-    <PackageVersion Include="DynamicData" Version="9.4.1" />
+    <PackageVersion Include="DynamicData" Version="9.0.4" />
     <PackageVersion Include="FluentAvaloniaUI" Version="2.0.5" />
     <PackageVersion Include="Humanizer" Version="2.14.1" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
@@ -42,11 +42,11 @@
     <PackageVersion Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Version="1.2.0" />
     <PackageVersion Include="Ryujinx.LibHac" Version="0.21.0-alpha.116" />
     <PackageVersion Include="Ryujinx.SDL2-CS" Version="2.30.0-build32" />
-    <PackageVersion Include="Ryujinx.UpdateClient" Version="1.0.44" />
+    <PackageVersion Include="Ryujinx.UpdateClient" Version="1.0.29" />
-    <PackageVersion Include="Ryujinx.Systems.Update.Common" Version="1.0.44" />
+    <PackageVersion Include="Ryujinx.Systems.Update.Common" Version="1.0.29" />
-    <PackageVersion Include="Gommon" Version="2.7.2.1" />
+    <PackageVersion Include="Gommon" Version="2.7.1.1" />
     <PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />
-    <PackageVersion Include="Sep" Version="0.11.1" />
+    <PackageVersion Include="Sep" Version="0.6.0" />
     <PackageVersion Include="shaderc.net" Version="0.1.0" />
     <PackageVersion Include="SharpZipLib" Version="1.4.2" />
     <PackageVersion Include="Silk.NET.Vulkan" Version="2.22.0" />
@@ -55,6 +55,7 @@
     <PackageVersion Include="SkiaSharp" Version="2.88.9" />
     <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.9" />
     <PackageVersion Include="SPB" Version="0.0.4-build32" />
+    <PackageVersion Include="Starscript.Net" Version="1.0.36" />
     <PackageVersion Include="System.IO.Hashing" Version="9.0.2" />
     <PackageVersion Include="System.Management" Version="9.0.2" />
     <PackageVersion Include="UnicornEngine.Unicorn" Version="2.0.2-rc1-fb78016" />

distribution/linux/appimage/build-appimage.sh

@@ -6,6 +6,7 @@ cd "$ROOTDIR"
 
 BUILDDIR=${BUILDDIR:-publish}
 OUTDIR=${OUTDIR:-publish_appimage}
+UFLAG=${UFLAG:-"gh-releases-zsync|Ryubing|ryujinx|latest|*-x64.AppImage.zsync"}
 
 rm -rf AppDir
 mkdir -p AppDir/usr/bin
@@ -22,5 +23,11 @@ chmod +x AppDir/AppRun AppDir/usr/bin/Ryujinx*
 
 mkdir -p "$OUTDIR"
 
-appimagetool -n --comp zstd --mksquashfs-opt -Xcompression-level --mksquashfs-opt 21 \
+appimagetool --comp zstd --mksquashfs-opt -Xcompression-level --mksquashfs-opt 21 \
+    -u "$UFLAG" \
     AppDir "$OUTDIR"/Ryujinx.AppImage
+
+# Move zsync file needed for delta updates
+if [ "$RELEASE" = "1" ]; then
+    mv ./*.AppImage.zsync "$OUTDIR"
+fi

docs/compatibility.csv

@@ -188,8 +188,6 @@
 01003DD00BFEE000,"Airheart - Tales of broken Wings",,playable,2021-02-26 15:20:27
 01007F100DE52000,"Akane",nvdec,playable,2022-07-21 00:12:18
 01009A800F0C8000,"Akash: Path of the Five",gpu;nvdec,ingame,2020-12-14 22:33:12
-01009E8012976000,"AKIBA'S TRIP: Hellbound & Debriefed",,playable,2025-07-30 23:22:47
-0100D74019A0E000,"AKIBA'S TRIP: Undead & Undressed Director's Cut",,playable,2025-07-31 13:58:42
 010053100B0EA000,"Akihabara - Feel the Rhythm Remixed",,playable,2021-02-22 14:39:35
 0100D4C00EE0C000,"Akuarium",slow,playable,2020-12-12 23:43:36
 010026E00FEBE000,"Akuto: Showdown",,playable,2020-08-04 19:43:27
@@ -978,7 +976,7 @@
 0100416004C00000,"DOOM",gpu;slow;nvdec;online-broken,ingame,2024-09-23 15:40:07
 010018900DD00000,"DOOM (1993)",nvdec;online-broken,menus,2022-09-06 13:32:19
 01008CB01E52E000,"DOOM + DOOM II",opengl;ldn-untested;LAN,playable,2024-09-12 07:06:01
-010029D00E740000,"DOOM 3",crash;slow,menus,2024-08-03 05:25:47
+010029D00E740000,"DOOM 3",crash,menus,2024-08-03 05:25:47
 01005D700E742000,"DOOM 64",nvdec;vulkan,playable,2020-10-13 23:47:28
 0100D4F00DD02000,"DOOM II (Classic)",nvdec;online,playable,2021-06-03 20:10:01
 0100B1A00D8CE000,"DOOM® Eternal",gpu;slow;nvdec;online-broken,ingame,2024-08-28 15:57:17
@@ -1097,7 +1095,6 @@
 0100F9600E746000,"ESP Ra.De. Psi",audio;slow,ingame,2024-03-07 15:05:08
 010073000FE18000,"Esports powerful pro yakyuu 2020",gpu;crash;Needs More Attention,ingame,2024-04-29 05:34:14
 01004F9012FD8000,"Estranged: The Departure",nvdec;UE4,playable,2022-10-24 10:37:58
-010018F01E0A0000,"Eternights",,playable,2025-07-30 12:10:24
 0100CB900B498000,"Eternum Ex",,playable,2021-01-13 20:28:32
 010092501EB2C000,"Europa (Demo)",gpu;crash;UE4,ingame,2024-04-23 10:47:12
 01007BE0160D6000,"EVE ghost enemies",gpu,ingame,2023-01-14 03:13:30
@@ -1175,7 +1172,6 @@
 0100EB100AB42000,"FINAL FANTASY XII THE ZODIAC AGE",opengl;vulkan-backend-bug,playable,2024-08-11 07:01:54
 010068F00AA78000,"FINAL FANTASY XV POCKET EDITION HD",,playable,2021-01-05 17:52:08
 0100CE4010AAC000,"FINAL FANTASY® CRYSTAL CHRONICLES™ Remastered Edition",,playable,2023-04-02 23:39:12
-010038B015560000,FINAL FANTASY TACTICS - The Ivalice Chronicles,gpu,boots,2024-09-30 02:59:00
 01001BA00AE4E000,"Final Light, The Prison",,playable,2020-07-31 21:48:44
 0100FF100FB68000,"Finding Teddy 2 : Definitive Edition",gpu,ingame,2024-04-19 16:51:33
 0100F4E013AAE000,"Fire & Water",,playable,2020-12-15 15:43:20
@@ -1244,8 +1240,6 @@
 010003F00BD48000,"Friday the 13th: Killer Puzzle",,playable,2021-01-28 01:33:38
 010092A00C4B6000,"Friday the 13th: The Game Ultimate Slasher Edition",nvdec;online-broken;UE4,playable,2022-09-06 17:33:27
 0100F200178F4000,"FRONT MISSION 1st: Remake",,playable,2023-06-09 07:44:24
-0100C4E018A24000,"FRONT MISSION 2: Remake",,playable,2025-07-30 12:11:23
-01007E6019872000,"FRONT MISSION 3: Remake",,playable,2025-07-30 12:12:02
 0100861012474000,"Frontline Zed",,playable,2020-10-03 12:55:59
 0100B5300B49A000,"Frost",,playable,2022-07-27 12:00:36
 010038A007AA4000,"FruitFall Crush",,playable,2020-10-20 11:33:33
@@ -1441,7 +1435,6 @@
 0100C2700E338000,"Heroland",,playable,2020-08-05 15:35:39
 01007AC00E012000,"HexaGravity",,playable,2021-05-28 13:47:48
 01004E800F03C000,"Hidden",slow,ingame,2022-10-05 10:56:53
-0100C1101EE5A000,"High on Life",,menus,2025-08-26 19:11:00
 0100F6A00A684000,"Higurashi no Naku Koro ni Hō",audio,ingame,2021-09-18 14:40:28
 0100F8D0129F4000,"Himehibi 1 gakki - Princess Days",crash,nothing,2021-11-03 08:34:19
 0100F3D008436000,"Hiragana Pixel Party",,playable,2021-01-14 08:36:50
@@ -1451,7 +1444,6 @@
 0100F7300ED2C000,"Hoggy2",,playable,2022-10-10 13:53:35
 0100F7E00C70E000,"Hogwarts Legacy",UE4;slow,ingame,2024-09-03 19:53:58
 0100633007D48000,"Hollow Knight",nvdec,playable,2023-01-16 15:44:56
-010013C00E930000,"Hollow Knight: Silksong",,playable,2025-09-04 17:23:22
 0100F2100061E800,"Hollow0",UE4;gpu,ingame,2021-03-03 23:42:56
 0100342009E16000,"Holy Potatoes! What The Hell?!",,playable,2020-07-03 10:48:56
 010071B00C904000,"HoPiKo",,playable,2021-01-13 20:12:38
@@ -1526,7 +1518,6 @@
 010095C016C14000,"Iridium",,playable,2022-08-05 23:19:53
 0100AD300B786000,"Iris School of Wizardry -Vinculum Hearts-",,playable,2022-12-05 13:11:15
 0100945012168000,"Iris.Fall",nvdec,playable,2022-10-18 13:40:22
-010059801B736000,"IronFall: Invasion",,playable,2025-07-30 11:42:30 
 01005270118D6000,"Iron Wings",slow,ingame,2022-08-07 08:32:57
 01004DB003E6A000,"IRONCAST",,playable,2021-01-13 13:54:29
 0100E5700CD56000,"Irony Curtain: From Matryoshka with Love",,playable,2021-06-04 20:12:37
@@ -1890,7 +1881,7 @@
 010097800EA20000,"Monster Energy Supercross - The Official Videogame 3",UE4;audout;nvdec;online,playable,2021-06-14 12:37:54
 0100E9900ED74000,"Monster Farm",32-bit;nvdec,playable,2021-05-05 19:29:13
 0100770008DD8000,"Monster Hunter Generations Ultimate™",32-bit;online-broken;ldn-works,playable,2024-03-18 14:35:36
-0100B04011742000,"MONSTER HUNTER RISE",gpu;slow;crash;nvdec;online-broken;Needs Update;ldn-works,ingame,2024-08-24 11:04:59
+0100B04011742000,"Monster Hunter Rise",gpu;slow;crash;nvdec;online-broken;Needs Update;ldn-works,ingame,2024-08-24 11:04:59
 010093A01305C000,"Monster Hunter Rise Demo",online-broken;ldn-works;demo,playable,2022-10-18 23:04:17
 0100E21011446000,"Monster Hunter Stories 2: Wings of Ruin",services,ingame,2022-07-10 19:27:30
 010042501329E000,"MONSTER HUNTER STORIES 2: WINGS OF RUIN Trial Version",demo,playable,2022-11-13 22:20:26
@@ -2272,7 +2263,6 @@
 0100ABF008968000,"Pokémon Sword + Pokémon Sword Expansion Pass",deadlock;crash;online-broken;ldn-works;LAN,ingame,2024-08-26 15:40:37
 01009AD008C4C000,"Pokémon: Let's Go, Pikachu! demo",slow;demo,playable,2023-11-26 11:23:20
 0100000011D90000,"Pokémon™ Brilliant Diamond",gpu;ldn-works,ingame,2024-08-28 13:26:35
-010018E011D92000,"Pokémon™ Shining Pearl",gpu;ldn-works,ingame,2024-08-28 13:26:35
 010015F008C54000,"Pokémon™ HOME",Needs Update;crash;services,menus,2020-12-06 06:01:51
 01001F5010DFA000,"Pokémon™ Legends: Arceus",gpu;Needs Update;ldn-works,ingame,2024-09-19 10:02:02
 01005D100807A000,"Pokémon™ Quest",,playable,2022-02-22 16:12:32
@@ -2316,7 +2306,6 @@
 010077B00BDD8000,"Professional Farmer: Nintendo Switch™ Edition",slow,playable,2020-12-16 13:38:19
 010018300C83A000,"Professor Lupo and his Horrible Pets",,playable,2020-06-12 00:08:45
 0100D1F0132F6000,"Professor Lupo: Ocean",,playable,2021-04-14 16:33:33
-0100C3A017834000,"Prodeus",,playable,2025-07-30 12:07:52
 0100BBD00976C000,"Project Highrise: Architect's Edition",,playable,2022-08-10 17:19:12
 0100ACE00DAB6000,"Project Nimbus: Complete Edition",nvdec;UE4;vulkan-backend-bug,playable,2022-08-10 17:35:43
 01002980140F6000,"Project TRIANGLE STRATEGY™ Debut Demo",UE4;demo,playable,2022-10-24 21:40:27
@@ -2582,7 +2571,6 @@
 0100C610154CA000,"Shadowrun: Hong Kong - Extended Edition",gpu;Needs Update,ingame,2022-10-04 20:53:09
 010000000EEF0000,"Shadows 2: Perfidia",,playable,2020-08-07 12:43:46
 0100AD700CBBE000,"Shadows of Adam",,playable,2021-01-11 13:35:58
-010037A01F96C000,"Shadows of the Damned: Hella Remastered",,playable,2025-09-05 11:34:32
 01002A800C064000,"Shadowverse Champions Battle",,playable,2022-10-02 22:59:29
 01003B90136DA000,"Shadowverse: Champion's Battle",crash,nothing,2023-03-06 00:31:50
 0100820013612000,"Shady Part of Me",,playable,2022-10-20 11:31:55
@@ -2709,8 +2697,6 @@
 01008F701C074000,"SONIC SUPERSTARS",gpu;nvdec,ingame,2023-10-28 17:48:07
 010088801C150000,"Sonic Superstars Digital Art Book with Mini Digital Soundtrack",,playable,2024-08-20 13:26:56
 01005EA01C0FC000,"SONIC X SHADOW GENERATIONS",crash,ingame,2025-01-07 04:20:45
-010064B0242BE000,"Sonic Racing: CrossWorlds - Demo",gpu;vulkan-backend-bug;demo,ingame,2024-09-25 11:27:53
-01006E001823C000,"Sonic Racing: CrossWorlds",gpu;vulkan-backend-bug;ldn-broken,ingame,2024-09-30 17:23:00
 010064F00C212000,"Soul Axiom Rebooted",nvdec;slow,ingame,2020-09-04 12:41:01
 0100F2100F0B2000,"Soul Searching",,playable,2020-07-09 18:39:07
 01008F2005154000,"South Park™: The Fractured but Whole™ - Standard Edition",slow;online-broken;vulkan-backend-bug;gpu,ingame,2025-01-21 17:35:10
@@ -2782,7 +2768,7 @@
 0100E6B0115FC000,"Star99",online,menus,2021-11-26 14:18:51
 01002100137BA000,"Stardash",,playable,2021-01-21 16:31:19
 0100E65002BB8000,"Stardew Valley",online-broken;ldn-untested,playable,2024-02-14 03:11:19
-01002CC003FE6000,"Starlink: Battle for Atlas™ Digital Edition",,playable,2025-07-30 12:09:37
+01002CC003FE6000,"Starlink: Battle for Atlas™ Digital Edition",services-horizon;crash;Needs Update,nothing,2024-05-05 17:25:11
 010098E010FDA000,"Starlit Adventures Golden Stars",,playable,2020-11-21 12:14:43
 01001BB00AC26000,"STARSHIP AVENGER Operation: Take Back Earth",,playable,2021-01-12 15:52:55
 010000700A572000,"State of Anarchy: Master of Mayhem",nvdec,playable,2021-01-12 19:00:05
@@ -2868,13 +2854,11 @@
 0100BC0018138000,"Super Mario RPG™",gpu;audio;nvdec,ingame,2024-06-19 17:43:42
 ,"Super Mario World",homebrew,boots,2024-06-13 01:40:31
 010049900F546000,"Super Mario™ 3D All-Stars",services-horizon;slow;vulkan;amd-vendor-bug,ingame,2024-05-07 02:38:16
-010099C022B96000,"Super Mario Galaxy",slow;vulkan;amd-vendor-bug;vulkan-vendor-bug,ingame,2025-10-01 15:30:00
-0100FD8022DAA000,"Super Mario Galaxy 2",slow;vulkan;amd-vendor-bug;vulkan-vendor-bug;deadlock,ingame,2025-10-04 18:50:00
 010028600EBDA000,"Super Mario™ 3D World + Bowser’s Fury",ldn-works,playable,2024-07-31 10:45:37
 01004F8006A78000,"Super Meat Boy",services,playable,2020-04-02 23:10:07
 01009C200D60E000,"Super Meat Boy Forever",gpu,boots,2021-04-26 14:25:39
 0100BDD00EC5C000,"Super Mega Space Blaster Special Turbo",online,playable,2020-08-06 12:13:25
-010031F019294000,"Super Monkey Ball Banana Rumble",ldn-broken,playable,2025-10-01 18:03:00
+010031F019294000,"Super Monkey Ball Banana Rumble",,playable,2024-06-28 10:39:18
 0100B2A00E1E0000,"Super Monkey Ball: Banana Blitz HD",online-broken,playable,2022-09-16 13:16:25
 01006D000D2A0000,"Super Mutant Alien Assault",,playable,2020-06-07 23:32:45
 01004D600AC14000,"Super Neptunia RPG",nvdec,playable,2022-08-17 16:38:52
@@ -2940,7 +2924,6 @@
 0100B76011DAA000,"Taxi Chaos",slow;online-broken;UE4,playable,2022-10-25 19:13:00
 0100F43011E5A000,"Tcheco in the Castle of Lucio",,playable,2020-06-27 13:35:43
 010092B0091D0000,"Team Sonic Racing",online-broken;ldn-works,playable,2024-02-05 15:05:27
-010084B00B36E000,"Team Sonic Racing",online-broken;ldn-works,playable,2024-02-05 15:05:27
 0100FE701475A000,"Teenage Mutant Ninja Turtles: Shredder's Revenge",deadlock;crash,boots,2024-09-28 09:31:39
 01005CF01E784000,"Teenage Mutant Ninja Turtles: Splintered Fate",,playable,2024-08-03 13:50:42
 0100FDB0154E4000,"Teenage Mutant Ninja Turtles: The Cowabunga Collection",,playable,2024-01-22 19:39:04
@@ -2986,7 +2969,6 @@
 0100EBA01548E000,"The Cruel King and the Great Hero",gpu;services,ingame,2022-12-02 07:02:08
 010051800E922000,"The Dark Crystal: Age of Resistance Tactics",,playable,2020-08-11 13:43:41
 01003DE00918E000,"The Darkside Detective",,playable,2020-06-03 22:16:18
-010032B015D66000,"The DioField Chronicle",,playable,2025-09-05 11:35:50
 01000A10041EA000,"The Elder Scrolls V: Skyrim",gpu;crash,ingame,2024-07-14 03:21:31
 01004A9006B84000,"The End Is Nigh",,playable,2020-06-01 11:26:45
 0100CA100489C000,"The Escapists 2",nvdec,playable,2020-09-24 12:31:31
@@ -2994,7 +2976,6 @@
 0100C2E0129A6000,"The Executioner",nvdec,playable,2021-01-23 00:31:28
 01006050114D4000,"The Experiment: Escape Room",gpu,ingame,2022-09-30 13:20:35
 0100B5900DFB2000,"The Eyes of Ara",,playable,2022-09-16 14:44:06
-0100BA5013E52000,"The Falconeer: Warrior Edition",,playable,2025-07-30 12:04:50
 01002DD00AF9E000,"The Fall",gpu,ingame,2020-05-31 23:31:16
 01003E5002320000,"The Fall Part 2: Unbound",,playable,2021-11-06 02:18:08
 0100CDC00789E000,"The Final Station",nvdec,playable,2022-08-22 15:54:39
@@ -3217,7 +3198,6 @@
 010000400F582000,"TT Isle of Man Ride on the Edge 2",gpu;nvdec;online-broken,ingame,2022-09-30 22:13:05
 0100752011628000,"TTV2",,playable,2020-11-27 13:21:36
 0100AFE00452E000,"Tumblestone",,playable,2021-01-07 17:49:20
-0100D1A01D7BA000,"Turbo Overkill",,playable,2025-07-30 12:08:57
 010085500D5F6000,"Turok",gpu,ingame,2021-06-04 13:16:24
 0100CDC00D8D6000,"Turok 2: Seeds of Evil",gpu;vulkan,ingame,2022-09-12 17:50:05
 010004B0130C8000,"Turrican Flashback",audout,playable,2021-08-30 10:07:56
@@ -3227,7 +3207,6 @@
 010038400C2FE000,"TY the Tasmanian Tiger™ HD",32-bit;crash;nvdec,menus,2020-12-17 21:15:00
 010073A00C4B2000,"Tyd wag vir Niemand",,playable,2021-03-02 13:39:53
 0100D5B00D6DA000,"Type:Rider",,playable,2021-01-06 13:12:55
-01008AF01AD22000,"The Patrick Star Game",,playable,2025-10-01 17:55:30
 010040D01222C000,"UBERMOSH: SANTICIDE",,playable,2020-11-27 15:05:01
 0100992010BF8000,"Ubongo",,playable,2021-02-04 21:15:01
 010079000B56C000,"UglyDolls: An Imperfect Adventure",nvdec;UE4,playable,2022-08-25 14:42:16
@@ -3242,8 +3221,6 @@
 0100592005164000,"UNBOX: Newbie's Adventure",UE4,playable,2022-08-29 13:12:56
 01002D900C5E4000,"Uncanny Valley",nvdec,playable,2021-06-04 13:28:45
 010076F011F54000,"Undead & Beyond",nvdec,playable,2022-10-04 09:11:18
-01009B700D0B8000,"Undead Horde",,playable,2025-07-30 12:05:05
-0100FC301A878000,"Undead Horde 2: Necropolis",,playable,2025-07-30 12:06:07
 01008F3013E4E000,"Under Leaves",,playable,2021-05-22 18:13:58
 010080B00AD66000,"Undertale",,playable,2022-08-31 17:31:46
 01008F80049C6000,"Unepic",,playable,2024-01-15 17:03:00
@@ -3474,6 +3451,3 @@
 0100F4401940A000,"超探偵事件簿 レインコード  (Master Detective Archives: Rain Code)",crash,ingame,2024-02-12 20:58:31
 010064801A01C000,"超次元ゲイム ネプテューヌ GameMaker R:Evolution",crash,nothing,2023-10-30 22:37:40
 0100F3400332C000,"ゼノブレイド2",deadlock;amd-vendor-bug,ingame,2024-03-28 14:31:41
-010075000ECBE000,"超级马力欧 奥德赛",nvdec;intel-vendor-bug;mac-bug,playable,2024-08-25 01:32:34
-010075100E8EC000,"马力欧卡丁车8 豪华版",32-bit;ldn-works;LAN;amd-vendor-bug,playable,2024-09-19 11:55:17
-0100E8C00F506000,"新 超级马力欧兄弟U 豪华版",32-bit,playable,2023-10-08 02:06:37

src/ARMeilleure/Instructions/InstEmitFlowHelper.cs

@@ -143,12 +143,6 @@ namespace ARMeilleure.Instructions
 
         public static void EmitCall(ArmEmitterContext context, ulong immediate)
         {
-            if (context.IsSingleStep)
-            {
-                context.Return(Const(immediate));
-                return;
-            }
-
             bool isRecursive = immediate == context.EntryAddress;
 
             if (isRecursive)
@@ -162,25 +156,13 @@ namespace ARMeilleure.Instructions
         }
 
         public static void EmitVirtualCall(ArmEmitterContext context, Operand target)
-        {
-            if (context.IsSingleStep)
-            {
-                if (target.Type == OperandType.I32)
-                {
-                    target = context.ZeroExtend32(OperandType.I64, target);
-                }
-
-                context.Return(target);
-            }
-            else
         {
             EmitTableBranch(context, target, isJump: false);
         }
-        }
 
         public static void EmitVirtualJump(ArmEmitterContext context, Operand target, bool isReturn)
         {
-            if (isReturn || context.IsSingleStep)
+            if (isReturn)
             {
                 if (target.Type == OperandType.I32)
                 {

src/ARMeilleure/Instructions/NativeInterface.cs

@@ -3,7 +3,6 @@ using ARMeilleure.State;
 using ARMeilleure.Translation;
 using System;
 using System.Runtime.InteropServices;
-using ExecutionContext = ARMeilleure.State.ExecutionContext;
 
 namespace ARMeilleure.Instructions
 {
@@ -201,11 +200,7 @@ namespace ARMeilleure.Instructions
 
             ExecutionContext context = GetContext();
 
-            // If debugging, we'll handle interrupts outside
-            if (!Optimizations.EnableDebugging)
-            {
             context.CheckInterrupt();
-            }
 
             Statistics.ResumeTimer();
 

src/ARMeilleure/Optimizations.cs

@@ -12,7 +12,6 @@ namespace ARMeilleure
 
         public static bool AllowLcqInFunctionTable { get; set; } = true;
         public static bool UseUnmanagedDispatchLoop { get; set; } = true;
-        public static bool EnableDebugging { get; set; } = false;
 
         public static bool UseAdvSimdIfAvailable { get; set; } = true;
         public static bool UseArm64AesIfAvailable { get; set; } = true;

src/ARMeilleure/State/ExecutionContext.cs

@@ -1,5 +1,4 @@
 using ARMeilleure.Memory;
-using System.Threading;
 
 namespace ARMeilleure.State
 {
@@ -11,7 +10,7 @@ namespace ARMeilleure.State
 
         internal nint NativeContextPtr => _nativeContext.BasePtr;
 
-        internal bool Interrupted { get; private set; }
+        private bool _interrupted;
 
         private readonly ICounter _counter;
 
@@ -66,8 +65,6 @@ namespace ARMeilleure.State
 
         public bool IsAarch32 { get; set; }
 
-        public ulong ThreadUid { get; set; }
-
         internal ExecutionMode ExecutionMode
         {
             get
@@ -93,19 +90,14 @@ namespace ARMeilleure.State
 
         private readonly ExceptionCallbackNoArgs _interruptCallback;
         private readonly ExceptionCallback _breakCallback;
-        private readonly ExceptionCallbackNoArgs _stepCallback;
         private readonly ExceptionCallback _supervisorCallback;
         private readonly ExceptionCallback _undefinedCallback;
 
-        internal int ShouldStep;
-        public ulong DebugPc { get; set; }
-
         public ExecutionContext(
             IJitMemoryAllocator allocator,
             ICounter counter,
             ExceptionCallbackNoArgs interruptCallback = null,
             ExceptionCallback breakCallback = null,
-            ExceptionCallbackNoArgs stepCallback = null,
             ExceptionCallback supervisorCallback = null,
             ExceptionCallback undefinedCallback = null)
         {
@@ -113,7 +105,6 @@ namespace ARMeilleure.State
             _counter = counter;
             _interruptCallback = interruptCallback;
             _breakCallback = breakCallback;
-            _stepCallback = stepCallback;
             _supervisorCallback = supervisorCallback;
             _undefinedCallback = undefinedCallback;
 
@@ -136,9 +127,9 @@ namespace ARMeilleure.State
 
         internal void CheckInterrupt()
         {
-            if (Interrupted)
+            if (_interrupted)
             {
-                Interrupted = false;
+                _interrupted = false;
 
                 _interruptCallback?.Invoke(this);
             }
@@ -148,37 +139,16 @@ namespace ARMeilleure.State
 
         public void RequestInterrupt()
         {
-            Interrupted = true;
+            _interrupted = true;
-        }
-
-        public void StepHandler()
-        {
-            _stepCallback?.Invoke(this);
-        }
-
-        public void RequestDebugStep()
-        {
-            Interlocked.Exchange(ref ShouldStep, 1);
-            RequestInterrupt();
         }
 
         internal void OnBreak(ulong address, int imm)
         {
-            if (Optimizations.EnableDebugging)
-            {
-                DebugPc = Pc;
-            }
-
             _breakCallback?.Invoke(this, address, imm);
         }
 
         internal void OnSupervisorCall(ulong address, int imm)
         {
-            if (Optimizations.EnableDebugging)
-            {
-                DebugPc = Pc;
-            }
-
             _supervisorCallback?.Invoke(this, address, imm);
         }
 

src/ARMeilleure/State/NativeContext.cs

@@ -22,12 +22,6 @@ namespace ARMeilleure.State
             public ulong ExclusiveValueHigh;
             public int Running;
             public long Tpidr2El0;
-            
-            /// <summary>
-            /// Precise PC value used for debugging.
-            /// This will only be set when Optimizations.EnableDebugging is true.
-            /// </summary>
-            public ulong DebugPrecisePc;
         }
 
         private static NativeCtxStorage _dummyStorage = new();
@@ -45,11 +39,6 @@ namespace ARMeilleure.State
 
         public ulong GetPc()
         {
-            if (Optimizations.EnableDebugging)
-            {
-                return GetStorage().DebugPrecisePc;
-            }
-
             // TODO: More precise tracking of PC value.
             return GetStorage().DispatchAddress;
         }
@@ -279,11 +268,6 @@ namespace ARMeilleure.State
             return StorageOffset(ref _dummyStorage, ref _dummyStorage.Running);
         }
 
-        public static int GetDebugPrecisePcOffset()
-        {
-            return StorageOffset(ref _dummyStorage, ref _dummyStorage.DebugPrecisePc);
-        }
-
         private static int StorageOffset<T>(ref NativeCtxStorage storage, ref T target)
         {
             return (int)Unsafe.ByteOffset(ref Unsafe.As<NativeCtxStorage, T>(ref storage), ref target);

src/ARMeilleure/Translation/ArmEmitterContext.cs

@@ -52,7 +52,6 @@ namespace ARMeilleure.Translation
         public bool HighCq { get; }
         public bool HasPtc { get; }
         public Aarch32Mode Mode { get; }
-        public bool IsSingleStep { get; }
 
         private int _ifThenBlockStateIndex = 0;
         private Condition[] _ifThenBlockState = [];
@@ -67,8 +66,7 @@ namespace ARMeilleure.Translation
             ulong entryAddress,
             bool highCq,
             bool hasPtc,
-            Aarch32Mode mode,
+            Aarch32Mode mode)
-            bool isSingleStep)
         {
             Memory = memory;
             CountTable = countTable;
@@ -78,7 +76,6 @@ namespace ARMeilleure.Translation
             HighCq = highCq;
             HasPtc = hasPtc;
             Mode = mode;
-            IsSingleStep = isSingleStep;
 
             _labels = new Dictionary<ulong, Operand>();
         }

src/ARMeilleure/Translation/PTC/Ptc.cs

@@ -33,7 +33,7 @@ namespace ARMeilleure.Translation.PTC
         private const string OuterHeaderMagicString = "PTCohd\0\0";
         private const string InnerHeaderMagicString = "PTCihd\0\0";
 
-        private const uint InternalVersion = 7009; //! To be incremented manually for each change to the ARMeilleure project.
+        private const uint InternalVersion = 7008; //! To be incremented manually for each change to the ARMeilleure project.
 
         private const string ActualDir = "0";
         private const string BackupDir = "1";
@@ -303,13 +303,6 @@ namespace ARMeilleure.Translation.PTC
                     return false;
                 }
 
-                if (outerHeader.DebuggerMode != Optimizations.EnableDebugging)
-                {
-                    InvalidateCompressedStream(compressedStream);
-
-                    return false;
-                }
-
                 nint intPtr = nint.Zero;
 
                 try
@@ -486,7 +479,6 @@ namespace ARMeilleure.Translation.PTC
                 MemoryManagerMode = GetMemoryManagerMode(),
                 OSPlatform = GetOSPlatform(),
                 Architecture = (uint)RuntimeInformation.ProcessArchitecture,
-                DebuggerMode = Optimizations.EnableDebugging,
 
                 UncompressedStreamSize =
                 (long)Unsafe.SizeOf<InnerHeader>() +
@@ -1076,7 +1068,7 @@ namespace ARMeilleure.Translation.PTC
             return osPlatform;
         }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1/*, Size = 87*/)]
+        [StructLayout(LayoutKind.Sequential, Pack = 1/*, Size = 86*/)]
         private struct OuterHeader
         {
             public ulong Magic;
@@ -1088,7 +1080,6 @@ namespace ARMeilleure.Translation.PTC
             public byte MemoryManagerMode;
             public uint OSPlatform;
             public uint Architecture;
-            public bool DebuggerMode;
 
             public long UncompressedStreamSize;
 

src/ARMeilleure/Translation/Translator.cs

@@ -119,25 +119,7 @@ namespace ARMeilleure.Translation
 
             NativeInterface.RegisterThread(context, Memory, this);
 
-            if (Optimizations.EnableDebugging)
+            if (Optimizations.UseUnmanagedDispatchLoop)
-            {
-                context.DebugPc = address;
-                do
-                {
-                    if (Interlocked.CompareExchange(ref context.ShouldStep, 0, 1) == 1)
-                    {
-                        context.DebugPc = Step(context, context.DebugPc);
-                        context.StepHandler();
-                    }
-                    else
-                    {
-                        context.DebugPc = ExecuteSingle(context, context.DebugPc);
-                    }
-                    context.CheckInterrupt();
-                }
-                while (context.Running && context.DebugPc != 0);
-            }
-            else if (Optimizations.UseUnmanagedDispatchLoop)
             {
                 Stubs.DispatchLoop(context.NativeContextPtr, address);
             }
@@ -193,7 +175,7 @@ namespace ARMeilleure.Translation
             return nextAddr;
         }
 
-        private ulong Step(State.ExecutionContext context, ulong address)
+        public ulong Step(State.ExecutionContext context, ulong address)
         {
             TranslatedFunction func = Translate(address, context.ExecutionMode, highCq: false, singleStep: true);
 
@@ -204,8 +186,6 @@ namespace ARMeilleure.Translation
             return address;
         }
 
-
-
         internal TranslatedFunction GetOrTranslate(ulong address, ExecutionMode mode)
         {
             if (!Functions.TryGetValue(address, out TranslatedFunction func))
@@ -249,8 +229,7 @@ namespace ARMeilleure.Translation
                 address,
                 highCq,
                 _ptc.State != PtcState.Disabled,
-                mode: Aarch32Mode.User,
+                mode: Aarch32Mode.User);
-                isSingleStep: singleStep);
 
             Logger.StartPass(PassName.Decoding);
 
@@ -388,13 +367,9 @@ namespace ARMeilleure.Translation
 
                 if (block.Exit)
                 {
-                    // Return to managed rather than tail call.
+                    // Left option here as it may be useful if we need to return to managed rather than tail call in
-                    bool useReturns = Optimizations.EnableDebugging;
+                    // future. (eg. for debug)
-
+                    bool useReturns = false;
-                    if (Optimizations.EnableDebugging)
-                    {
-                        EmitDebugPrecisePcUpdate(context, block.Address);
-                    }
 
                     InstEmitFlowHelper.EmitVirtualJump(context, Const(block.Address), isReturn: useReturns);
                 }
@@ -418,11 +393,6 @@ namespace ARMeilleure.Translation
                             }
                         }
 
-                        if (Optimizations.EnableDebugging)
-                        {
-                            EmitDebugPrecisePcUpdate(context, opCode.Address);
-                        }
-
                         Operand lblPredicateSkip = default;
 
                         if (context.IsInIfThenBlock && context.CurrentIfThenBlockCond != Condition.Al)
@@ -519,14 +489,6 @@ namespace ARMeilleure.Translation
             context.MarkLabel(lblExit);
         }
 
-        internal static void EmitDebugPrecisePcUpdate(EmitterContext context, ulong address)
-        {
-            long debugPrecisePcOffs = NativeContext.GetDebugPrecisePcOffset();
-
-            Operand debugPrecisePcAddr = context.Add(context.LoadArgument(OperandType.I64, 0), Const(debugPrecisePcOffs));
-            context.Store(debugPrecisePcAddr, Const(address));
-        }
-
         public void InvalidateJitCacheRegion(ulong address, ulong size)
         {
             ulong[] overlapAddresses = [];

src/Ryujinx.Audio/Renderer/Common/BehaviourParameter.cs

@@ -1,11 +1,9 @@
-using Ryujinx.Audio.Renderer.Server;
-using Ryujinx.Audio.Renderer.Server.MemoryPool;
 using System.Runtime.InteropServices;
 
 namespace Ryujinx.Audio.Renderer.Common
 {
     /// <summary>
-    /// Represents the input parameter for <see cref="BehaviourInfo"/>.
+    /// Represents the input parameter for <see cref="Server.BehaviourContext"/>.
     /// </summary>
     [StructLayout(LayoutKind.Sequential, Pack = 1)]
     public struct BehaviourParameter
@@ -23,7 +21,7 @@ namespace Ryujinx.Audio.Renderer.Common
         /// <summary>
         /// The flags given controlling behaviour of the audio renderer
         /// </summary>
-        /// <remarks>See <see cref="BehaviourInfo.UpdateFlags(ulong)"/> and <see cref="BehaviourInfo.IsMemoryPoolForceMappingEnabled"/>.</remarks>
+        /// <remarks>See <see cref="Server.BehaviourContext.UpdateFlags(ulong)"/> and <see cref="Server.BehaviourContext.IsMemoryPoolForceMappingEnabled"/>.</remarks>
         public ulong Flags;
 
         /// <summary>
@@ -45,7 +43,7 @@ namespace Ryujinx.Audio.Renderer.Common
             /// <summary>
             /// Extra information given with the <see cref="ResultCode"/>
             /// </summary>
-            /// <remarks>This is usually used to report a faulting cpu address when a <see cref="MemoryPoolInfo"/> mapping fail.</remarks>
+            /// <remarks>This is usually used to report a faulting cpu address when a <see cref="Server.MemoryPool.MemoryPoolState"/> mapping fail.</remarks>
             public ulong ExtraErrorInfo;
         }
     }

src/Ryujinx.Audio/Renderer/Common/VoiceUpdateState.cs

@@ -1,5 +1,4 @@
 using Ryujinx.Audio.Renderer.Dsp.State;
-using Ryujinx.Audio.Renderer.Parameter;
 using Ryujinx.Common.Memory;
 using Ryujinx.Common.Utilities;
 using System;
@@ -12,7 +11,7 @@ namespace Ryujinx.Audio.Renderer.Common
     /// </summary>
     /// <remarks>This is shared between the server and audio processor.</remarks>
     [StructLayout(LayoutKind.Sequential, Pack = Align)]
-    public struct VoiceState
+    public struct VoiceUpdateState
     {
         public const int Align = 0x10;
         public const int BiquadStateOffset = 0x0;
@@ -26,7 +25,7 @@ namespace Ryujinx.Audio.Renderer.Common
         /// The total amount of samples that was played.
         /// </summary>
         /// <remarks>This is reset to 0 when a <see cref="WaveBuffer"/> finishes playing and <see cref="WaveBuffer.IsEndOfStream"/> is set.</remarks>
-        /// <remarks>This is reset to 0 when looping while <see cref="VoiceInParameter1.DecodingBehaviour.PlayedSampleCountResetWhenLooping"/> is set.</remarks>
+        /// <remarks>This is reset to 0 when looping while <see cref="Parameter.VoiceInParameter.DecodingBehaviour.PlayedSampleCountResetWhenLooping"/> is set.</remarks>
         public ulong PlayedSampleCount;
 
         /// <summary>

src/Ryujinx.Audio/Renderer/Dsp/AdpcmHelper.cs

@@ -81,16 +81,16 @@ namespace Ryujinx.Audio.Renderer.Dsp
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private static short GetCoefficientAtIndex(ReadOnlySpan<short> coefficients, int index)
         {
-            if ((uint)index >= (uint)coefficients.Length)
+            if ((uint)index < (uint)coefficients.Length)
             {
+                return coefficients[index];
+            }
+
             Logger.Error?.Print(LogClass.AudioRenderer, $"Out of bound read for coefficient at index {index}");
 
             return 0;
         }
 
-            return coefficients[index];
-        }
-
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static int Decode(Span<short> output, ReadOnlySpan<byte> input, int startSampleOffset, int endSampleOffset, int offset, int count, ReadOnlySpan<short> coefficients, ref AdpcmLoopContext loopContext)
         {

src/Ryujinx.Audio/Renderer/Dsp/BiquadFilterHelper.cs

@@ -1,7 +1,5 @@
 using Ryujinx.Audio.Renderer.Dsp.State;
 using Ryujinx.Audio.Renderer.Parameter;
-using Ryujinx.Audio.Renderer.Parameter.Effect;
-using Ryujinx.Common.Memory;
 using System;
 using System.Runtime.CompilerServices;
 
@@ -11,112 +9,6 @@ namespace Ryujinx.Audio.Renderer.Dsp
     {
         private const int FixedPointPrecisionForParameter = 14;
 
-        public static BiquadFilterParameter1 ToBiquadFilterParameter1(BiquadFilterParameter2 parameter)
-        {
-            BiquadFilterParameter1 result = new()
-            {
-                Enable = parameter.Enable, Numerator = new Array3<short>(), Denominator = new Array2<short>()
-            };
-
-            Span<short> resultNumeratorSpan = result.Numerator.AsSpan();
-            Span<short> resultDenominatorSpan = result.Denominator.AsSpan();
-            
-            Span<float> parameterNumeratorSpan = parameter.Numerator.AsSpan();
-            Span<float> parameterDenominatorSpan = parameter.Denominator.AsSpan();
-            
-            
-            resultNumeratorSpan[0] = (short)FixedPointHelper.ToFixed(parameterNumeratorSpan[0], FixedPointPrecisionForParameter);
-            resultNumeratorSpan[1] = (short)FixedPointHelper.ToFixed(parameterNumeratorSpan[1], FixedPointPrecisionForParameter);
-            resultNumeratorSpan[2] = (short)FixedPointHelper.ToFixed(parameterNumeratorSpan[2], FixedPointPrecisionForParameter);
-            
-            resultDenominatorSpan[0] = (short)FixedPointHelper.ToFixed(parameterDenominatorSpan[0], FixedPointPrecisionForParameter);
-            resultDenominatorSpan[1] = (short)FixedPointHelper.ToFixed(parameterDenominatorSpan[1], FixedPointPrecisionForParameter);
-            
-            return result;
-        }
-        
-        public static BiquadFilterParameter2 ToBiquadFilterParameter2(BiquadFilterParameter1 parameter)
-        {
-            BiquadFilterParameter2 result = new()
-            {
-                Enable = parameter.Enable, Numerator = new Array3<float>(), Denominator = new Array2<float>()
-            };
-
-            Span<float> resultNumeratorSpan = result.Numerator.AsSpan();
-            Span<float> resultDenominatorSpan = result.Denominator.AsSpan();
-            
-            Span<short> parameterNumeratorSpan = parameter.Numerator.AsSpan();
-            Span<short> parameterDenominatorSpan = parameter.Denominator.AsSpan();
-            
-            
-            resultNumeratorSpan[0] = FixedPointHelper.ToFloat(parameterNumeratorSpan[0], FixedPointPrecisionForParameter);
-            resultNumeratorSpan[1] = FixedPointHelper.ToFloat(parameterNumeratorSpan[1], FixedPointPrecisionForParameter);
-            resultNumeratorSpan[2] = FixedPointHelper.ToFloat(parameterNumeratorSpan[2], FixedPointPrecisionForParameter);
-            
-            resultDenominatorSpan[0] = FixedPointHelper.ToFloat(parameterDenominatorSpan[0], FixedPointPrecisionForParameter);
-            resultDenominatorSpan[1] = FixedPointHelper.ToFloat(parameterDenominatorSpan[1], FixedPointPrecisionForParameter);
-            
-            return result;
-        }
-        
-        public static BiquadFilterEffectParameter1 ToBiquadFilterEffectParameter1(BiquadFilterEffectParameter2 parameter)
-        {
-            BiquadFilterEffectParameter1 result = new()
-            {
-                Input = parameter.Input, 
-                Output = parameter.Output, 
-                Numerator = new Array3<short>(), 
-                Denominator = new Array2<short>(),
-                ChannelCount = parameter.ChannelCount,
-                Status = parameter.Status,
-            };
-
-            Span<short> resultNumeratorSpan = result.Numerator.AsSpan();
-            Span<short> resultDenominatorSpan = result.Denominator.AsSpan();
-            
-            Span<float> parameterNumeratorSpan = parameter.Numerator.AsSpan();
-            Span<float> parameterDenominatorSpan = parameter.Denominator.AsSpan();
-            
-            
-            resultNumeratorSpan[0] = (short)FixedPointHelper.ToFixed(parameterNumeratorSpan[0], FixedPointPrecisionForParameter);
-            resultNumeratorSpan[1] = (short)FixedPointHelper.ToFixed(parameterNumeratorSpan[1], FixedPointPrecisionForParameter);
-            resultNumeratorSpan[2] = (short)FixedPointHelper.ToFixed(parameterNumeratorSpan[2], FixedPointPrecisionForParameter);
-            
-            resultDenominatorSpan[0] = (short)FixedPointHelper.ToFixed(parameterDenominatorSpan[0], FixedPointPrecisionForParameter);
-            resultDenominatorSpan[1] = (short)FixedPointHelper.ToFixed(parameterDenominatorSpan[1], FixedPointPrecisionForParameter);
-            
-            return result;
-        }
-        
-        public static BiquadFilterEffectParameter2 ToBiquadFilterEffectParameter2(BiquadFilterEffectParameter1 parameter)
-        {
-            BiquadFilterEffectParameter2 result = new()
-            {
-                Input = parameter.Input, 
-                Output = parameter.Output, 
-                Numerator = new Array3<float>(), 
-                Denominator = new Array2<float>(),
-                ChannelCount = parameter.ChannelCount,
-                Status = parameter.Status,
-            };
-
-            Span<float> resultNumeratorSpan = result.Numerator.AsSpan();
-            Span<float> resultDenominatorSpan = result.Denominator.AsSpan();
-            
-            Span<short> parameterNumeratorSpan = parameter.Numerator.AsSpan();
-            Span<short> parameterDenominatorSpan = parameter.Denominator.AsSpan();
-            
-            
-            resultNumeratorSpan[0] = FixedPointHelper.ToFloat(parameterNumeratorSpan[0], FixedPointPrecisionForParameter);
-            resultNumeratorSpan[1] = FixedPointHelper.ToFloat(parameterNumeratorSpan[1], FixedPointPrecisionForParameter);
-            resultNumeratorSpan[2] = FixedPointHelper.ToFloat(parameterNumeratorSpan[2], FixedPointPrecisionForParameter);
-            
-            resultDenominatorSpan[0] = FixedPointHelper.ToFloat(parameterDenominatorSpan[0], FixedPointPrecisionForParameter);
-            resultDenominatorSpan[1] = FixedPointHelper.ToFloat(parameterDenominatorSpan[1], FixedPointPrecisionForParameter);
-            
-            return result;
-        }
-
         /// <summary>
         /// Apply a single biquad filter.
         /// </summary>
@@ -128,21 +20,18 @@ namespace Ryujinx.Audio.Renderer.Dsp
         /// <param name="sampleCount">The count of samples to process</param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static void ProcessBiquadFilter(
-            ref BiquadFilterParameter2 parameter,
+            ref BiquadFilterParameter parameter,
             ref BiquadFilterState state,
             Span<float> outputBuffer,
             ReadOnlySpan<float> inputBuffer,
             uint sampleCount)
         {
-            Span<float> numeratorSpan = parameter.Numerator.AsSpan();
+            float a0 = FixedPointHelper.ToFloat(parameter.Numerator[0], FixedPointPrecisionForParameter);
-            Span<float> denominatorSpan = parameter.Denominator.AsSpan();
+            float a1 = FixedPointHelper.ToFloat(parameter.Numerator[1], FixedPointPrecisionForParameter);
+            float a2 = FixedPointHelper.ToFloat(parameter.Numerator[2], FixedPointPrecisionForParameter);
 
-            float a0 = numeratorSpan[0];
+            float b1 = FixedPointHelper.ToFloat(parameter.Denominator[0], FixedPointPrecisionForParameter);
-            float a1 = numeratorSpan[1];
+            float b2 = FixedPointHelper.ToFloat(parameter.Denominator[1], FixedPointPrecisionForParameter);
-            float a2 = numeratorSpan[2];
-
-            float b1 = denominatorSpan[0];
-            float b2 = denominatorSpan[1];
 
             for (int i = 0; i < sampleCount; i++)
             {
@@ -168,22 +57,19 @@ namespace Ryujinx.Audio.Renderer.Dsp
         /// <param name="volume">Mix volume</param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static void ProcessBiquadFilterAndMix(
-            ref BiquadFilterParameter2 parameter,
+            ref BiquadFilterParameter parameter,
             ref BiquadFilterState state,
             Span<float> outputBuffer,
             ReadOnlySpan<float> inputBuffer,
             uint sampleCount,
             float volume)
         {
-            Span<float> numeratorSpan = parameter.Numerator.AsSpan();
+            float a0 = FixedPointHelper.ToFloat(parameter.Numerator[0], FixedPointPrecisionForParameter);
-            Span<float> denominatorSpan = parameter.Denominator.AsSpan();
+            float a1 = FixedPointHelper.ToFloat(parameter.Numerator[1], FixedPointPrecisionForParameter);
+            float a2 = FixedPointHelper.ToFloat(parameter.Numerator[2], FixedPointPrecisionForParameter);
 
-            float a0 = numeratorSpan[0];
+            float b1 = FixedPointHelper.ToFloat(parameter.Denominator[0], FixedPointPrecisionForParameter);
-            float a1 = numeratorSpan[1];
+            float b2 = FixedPointHelper.ToFloat(parameter.Denominator[1], FixedPointPrecisionForParameter);
-            float a2 = numeratorSpan[2];
-
-            float b1 = denominatorSpan[0];
-            float b2 = denominatorSpan[1];
 
             for (int i = 0; i < sampleCount; i++)
             {
@@ -213,7 +99,7 @@ namespace Ryujinx.Audio.Renderer.Dsp
         /// <returns>Last filtered sample value</returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static float ProcessBiquadFilterAndMixRamp(
-            ref BiquadFilterParameter2 parameter,
+            ref BiquadFilterParameter parameter,
             ref BiquadFilterState state,
             Span<float> outputBuffer,
             ReadOnlySpan<float> inputBuffer,
@@ -221,15 +107,12 @@ namespace Ryujinx.Audio.Renderer.Dsp
             float volume,
             float ramp)
         {
-            Span<float> numeratorSpan = parameter.Numerator.AsSpan();
+            float a0 = FixedPointHelper.ToFloat(parameter.Numerator[0], FixedPointPrecisionForParameter);
-            Span<float> denominatorSpan = parameter.Denominator.AsSpan();
+            float a1 = FixedPointHelper.ToFloat(parameter.Numerator[1], FixedPointPrecisionForParameter);
+            float a2 = FixedPointHelper.ToFloat(parameter.Numerator[2], FixedPointPrecisionForParameter);
 
-            float a0 = numeratorSpan[0];
+            float b1 = FixedPointHelper.ToFloat(parameter.Denominator[0], FixedPointPrecisionForParameter);
-            float a1 = numeratorSpan[1];
+            float b2 = FixedPointHelper.ToFloat(parameter.Denominator[1], FixedPointPrecisionForParameter);
-            float a2 = numeratorSpan[2];
-
-            float b1 = denominatorSpan[0];
-            float b2 = denominatorSpan[1];
 
             float mixState = 0f;
 
@@ -263,7 +146,7 @@ namespace Ryujinx.Audio.Renderer.Dsp
         /// <param name="sampleCount">The count of samples to process</param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static void ProcessBiquadFilter(
-            ReadOnlySpan<BiquadFilterParameter2> parameters,
+            ReadOnlySpan<BiquadFilterParameter> parameters,
             Span<BiquadFilterState> states,
             Span<float> outputBuffer,
             ReadOnlySpan<float> inputBuffer,
@@ -271,19 +154,16 @@ namespace Ryujinx.Audio.Renderer.Dsp
         {
             for (int stageIndex = 0; stageIndex < parameters.Length; stageIndex++)
             {
-                BiquadFilterParameter2 parameter = parameters[stageIndex];
+                BiquadFilterParameter parameter = parameters[stageIndex];
 
                 ref BiquadFilterState state = ref states[stageIndex];
 
-                Span<float> numeratorSpan = parameter.Numerator.AsSpan();
+                float a0 = FixedPointHelper.ToFloat(parameter.Numerator[0], FixedPointPrecisionForParameter);
-                Span<float> denominatorSpan = parameter.Denominator.AsSpan();
+                float a1 = FixedPointHelper.ToFloat(parameter.Numerator[1], FixedPointPrecisionForParameter);
+                float a2 = FixedPointHelper.ToFloat(parameter.Numerator[2], FixedPointPrecisionForParameter);
 
-                float a0 = numeratorSpan[0];
+                float b1 = FixedPointHelper.ToFloat(parameter.Denominator[0], FixedPointPrecisionForParameter);
-                float a1 = numeratorSpan[1];
+                float b2 = FixedPointHelper.ToFloat(parameter.Denominator[1], FixedPointPrecisionForParameter);
-                float a2 = numeratorSpan[2];
-
-                float b1 = denominatorSpan[0];
-                float b2 = denominatorSpan[1];
 
                 for (int i = 0; i < sampleCount; i++)
                 {
@@ -312,8 +192,8 @@ namespace Ryujinx.Audio.Renderer.Dsp
         /// <param name="volume">Mix volume</param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static void ProcessDoubleBiquadFilterAndMix(
-            ref BiquadFilterParameter2 parameter0,
+            ref BiquadFilterParameter parameter0,
-            ref BiquadFilterParameter2 parameter1,
+            ref BiquadFilterParameter parameter1,
             ref BiquadFilterState state0,
             ref BiquadFilterState state1,
             Span<float> outputBuffer,
@@ -321,25 +201,19 @@ namespace Ryujinx.Audio.Renderer.Dsp
             uint sampleCount,
             float volume)
         {
-            Span<float> numerator0Span = parameter0.Numerator.AsSpan();
+            float a00 = FixedPointHelper.ToFloat(parameter0.Numerator[0], FixedPointPrecisionForParameter);
-            Span<float> numerator1Span = parameter1.Numerator.AsSpan();
+            float a10 = FixedPointHelper.ToFloat(parameter0.Numerator[1], FixedPointPrecisionForParameter);
-            Span<float> denominator0Span = parameter0.Denominator.AsSpan();
+            float a20 = FixedPointHelper.ToFloat(parameter0.Numerator[2], FixedPointPrecisionForParameter);
-            Span<float> denominator1Span = parameter1.Denominator.AsSpan();
 
+            float b10 = FixedPointHelper.ToFloat(parameter0.Denominator[0], FixedPointPrecisionForParameter);
+            float b20 = FixedPointHelper.ToFloat(parameter0.Denominator[1], FixedPointPrecisionForParameter);
 
-            float a00 = numerator0Span[0];
+            float a01 = FixedPointHelper.ToFloat(parameter1.Numerator[0], FixedPointPrecisionForParameter);
-            float a10 = numerator0Span[1];
+            float a11 = FixedPointHelper.ToFloat(parameter1.Numerator[1], FixedPointPrecisionForParameter);
-            float a20 = numerator0Span[2];
+            float a21 = FixedPointHelper.ToFloat(parameter1.Numerator[2], FixedPointPrecisionForParameter);
 
-            float b10 = denominator0Span[0];
+            float b11 = FixedPointHelper.ToFloat(parameter1.Denominator[0], FixedPointPrecisionForParameter);
-            float b20 = denominator0Span[1];
+            float b21 = FixedPointHelper.ToFloat(parameter1.Denominator[1], FixedPointPrecisionForParameter);
-
-            float a01 = numerator1Span[0];
-            float a11 = numerator1Span[1];
-            float a21 = numerator1Span[2];
-
-            float b11 = denominator1Span[0];
-            float b21 = denominator1Span[1];
 
             for (int i = 0; i < sampleCount; i++)
             {
@@ -377,8 +251,8 @@ namespace Ryujinx.Audio.Renderer.Dsp
         /// <returns>Last filtered sample value</returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static float ProcessDoubleBiquadFilterAndMixRamp(
-            ref BiquadFilterParameter2 parameter0,
+            ref BiquadFilterParameter parameter0,
-            ref BiquadFilterParameter2 parameter1,
+            ref BiquadFilterParameter parameter1,
             ref BiquadFilterState state0,
             ref BiquadFilterState state1,
             Span<float> outputBuffer,
@@ -387,24 +261,19 @@ namespace Ryujinx.Audio.Renderer.Dsp
             float volume,
             float ramp)
         {
-            Span<float> numerator0Span = parameter0.Numerator.AsSpan();
+            float a00 = FixedPointHelper.ToFloat(parameter0.Numerator[0], FixedPointPrecisionForParameter);
-            Span<float> numerator1Span = parameter1.Numerator.AsSpan();
+            float a10 = FixedPointHelper.ToFloat(parameter0.Numerator[1], FixedPointPrecisionForParameter);
-            Span<float> denominator0Span = parameter0.Denominator.AsSpan();
+            float a20 = FixedPointHelper.ToFloat(parameter0.Numerator[2], FixedPointPrecisionForParameter);
-            Span<float> denominator1Span = parameter1.Denominator.AsSpan();
 
-            float a00 = numerator0Span[0];
+            float b10 = FixedPointHelper.ToFloat(parameter0.Denominator[0], FixedPointPrecisionForParameter);
-            float a10 = numerator0Span[1];
+            float b20 = FixedPointHelper.ToFloat(parameter0.Denominator[1], FixedPointPrecisionForParameter);
-            float a20 = numerator0Span[2];
 
-            float b10 = denominator0Span[0];
+            float a01 = FixedPointHelper.ToFloat(parameter1.Numerator[0], FixedPointPrecisionForParameter);
-            float b20 = denominator0Span[1];
+            float a11 = FixedPointHelper.ToFloat(parameter1.Numerator[1], FixedPointPrecisionForParameter);
+            float a21 = FixedPointHelper.ToFloat(parameter1.Numerator[2], FixedPointPrecisionForParameter);
 
-            float a01 = numerator1Span[0];
+            float b11 = FixedPointHelper.ToFloat(parameter1.Denominator[0], FixedPointPrecisionForParameter);
-            float a11 = numerator1Span[1];
+            float b21 = FixedPointHelper.ToFloat(parameter1.Denominator[1], FixedPointPrecisionForParameter);
-            float a21 = numerator1Span[2];
-
-            float b11 = denominator1Span[0];
-            float b21 = denominator1Span[1];
 
             float mixState = 0f;
 

src/Ryujinx.Audio/Renderer/Dsp/Command/AdpcmDataSourceCommandVersion1.cs

@@ -2,7 +2,7 @@ using Ryujinx.Audio.Common;
 using Ryujinx.Audio.Renderer.Common;
 using Ryujinx.Audio.Renderer.Server.Voice;
 using System;
-using Ryujinx.Audio.Renderer.Parameter;
+using static Ryujinx.Audio.Renderer.Parameter.VoiceInParameter;
 using WaveBuffer = Ryujinx.Audio.Renderer.Common.WaveBuffer;
 
 namespace Ryujinx.Audio.Renderer.Dsp.Command
@@ -24,37 +24,35 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
 
         public WaveBuffer[] WaveBuffers { get; }
 
-        public Memory<VoiceState> State { get; }
+        public Memory<VoiceUpdateState> State { get; }
 
         public ulong AdpcmParameter { get; }
         public ulong AdpcmParameterSize { get; }
 
         public DecodingBehaviour DecodingBehaviour { get; }
 
-        public AdpcmDataSourceCommandVersion1(ref VoiceInfo serverInfo, Memory<VoiceState> state, ushort outputBufferIndex, int nodeId)
+        public AdpcmDataSourceCommandVersion1(ref VoiceState serverState, Memory<VoiceUpdateState> state, ushort outputBufferIndex, int nodeId)
         {
             Enabled = true;
             NodeId = nodeId;
 
             OutputBufferIndex = outputBufferIndex;
-            SampleRate = serverInfo.SampleRate;
+            SampleRate = serverState.SampleRate;
-            Pitch = serverInfo.Pitch;
+            Pitch = serverState.Pitch;
-            
-            Span<Server.Voice.WaveBuffer> waveBufferSpan = serverInfo.WaveBuffers.AsSpan();
 
             WaveBuffers = new WaveBuffer[Constants.VoiceWaveBufferCount];
 
             for (int i = 0; i < WaveBuffers.Length; i++)
             {
-                ref Server.Voice.WaveBuffer voiceWaveBuffer = ref waveBufferSpan[i];
+                ref Server.Voice.WaveBuffer voiceWaveBuffer = ref serverState.WaveBuffers[i];
 
                 WaveBuffers[i] = voiceWaveBuffer.ToCommon(1);
             }
 
-            AdpcmParameter = serverInfo.DataSourceStateAddressInfo.GetReference(true);
+            AdpcmParameter = serverState.DataSourceStateAddressInfo.GetReference(true);
-            AdpcmParameterSize = serverInfo.DataSourceStateAddressInfo.Size;
+            AdpcmParameterSize = serverState.DataSourceStateAddressInfo.Size;
             State = state;
-            DecodingBehaviour = serverInfo.DecodingBehaviour;
+            DecodingBehaviour = serverState.DecodingBehaviour;
         }
 
         public void Process(CommandList context)

src/Ryujinx.Audio/Renderer/Dsp/Command/BiquadFilterAndMixCommand.cs

@@ -18,12 +18,12 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
         public ushort InputBufferIndex { get; }
         public ushort OutputBufferIndex { get; }
 
-        private BiquadFilterParameter2 _parameter;
+        private BiquadFilterParameter _parameter;
 
         public Memory<BiquadFilterState> BiquadFilterState { get; }
         public Memory<BiquadFilterState> PreviousBiquadFilterState { get; }
 
-        public Memory<VoiceState> State { get; }
+        public Memory<VoiceUpdateState> State { get; }
 
         public int LastSampleIndex { get; }
 
@@ -40,8 +40,8 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
             uint inputBufferIndex,
             uint outputBufferIndex,
             int lastSampleIndex,
-            Memory<VoiceState> state,
+            Memory<VoiceUpdateState> state,
-            ref BiquadFilterParameter2 filter,
+            ref BiquadFilterParameter filter,
             Memory<BiquadFilterState> biquadFilterState,
             Memory<BiquadFilterState> previousBiquadFilterState,
             bool needInitialization,

src/Ryujinx.Audio/Renderer/Dsp/Command/BiquadFilterCommand.cs

@@ -19,11 +19,11 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
         public int OutputBufferIndex { get; }
         public bool NeedInitialization { get; }
 
-        private BiquadFilterParameter2 _parameter;
+        private BiquadFilterParameter _parameter;
 
         public BiquadFilterCommand(
             int baseIndex,
-            ref BiquadFilterParameter2 filter,
+            ref BiquadFilterParameter filter,
             Memory<BiquadFilterState> biquadFilterStateMemory,
             int inputBufferOffset,
             int outputBufferOffset,

src/Ryujinx.Audio/Renderer/Dsp/Command/CircularBufferSinkCommand.cs

@@ -1,6 +1,5 @@
 using Ryujinx.Audio.Renderer.Parameter.Sink;
 using Ryujinx.Audio.Renderer.Server.MemoryPool;
-using System;
 using System.Diagnostics;
 
 namespace Ryujinx.Audio.Renderer.Dsp.Command
@@ -30,11 +29,9 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
             Input = new ushort[Constants.ChannelCountMax];
             InputCount = parameter.InputCount;
 
-            Span<byte> inputSpan = parameter.Input.AsSpan();
-
             for (int i = 0; i < InputCount; i++)
             {
-                Input[i] = (ushort)(bufferOffset + inputSpan[i]);
+                Input[i] = (ushort)(bufferOffset + parameter.Input[i]);
             }
 
             CircularBuffer = circularBufferAddressInfo.GetReference(true);

src/Ryujinx.Audio/Renderer/Dsp/Command/CommandType.cs

@@ -12,7 +12,6 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
         Volume,
         VolumeRamp,
         BiquadFilter,
-        BiquadFilterFloatCoeff, // new
         Mix,
         MixRamp,
         MixRampGrouped,
@@ -32,17 +31,9 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
         LimiterVersion1,
         LimiterVersion2,
         MultiTapBiquadFilter,
-        MultiTapBiquadFilterFloatCoeff, // new
         CaptureBuffer,
         Compressor,
         BiquadFilterAndMix,
-        BiquadFilterAndMixFloatCoeff, // new
         MultiTapBiquadFilterAndMix,
-        MultiTapBiquadFilterAndMixFloatCoef, // new
-        AuxiliaryBufferGrouped, // new
-        FillMixBuffer, // new
-        BiquadFilterCrossFade, // new
-        MultiTapBiquadFilterCrossFade, // new
-        FillBuffer, // new
     }
 }

src/Ryujinx.Audio/Renderer/Dsp/Command/CompressorCommand.cs

@@ -43,13 +43,10 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
             InputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
             OutputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
 
-            Span<byte> inputSpan = _parameter.Input.AsSpan();
-            Span<byte> outputSpan = _parameter.Output.AsSpan();
-
             for (int i = 0; i < _parameter.ChannelCount; i++)
             {
-                InputBufferIndices[i] = (ushort)(bufferOffset + inputSpan[i]);
+                InputBufferIndices[i] = (ushort)(bufferOffset + _parameter.Input[i]);
-                OutputBufferIndices[i] = (ushort)(bufferOffset + outputSpan[i]);
+                OutputBufferIndices[i] = (ushort)(bufferOffset + _parameter.Output[i]);
             }
         }
 
@@ -175,11 +172,9 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
                         statistics.MinimumGain = MathF.Min(statistics.MinimumGain, compressionGain * state.OutputGain);
                         statistics.MaximumMean = MathF.Max(statistics.MaximumMean, mean);
 
-                        Span<float> lastSamplesSpan = statistics.LastSamples.AsSpan();
-
                         for (int channelIndex = 0; channelIndex < _parameter.ChannelCount; channelIndex++)
                         {
-                            lastSamplesSpan[channelIndex] = MathF.Abs(channelInput[channelIndex] * (1f / 32768f));
+                            statistics.LastSamples[channelIndex] = MathF.Abs(channelInput[channelIndex] * (1f / 32768f));
                         }
                     }
                 }

src/Ryujinx.Audio/Renderer/Dsp/Command/DataSourceVersion2Command.cs

@@ -2,7 +2,7 @@ using Ryujinx.Audio.Common;
 using Ryujinx.Audio.Renderer.Common;
 using Ryujinx.Audio.Renderer.Server.Voice;
 using System;
-using Ryujinx.Audio.Renderer.Parameter;
+using static Ryujinx.Audio.Renderer.Parameter.VoiceInParameter;
 using WaveBuffer = Ryujinx.Audio.Renderer.Common.WaveBuffer;
 
 namespace Ryujinx.Audio.Renderer.Dsp.Command
@@ -24,7 +24,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
 
         public WaveBuffer[] WaveBuffers { get; }
 
-        public Memory<VoiceState> State { get; }
+        public Memory<VoiceUpdateState> State { get; }
 
         public ulong ExtraParameter { get; }
         public ulong ExtraParameterSize { get; }
@@ -39,39 +39,37 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
 
         public SampleRateConversionQuality SrcQuality { get; }
 
-        public DataSourceVersion2Command(ref VoiceInfo serverInfo, Memory<VoiceState> state, ushort outputBufferIndex, ushort channelIndex, int nodeId)
+        public DataSourceVersion2Command(ref VoiceState serverState, Memory<VoiceUpdateState> state, ushort outputBufferIndex, ushort channelIndex, int nodeId)
         {
             Enabled = true;
             NodeId = nodeId;
             ChannelIndex = channelIndex;
-            ChannelCount = serverInfo.ChannelsCount;
+            ChannelCount = serverState.ChannelsCount;
-            SampleFormat = serverInfo.SampleFormat;
+            SampleFormat = serverState.SampleFormat;
-            SrcQuality = serverInfo.SrcQuality;
+            SrcQuality = serverState.SrcQuality;
             CommandType = GetCommandTypeBySampleFormat(SampleFormat);
 
             OutputBufferIndex = (ushort)(channelIndex + outputBufferIndex);
-            SampleRate = serverInfo.SampleRate;
+            SampleRate = serverState.SampleRate;
-            Pitch = serverInfo.Pitch;
+            Pitch = serverState.Pitch;
-            
-            Span<Server.Voice.WaveBuffer> waveBufferSpan = serverInfo.WaveBuffers.AsSpan();
 
             WaveBuffers = new WaveBuffer[Constants.VoiceWaveBufferCount];
 
             for (int i = 0; i < WaveBuffers.Length; i++)
             {
-                ref Server.Voice.WaveBuffer voiceWaveBuffer = ref waveBufferSpan[i];
+                ref Server.Voice.WaveBuffer voiceWaveBuffer = ref serverState.WaveBuffers[i];
 
                 WaveBuffers[i] = voiceWaveBuffer.ToCommon(2);
             }
 
             if (SampleFormat == SampleFormat.Adpcm)
             {
-                ExtraParameter = serverInfo.DataSourceStateAddressInfo.GetReference(true);
+                ExtraParameter = serverState.DataSourceStateAddressInfo.GetReference(true);
-                ExtraParameterSize = serverInfo.DataSourceStateAddressInfo.Size;
+                ExtraParameterSize = serverState.DataSourceStateAddressInfo.Size;
             }
 
             State = state;
-            DecodingBehaviour = serverInfo.DecodingBehaviour;
+            DecodingBehaviour = serverState.DecodingBehaviour;
         }
 
         private static CommandType GetCommandTypeBySampleFormat(SampleFormat sampleFormat)

src/Ryujinx.Audio/Renderer/Dsp/Command/DelayCommand.cs

@@ -43,13 +43,10 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
             InputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
             OutputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
 
-            Span<byte> inputSpan = Parameter.Input.AsSpan();
-            Span<byte> outputSpan = Parameter.Output.AsSpan();
-
             for (int i = 0; i < Parameter.ChannelCount; i++)
             {
-                InputBufferIndices[i] = (ushort)(bufferOffset + inputSpan[i]);
+                InputBufferIndices[i] = (ushort)(bufferOffset + Parameter.Input[i]);
-                OutputBufferIndices[i] = (ushort)(bufferOffset + outputSpan[i]);
+                OutputBufferIndices[i] = (ushort)(bufferOffset + Parameter.Output[i]);
             }
 
             DataSourceHelper.RemapLegacyChannelEffectMappingToChannelResourceMapping(newEffectChannelMappingSupported, InputBufferIndices, Parameter.ChannelCount);

src/Ryujinx.Audio/Renderer/Dsp/Command/DepopPrepareCommand.cs

@@ -17,10 +17,10 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
 
         public ushort[] OutputBufferIndices { get; }
 
-        public Memory<VoiceState> State { get; }
+        public Memory<VoiceUpdateState> State { get; }
         public Memory<float> DepopBuffer { get; }
 
-        public DepopPrepareCommand(Memory<VoiceState> state, Memory<float> depopBuffer, uint mixBufferCount, uint bufferOffset, int nodeId, bool enabled)
+        public DepopPrepareCommand(Memory<VoiceUpdateState> state, Memory<float> depopBuffer, uint mixBufferCount, uint bufferOffset, int nodeId, bool enabled)
         {
             Enabled = enabled;
             NodeId = nodeId;
@@ -39,18 +39,17 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
 
         public void Process(CommandList context)
         {
-            ref VoiceState state = ref State.Span[0];
+            ref VoiceUpdateState state = ref State.Span[0];
 
             Span<float> depopBuffer = DepopBuffer.Span;
-            Span<float> lastSamplesSpan = state.LastSamples.AsSpan();
 
             for (int i = 0; i < MixBufferCount; i++)
             {
-                if (lastSamplesSpan[i] != 0)
+                if (state.LastSamples[i] != 0)
                 {
-                    depopBuffer[OutputBufferIndices[i]] += lastSamplesSpan[i];
+                    depopBuffer[OutputBufferIndices[i]] += state.LastSamples[i];
 
-                    lastSamplesSpan[i] = 0;
+                    state.LastSamples[i] = 0;
                 }
             }
         }

src/Ryujinx.Audio/Renderer/Dsp/Command/DeviceSinkCommand.cs

@@ -35,16 +35,14 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
             InputCount = sink.Parameter.InputCount;
             InputBufferIndices = new ushort[InputCount];
 
-            Span<byte> inputSpan = sink.Parameter.Input.AsSpan();
-
             for (int i = 0; i < Math.Min(InputCount, Constants.ChannelCountMax); i++)
             {
-                InputBufferIndices[i] = (ushort)(bufferOffset + inputSpan[i]);
+                InputBufferIndices[i] = (ushort)(bufferOffset + sink.Parameter.Input[i]);
             }
 
-            if (sink.UpsamplerInfo != null)
+            if (sink.UpsamplerState != null)
             {
-                Buffers = sink.UpsamplerInfo.OutputBuffer;
+                Buffers = sink.UpsamplerState.OutputBuffer;
             }
             else
             {

src/Ryujinx.Audio/Renderer/Dsp/Command/FillBufferCommand.cs

@@ -1,69 +0,0 @@
-using Ryujinx.Audio.Renderer.Server.Splitter;
-using System;
-using System.Runtime.CompilerServices;
-
-namespace Ryujinx.Audio.Renderer.Dsp.Command
-{
-    public class FillBufferCommand : ICommand
-    {
-        public bool Enabled { get; set; }
-
-        public int NodeId { get; }
-
-        public CommandType CommandType => CommandType.FillBuffer;
-
-        public uint EstimatedProcessingTime { get; set; }
-
-        public SplitterDestinationVersion1 Destination1 { get; }
-        public SplitterDestinationVersion2 Destination2 { get; }
-        public bool IsV2 { get; }
-        public int Length { get; }
-        public float Value { get; }
-
-        public FillBufferCommand(SplitterDestinationVersion1 destination, int length, float value, int nodeId)
-        {
-            Enabled = true;
-            NodeId = nodeId;
-
-            Destination1 = destination;
-            IsV2 = false;
-            Length = length;
-            Value = value;
-        }
-        
-        public FillBufferCommand(SplitterDestinationVersion2 destination, int length, float value, int nodeId)
-        {
-            Enabled = true;
-            NodeId = nodeId;
-            
-            Destination2 = destination;
-            IsV2 = true;
-            Length = length;
-            Value = value;
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void ProcessFillBuffer()
-        {
-            if (IsV2)
-            {
-                for (int i = 0; i < Length; i++)
-                {
-                    Destination2.PreviousMixBufferVolume[i] = Value;
-                }
-            }
-            else
-            {
-                for (int i = 0; i < Length; i++)
-                {
-                    Destination1.PreviousMixBufferVolume[i] = Value;
-                }
-            }
-        }
-
-        public void Process(CommandList context)
-        {
-            ProcessFillBuffer();
-        }
-    }
-}

src/Ryujinx.Audio/Renderer/Dsp/Command/LimiterCommandVersion1.cs

@@ -38,13 +38,10 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
             InputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
             OutputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
 
-            Span<byte> inputSpan = _parameter.Input.AsSpan();
-            Span<byte> outputSpan = _parameter.Output.AsSpan();
-
             for (int i = 0; i < _parameter.ChannelCount; i++)
             {
-                InputBufferIndices[i] = (ushort)(bufferOffset + inputSpan[i]);
+                InputBufferIndices[i] = (ushort)(bufferOffset + _parameter.Input[i]);
-                OutputBufferIndices[i] = (ushort)(bufferOffset + outputSpan[i]);
+                OutputBufferIndices[i] = (ushort)(bufferOffset + _parameter.Output[i]);
             }
         }
 

src/Ryujinx.Audio/Renderer/Dsp/Command/LimiterCommandVersion2.cs

@@ -49,13 +49,10 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
             InputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
             OutputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
 
-            Span<byte> inputSpan = _parameter.Input.AsSpan();
-            Span<byte> outputSpan = _parameter.Output.AsSpan();
-
             for (int i = 0; i < _parameter.ChannelCount; i++)
             {
-                InputBufferIndices[i] = (ushort)(bufferOffset + inputSpan[i]);
+                InputBufferIndices[i] = (ushort)(bufferOffset + _parameter.Input[i]);
-                OutputBufferIndices[i] = (ushort)(bufferOffset + outputSpan[i]);
+                OutputBufferIndices[i] = (ushort)(bufferOffset + _parameter.Output[i]);
             }
         }
 
@@ -153,11 +150,8 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
                         {
                             ref LimiterStatistics statistics = ref MemoryMarshal.Cast<byte, LimiterStatistics>(ResultState.Span[0].SpecificData)[0];
 
-                            Span<float> inputMaxSpan = statistics.InputMax.AsSpan();
+                            statistics.InputMax[channelIndex] = Math.Max(statistics.InputMax[channelIndex], sampleInputMax);
-                            Span<float> compressionGainMinSpan = statistics.CompressionGainMin.AsSpan();
+                            statistics.CompressionGainMin[channelIndex] = Math.Min(statistics.CompressionGainMin[channelIndex], compressionGain);
-                            
-                            inputMaxSpan[channelIndex] = Math.Max(inputMaxSpan[channelIndex], sampleInputMax);
-                            compressionGainMinSpan[channelIndex] = Math.Min(compressionGainMinSpan[channelIndex], compressionGain);
                         }
                     }
                 }

src/Ryujinx.Audio/Renderer/Dsp/Command/MixRampCommand.cs

@@ -20,11 +20,11 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
         public float Volume0 { get; }
         public float Volume1 { get; }
 
-        public Memory<VoiceState> State { get; }
+        public Memory<VoiceUpdateState> State { get; }
 
         public int LastSampleIndex { get; }
 
-        public MixRampCommand(float volume0, float volume1, uint inputBufferIndex, uint outputBufferIndex, int lastSampleIndex, Memory<VoiceState> state, int nodeId)
+        public MixRampCommand(float volume0, float volume1, uint inputBufferIndex, uint outputBufferIndex, int lastSampleIndex, Memory<VoiceUpdateState> state, int nodeId)
         {
             Enabled = true;
             NodeId = nodeId;

src/Ryujinx.Audio/Renderer/Dsp/Command/MixRampGroupedCommand.cs

@@ -22,7 +22,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
         public float[] Volume0 { get; }
         public float[] Volume1 { get; }
 
-        public Memory<VoiceState> State { get; }
+        public Memory<VoiceUpdateState> State { get; }
 
         public MixRampGroupedCommand(
             uint mixBufferCount,
@@ -30,7 +30,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
             uint outputBufferIndex,
             ReadOnlySpan<float> volume0,
             ReadOnlySpan<float> volume1,
-            Memory<VoiceState> state,
+            Memory<VoiceUpdateState> state,
             int nodeId)
         {
             Enabled = true;
@@ -79,10 +79,6 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
 
         public void Process(CommandList context)
         {
-            ref VoiceState state = ref State.Span[0];
-            
-            Span<float> lastSamplesSpan = state.LastSamples.AsSpan();
-            
             for (int i = 0; i < MixBufferCount; i++)
             {
                 ReadOnlySpan<float> inputBuffer = context.GetBuffer(InputBufferIndices[i]);
@@ -91,13 +87,15 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
                 float volume0 = Volume0[i];
                 float volume1 = Volume1[i];
 
+                ref VoiceUpdateState state = ref State.Span[0];
+
                 if (volume0 != 0 || volume1 != 0)
                 {
-                    lastSamplesSpan[i] = ProcessMixRampGrouped(outputBuffer, inputBuffer, volume0, volume1, (int)context.SampleCount);
+                    state.LastSamples[i] = ProcessMixRampGrouped(outputBuffer, inputBuffer, volume0, volume1, (int)context.SampleCount);
                 }
                 else
                 {
-                    lastSamplesSpan[i] = 0;
+                    state.LastSamples[i] = 0;
                 }
             }
         }

src/Ryujinx.Audio/Renderer/Dsp/Command/MultiTapBiquadFilterAndMixCommand.cs

@@ -18,15 +18,15 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
         public ushort InputBufferIndex { get; }
         public ushort OutputBufferIndex { get; }
 
-        private BiquadFilterParameter2 _parameter0;
+        private BiquadFilterParameter _parameter0;
-        private BiquadFilterParameter2 _parameter1;
+        private BiquadFilterParameter _parameter1;
 
         public Memory<BiquadFilterState> BiquadFilterState0 { get; }
         public Memory<BiquadFilterState> BiquadFilterState1 { get; }
         public Memory<BiquadFilterState> PreviousBiquadFilterState0 { get; }
         public Memory<BiquadFilterState> PreviousBiquadFilterState1 { get; }
 
-        public Memory<VoiceState> State { get; }
+        public Memory<VoiceUpdateState> State { get; }
 
         public int LastSampleIndex { get; }
 
@@ -44,9 +44,9 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
             uint inputBufferIndex,
             uint outputBufferIndex,
             int lastSampleIndex,
-            Memory<VoiceState> state,
+            Memory<VoiceUpdateState> state,
-            ref BiquadFilterParameter2 filter0,
+            ref BiquadFilterParameter filter0,
-            ref BiquadFilterParameter2 filter1,
+            ref BiquadFilterParameter filter1,
             Memory<BiquadFilterState> biquadFilterState0,
             Memory<BiquadFilterState> biquadFilterState1,
             Memory<BiquadFilterState> previousBiquadFilterState0,

src/Ryujinx.Audio/Renderer/Dsp/Command/MultiTapBiquadFilterCommand.cs

@@ -14,13 +14,13 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
 
         public uint EstimatedProcessingTime { get; set; }
 
-        private readonly BiquadFilterParameter2[] _parameters;
+        private readonly BiquadFilterParameter[] _parameters;
         private readonly Memory<BiquadFilterState> _biquadFilterStates;
         private readonly int _inputBufferIndex;
         private readonly int _outputBufferIndex;
         private readonly bool[] _isInitialized;
 
-        public MultiTapBiquadFilterCommand(int baseIndex, ReadOnlySpan<BiquadFilterParameter2> filters, Memory<BiquadFilterState> biquadFilterStateMemory, int inputBufferOffset, int outputBufferOffset, ReadOnlySpan<bool> isInitialized, int nodeId)
+        public MultiTapBiquadFilterCommand(int baseIndex, ReadOnlySpan<BiquadFilterParameter> filters, Memory<BiquadFilterState> biquadFilterStateMemory, int inputBufferOffset, int outputBufferOffset, ReadOnlySpan<bool> isInitialized, int nodeId)
         {
             _parameters = filters.ToArray();
             _biquadFilterStates = biquadFilterStateMemory;

src/Ryujinx.Audio/Renderer/Dsp/Command/PcmFloatDataSourceCommandVersion1.cs

@@ -2,7 +2,7 @@ using Ryujinx.Audio.Common;
 using Ryujinx.Audio.Renderer.Common;
 using Ryujinx.Audio.Renderer.Server.Voice;
 using System;
-using Ryujinx.Audio.Renderer.Parameter;
+using static Ryujinx.Audio.Renderer.Parameter.VoiceInParameter;
 using WaveBuffer = Ryujinx.Audio.Renderer.Common.WaveBuffer;
 
 namespace Ryujinx.Audio.Renderer.Dsp.Command
@@ -27,33 +27,31 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
 
         public WaveBuffer[] WaveBuffers { get; }
 
-        public Memory<VoiceState> State { get; }
+        public Memory<VoiceUpdateState> State { get; }
         public DecodingBehaviour DecodingBehaviour { get; }
 
-        public PcmFloatDataSourceCommandVersion1(ref VoiceInfo serverInfo, Memory<VoiceState> state, ushort outputBufferIndex, ushort channelIndex, int nodeId)
+        public PcmFloatDataSourceCommandVersion1(ref VoiceState serverState, Memory<VoiceUpdateState> state, ushort outputBufferIndex, ushort channelIndex, int nodeId)
         {
             Enabled = true;
             NodeId = nodeId;
 
             OutputBufferIndex = (ushort)(channelIndex + outputBufferIndex);
-            SampleRate = serverInfo.SampleRate;
+            SampleRate = serverState.SampleRate;
             ChannelIndex = channelIndex;
-            ChannelCount = serverInfo.ChannelsCount;
+            ChannelCount = serverState.ChannelsCount;
-            Pitch = serverInfo.Pitch;
+            Pitch = serverState.Pitch;
 
             WaveBuffers = new WaveBuffer[Constants.VoiceWaveBufferCount];
 
-            Span<Server.Voice.WaveBuffer> waveBufferSpan = serverInfo.WaveBuffers.AsSpan();
-
             for (int i = 0; i < WaveBuffers.Length; i++)
             {
-                ref Server.Voice.WaveBuffer voiceWaveBuffer = ref waveBufferSpan[i];
+                ref Server.Voice.WaveBuffer voiceWaveBuffer = ref serverState.WaveBuffers[i];
 
                 WaveBuffers[i] = voiceWaveBuffer.ToCommon(1);
             }
 
             State = state;
-            DecodingBehaviour = serverInfo.DecodingBehaviour;
+            DecodingBehaviour = serverState.DecodingBehaviour;
         }
 
         public void Process(CommandList context)

src/Ryujinx.Audio/Renderer/Dsp/Command/PcmInt16DataSourceCommandVersion1.cs

@@ -2,7 +2,7 @@ using Ryujinx.Audio.Common;
 using Ryujinx.Audio.Renderer.Common;
 using Ryujinx.Audio.Renderer.Server.Voice;
 using System;
-using Ryujinx.Audio.Renderer.Parameter;
+using static Ryujinx.Audio.Renderer.Parameter.VoiceInParameter;
 using WaveBuffer = Ryujinx.Audio.Renderer.Common.WaveBuffer;
 
 namespace Ryujinx.Audio.Renderer.Dsp.Command
@@ -27,33 +27,31 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
 
         public WaveBuffer[] WaveBuffers { get; }
 
-        public Memory<VoiceState> State { get; }
+        public Memory<VoiceUpdateState> State { get; }
         public DecodingBehaviour DecodingBehaviour { get; }
 
-        public PcmInt16DataSourceCommandVersion1(ref VoiceInfo serverInfo, Memory<VoiceState> state, ushort outputBufferIndex, ushort channelIndex, int nodeId)
+        public PcmInt16DataSourceCommandVersion1(ref VoiceState serverState, Memory<VoiceUpdateState> state, ushort outputBufferIndex, ushort channelIndex, int nodeId)
         {
             Enabled = true;
             NodeId = nodeId;
 
             OutputBufferIndex = (ushort)(channelIndex + outputBufferIndex);
-            SampleRate = serverInfo.SampleRate;
+            SampleRate = serverState.SampleRate;
             ChannelIndex = channelIndex;
-            ChannelCount = serverInfo.ChannelsCount;
+            ChannelCount = serverState.ChannelsCount;
-            Pitch = serverInfo.Pitch;
+            Pitch = serverState.Pitch;
 
             WaveBuffers = new WaveBuffer[Constants.VoiceWaveBufferCount];
 
-            Span<Server.Voice.WaveBuffer> waveBufferSpan = serverInfo.WaveBuffers.AsSpan();
-
             for (int i = 0; i < WaveBuffers.Length; i++)
             {
-                ref Server.Voice.WaveBuffer voiceWaveBuffer = ref waveBufferSpan[i];
+                ref Server.Voice.WaveBuffer voiceWaveBuffer = ref serverState.WaveBuffers[i];
 
                 WaveBuffers[i] = voiceWaveBuffer.ToCommon(1);
             }
 
             State = state;
-            DecodingBehaviour = serverInfo.DecodingBehaviour;
+            DecodingBehaviour = serverState.DecodingBehaviour;
         }
 
         public void Process(CommandList context)

src/Ryujinx.Audio/Renderer/Dsp/Command/Reverb3dCommand.cs

@@ -66,13 +66,10 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
             InputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
             OutputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
 
-            Span<byte> inputSpan = Parameter.Input.AsSpan();
-            Span<byte> outputSpan = Parameter.Output.AsSpan();
-
             for (int i = 0; i < Parameter.ChannelCount; i++)
             {
-                InputBufferIndices[i] = (ushort)(bufferOffset + inputSpan[i]);
+                InputBufferIndices[i] = (ushort)(bufferOffset + Parameter.Input[i]);
-                OutputBufferIndices[i] = (ushort)(bufferOffset + outputSpan[i]);
+                OutputBufferIndices[i] = (ushort)(bufferOffset + Parameter.Output[i]);
             }
 
             // NOTE: We do the opposite as Nintendo here for now to restore previous behaviour

src/Ryujinx.Audio/Renderer/Dsp/Command/ReverbCommand.cs

@@ -64,13 +64,10 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
             InputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
             OutputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
 
-            Span<byte> inputSpan = Parameter.Input.AsSpan();
-            Span<byte> outputSpan = Parameter.Output.AsSpan();
-
             for (int i = 0; i < Parameter.ChannelCount; i++)
             {
-                InputBufferIndices[i] = (ushort)(bufferOffset + inputSpan[i]);
+                InputBufferIndices[i] = (ushort)(bufferOffset + Parameter.Input[i]);
-                OutputBufferIndices[i] = (ushort)(bufferOffset + outputSpan[i]);
+                OutputBufferIndices[i] = (ushort)(bufferOffset + Parameter.Output[i]);
             }
 
             IsLongSizePreDelaySupported = isLongSizePreDelaySupported;

src/Ryujinx.Audio/Renderer/Dsp/Command/UpsampleCommand.cs

@@ -18,11 +18,11 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
         public uint InputSampleCount { get; }
         public uint InputSampleRate { get; }
 
-        public UpsamplerInfo UpsamplerInfo { get; }
+        public UpsamplerState UpsamplerInfo { get; }
 
         public Memory<float> OutBuffer { get; }
 
-        public UpsampleCommand(uint bufferOffset, UpsamplerInfo info, uint inputCount, Span<byte> inputBufferOffset, uint bufferCount, uint sampleCount, uint sampleRate, int nodeId)
+        public UpsampleCommand(uint bufferOffset, UpsamplerState info, uint inputCount, Span<byte> inputBufferOffset, uint bufferCount, uint sampleCount, uint sampleRate, int nodeId)
         {
             Enabled = true;
             NodeId = nodeId;

src/Ryujinx.Audio/Renderer/Dsp/DataSourceHelper.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 using System.Runtime.Intrinsics;
 using System.Runtime.Intrinsics.Arm;
 using System.Runtime.Intrinsics.X86;
-using Ryujinx.Audio.Renderer.Parameter;
+using static Ryujinx.Audio.Renderer.Parameter.VoiceInParameter;
 
 namespace Ryujinx.Audio.Renderer.Dsp
 {
@@ -42,7 +42,7 @@ namespace Ryujinx.Audio.Renderer.Dsp
             };
         }
 
-        public static void ProcessWaveBuffers(IVirtualMemoryManager memoryManager, Span<float> outputBuffer, ref WaveBufferInformation info, Span<WaveBuffer> wavebuffers, ref VoiceState voiceState, uint targetSampleRate, int sampleCount)
+        public static void ProcessWaveBuffers(IVirtualMemoryManager memoryManager, Span<float> outputBuffer, ref WaveBufferInformation info, Span<WaveBuffer> wavebuffers, ref VoiceUpdateState voiceState, uint targetSampleRate, int sampleCount)
         {
             const int TempBufferSize = 0x3F00;
 
@@ -74,7 +74,7 @@ namespace Ryujinx.Audio.Renderer.Dsp
                 {
                     int tempBufferIndex = 0;
 
-                    if ((info.DecodingBehaviour & DecodingBehaviour.SkipPitchAndSampleRateConversion) != DecodingBehaviour.SkipPitchAndSampleRateConversion)
+                    if (!info.DecodingBehaviour.HasFlag(DecodingBehaviour.SkipPitchAndSampleRateConversion))
                     {
                         voiceState.Pitch.AsSpan()[..pitchMaxLength].CopyTo(tempBuffer);
                         tempBufferIndex += pitchMaxLength;
@@ -208,7 +208,7 @@ namespace Ryujinx.Audio.Renderer.Dsp
                                     break;
                                 }
 
-                                if ((info.DecodingBehaviour & DecodingBehaviour.PlayedSampleCountResetWhenLooping) == DecodingBehaviour.PlayedSampleCountResetWhenLooping)
+                                if (info.DecodingBehaviour.HasFlag(DecodingBehaviour.PlayedSampleCountResetWhenLooping))
                                 {
                                     playedSampleCount = 0;
                                 }
@@ -222,7 +222,7 @@ namespace Ryujinx.Audio.Renderer.Dsp
 
                     Span<int> outputSpanInt = MemoryMarshal.Cast<float, int>(outputBuffer[i..]);
 
-                    if ((info.DecodingBehaviour & DecodingBehaviour.SkipPitchAndSampleRateConversion) == DecodingBehaviour.SkipPitchAndSampleRateConversion)
+                    if (info.DecodingBehaviour.HasFlag(DecodingBehaviour.SkipPitchAndSampleRateConversion))
                     {
                         for (int j = 0; j < y; j++)
                         {

src/Ryujinx.Audio/Renderer/Dsp/ResamplerHelper.cs

@@ -3,7 +3,7 @@ using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Runtime.Intrinsics;
 using System.Runtime.Intrinsics.X86;
-using Ryujinx.Audio.Renderer.Parameter;
+using static Ryujinx.Audio.Renderer.Parameter.VoiceInParameter;
 
 namespace Ryujinx.Audio.Renderer.Dsp
 {

src/Ryujinx.Audio/Renderer/Dsp/UpsamplerHelper.cs

@@ -41,12 +41,11 @@ namespace Ryujinx.Audio.Renderer.Dsp
             }
 
             Array20<float> result = new();
-            Span<float> resultSpan = result.AsSpan();
 
             for (int i = 0; i < FilterBankLength; i++)
             {
                 float x = (Bank0CenterIndex - i) + offset;
-                resultSpan[i] = Sinc(x) * BlackmanWindow(x / FilterBankLength + 0.5f);
+                result[i] = Sinc(x) * BlackmanWindow(x / FilterBankLength + 0.5f);
             }
 
             return result;
@@ -80,9 +79,6 @@ namespace Ryujinx.Audio.Renderer.Dsp
                 Debug.Assert(state.History.Length == HistoryLength);
                 Debug.Assert(bank.Length == FilterBankLength);
 
-                Span<float> bankSpan = bank.AsSpan();
-                Span<float> historySpan = state.History.AsSpan();
-
                 int curIdx = 0;
                 if (Vector.IsHardwareAccelerated)
                 {
@@ -92,15 +88,15 @@ namespace Ryujinx.Audio.Renderer.Dsp
                     while (curIdx < stopIdx)
                     {
                         result += Vector.Dot(
-                            new Vector<float>(bankSpan[curIdx..(curIdx + Vector<float>.Count)]),
+                            new Vector<float>(bank.AsSpan().Slice(curIdx, Vector<float>.Count)),
-                            new Vector<float>(historySpan[curIdx..(curIdx + Vector<float>.Count)]));
+                            new Vector<float>(state.History.AsSpan().Slice(curIdx, Vector<float>.Count)));
                         curIdx += Vector<float>.Count;
                     }
                 }
 
                 while (curIdx < FilterBankLength)
                 {
-                    result += bankSpan[curIdx] * historySpan[curIdx];
+                    result += bank[curIdx] * state.History[curIdx];
                     curIdx++;
                 }
 

src/Ryujinx.Audio/Renderer/Parameter/AudioRendererConfiguration.cs

@@ -1,4 +1,3 @@
-using Ryujinx.Audio.Renderer.Server;
 using Ryujinx.Audio.Renderer.Server.Types;
 using System.Runtime.InteropServices;
 
@@ -94,7 +93,7 @@ namespace Ryujinx.Audio.Renderer.Parameter
         /// <summary>
         /// The user audio revision
         /// </summary>
-        /// <seealso cref="BehaviourInfo"/>
+        /// <seealso cref="Server.BehaviourContext"/>
         public int Revision;
     }
 }

src/Ryujinx.Audio/Renderer/Parameter/BiquadFilterParameter.cs

@@ -7,7 +7,7 @@ namespace Ryujinx.Audio.Renderer.Parameter
     /// Biquad filter parameters.
     /// </summary>
     [StructLayout(LayoutKind.Sequential, Size = 0xC, Pack = 1)]
-    public struct BiquadFilterParameter1
+    public struct BiquadFilterParameter
     {
         /// <summary>
         /// Set to true if the biquad filter is active.

src/Ryujinx.Audio/Renderer/Parameter/BiquadFilterParameter2.cs

@@ -1,36 +0,0 @@
-using Ryujinx.Common.Memory;
-using System.Runtime.InteropServices;
-
-namespace Ryujinx.Audio.Renderer.Parameter
-{
-    /// <summary>
-    /// Biquad filter parameters.
-    /// </summary>
-    [StructLayout(LayoutKind.Sequential, Size = 0x18, Pack = 1)]
-    public struct BiquadFilterParameter2
-    {
-        /// <summary>
-        /// Set to true if the biquad filter is active.
-        /// </summary>
-        [MarshalAs(UnmanagedType.I1)]
-        public bool Enable;
-
-        /// <summary>
-        /// Reserved/padding.
-        /// </summary>
-        private readonly byte _reserved1;
-        private readonly byte _reserved2;
-        private readonly byte _reserved3;
-
-        /// <summary>
-        /// Biquad filter numerator (b0, b1, b2).
-        /// </summary>
-        public Array3<float> Numerator;
-
-        /// <summary>
-        /// Biquad filter denominator (a1, a2).
-        /// </summary>
-        /// <remarks>a0 = 1</remarks>
-        public Array2<float> Denominator;
-    }
-}

src/Ryujinx.Audio/Renderer/Parameter/Effect/BiquadFilterEffectParameter.cs

@@ -8,7 +8,7 @@ namespace Ryujinx.Audio.Renderer.Parameter.Effect
     /// <see cref="IEffectInParameter.SpecificData"/> for <see cref="Common.EffectType.BiquadFilter"/>.
     /// </summary>
     [StructLayout(LayoutKind.Sequential, Pack = 1)]
-    public struct BiquadFilterEffectParameter1
+    public struct BiquadFilterEffectParameter
     {
         /// <summary>
         /// The input channel indices that will be used by the <see cref="Dsp.AudioProcessor"/>.

src/Ryujinx.Audio/Renderer/Parameter/Effect/BiquadFilterEffectParameter2.cs

@@ -1,49 +0,0 @@
-using Ryujinx.Audio.Renderer.Server.Effect;
-using Ryujinx.Common.Memory;
-using System.Runtime.InteropServices;
-
-namespace Ryujinx.Audio.Renderer.Parameter.Effect
-{
-    /// <summary>
-    /// <see cref="IEffectInParameter.SpecificData"/> for <see cref="Common.EffectType.BiquadFilter"/>.
-    /// </summary>
-    [StructLayout(LayoutKind.Sequential, Pack = 1)]
-    public struct BiquadFilterEffectParameter2
-    {
-        /// <summary>
-        /// The input channel indices that will be used by the <see cref="Dsp.AudioProcessor"/>.
-        /// </summary>
-        public Array6<byte> Input;
-
-        /// <summary>
-        /// The output channel indices that will be used by the <see cref="Dsp.AudioProcessor"/>.
-        /// </summary>
-        public Array6<byte> Output;
-
-        /// <summary>
-        /// Biquad filter numerator (b0, b1, b2).
-        /// </summary>
-        public Array3<float> Numerator;
-
-        /// <summary>
-        /// Biquad filter denominator (a1, a2).
-        /// </summary>
-        /// <remarks>a0 = 1</remarks>
-        public Array2<float> Denominator;
-
-        /// <summary>
-        /// The total channel count used.
-        /// </summary>
-        public byte ChannelCount;
-
-        /// <summary>
-        /// The current usage status of the effect on the client side.
-        /// </summary>
-        public UsageState Status;
-        
-        /// <summary>
-        /// Reserved/unused.
-        /// </summary>
-        private readonly ushort _reserved;
-    }
-}

src/Ryujinx.Audio/Renderer/Parameter/EffectInParameterVersion3.cs

@@ -1,97 +0,0 @@
-using Ryujinx.Audio.Renderer.Common;
-using Ryujinx.Common.Utilities;
-using System;
-using System.Runtime.InteropServices;
-
-namespace Ryujinx.Audio.Renderer.Parameter
-{
-    /// <summary>
-    /// Input information for an effect version 2. (added with REV9)
-    /// </summary>
-    [StructLayout(LayoutKind.Sequential, Pack = 1)]
-    public struct EffectInParameterVersion3 : IEffectInParameter
-    {
-        /// <summary>
-        /// Type of the effect.
-        /// </summary>
-        public EffectType Type;
-
-        /// <summary>
-        /// Set to true if the effect is new.
-        /// </summary>
-        [MarshalAs(UnmanagedType.I1)]
-        public bool IsNew;
-
-        /// <summary>
-        /// Set to true if the effect must be active.
-        /// </summary>
-        [MarshalAs(UnmanagedType.I1)]
-        public bool IsEnabled;
-
-        /// <summary>
-        /// Reserved/padding.
-        /// </summary>
-        private readonly byte _reserved1;
-
-        /// <summary>
-        /// The target mix id of the effect.
-        /// </summary>
-        public int MixId;
-
-        /// <summary>
-        /// Address of the processing workbuffer.
-        /// </summary>
-        /// <remarks>This is additional data that could be required by the effect processing.</remarks>
-        public ulong BufferBase;
-
-        /// <summary>
-        /// Size of the processing workbuffer.
-        /// </summary>
-        /// <remarks>This is additional data that could be required by the effect processing.</remarks>
-        public ulong BufferSize;
-
-        /// <summary>
-        /// Position of the effect while processing effects.
-        /// </summary>
-        public uint ProcessingOrder;
-
-        /// <summary>
-        /// Reserved/padding.
-        /// </summary>
-        private readonly uint _reserved2;
-
-        /// <summary>
-        /// Specific data storage.
-        /// </summary>
-        private SpecificDataStruct _specificDataStart;
-
-        [StructLayout(LayoutKind.Sequential, Size = 0xA0, Pack = 1)]
-        private struct SpecificDataStruct { }
-
-        public Span<byte> SpecificData => SpanHelpers.AsSpan<SpecificDataStruct, byte>(ref _specificDataStart);
-
-        readonly EffectType IEffectInParameter.Type => Type;
-
-        readonly bool IEffectInParameter.IsNew => IsNew;
-
-        readonly bool IEffectInParameter.IsEnabled => IsEnabled;
-
-        readonly int IEffectInParameter.MixId => MixId;
-
-        readonly ulong IEffectInParameter.BufferBase => BufferBase;
-
-        readonly ulong IEffectInParameter.BufferSize => BufferSize;
-
-        readonly uint IEffectInParameter.ProcessingOrder => ProcessingOrder;
-
-        /// <summary>
-        ///  Check if the given channel count is valid.
-        /// </summary>
-        /// <param name="channelCount">The channel count to check</param>
-        /// <returns>Returns true if the channel count is valid.</returns>
-        public static bool IsChannelCountValid(int channelCount)
-        {
-            return channelCount is 1 or 2 or 4 or 6;
-        }
-    }
-}

src/Ryujinx.Audio/Renderer/Parameter/ISplitterDestinationInParameter.cs

@@ -21,7 +21,7 @@ namespace Ryujinx.Audio.Renderer.Parameter
         /// <summary>
         /// Biquad filter parameters.
         /// </summary>
-        Array2<BiquadFilterParameter2> BiquadFilters2 { get; }
+        Array2<BiquadFilterParameter> BiquadFilters { get; }
 
         /// <summary>
         /// Set to true if in use.

src/Ryujinx.Audio/Renderer/Parameter/SinkInParameter.cs

@@ -25,7 +25,7 @@ namespace Ryujinx.Audio.Renderer.Parameter
         /// <summary>
         /// Reserved/padding.
         /// </summary>
-        private readonly ushort _magic; // 0xCAFE
+        private readonly ushort _reserved1;
 
         /// <summary>
         /// The node id of the sink.

src/Ryujinx.Audio/Renderer/Parameter/SplitterDestinationInParameterVersion1.cs

@@ -61,7 +61,7 @@ namespace Ryujinx.Audio.Renderer.Parameter
 
         readonly int ISplitterDestinationInParameter.DestinationId => DestinationId;
 
-        readonly Array2<BiquadFilterParameter2> ISplitterDestinationInParameter.BiquadFilters2 => default;
+        readonly Array2<BiquadFilterParameter> ISplitterDestinationInParameter.BiquadFilters => default;
 
         readonly bool ISplitterDestinationInParameter.IsUsed => IsUsed;
         readonly bool ISplitterDestinationInParameter.ResetPrevVolume => ResetPrevVolume;

src/Ryujinx.Audio/Renderer/Parameter/SplitterDestinationInParameterVersion2.cs

@@ -9,7 +9,7 @@ namespace Ryujinx.Audio.Renderer.Parameter
     /// Input header for a splitter destination version 2 update.
     /// </summary>
     [StructLayout(LayoutKind.Sequential, Pack = 1)]
-    public struct SplitterDestinationInParameterVersion2b : ISplitterDestinationInParameter
+    public struct SplitterDestinationInParameterVersion2 : ISplitterDestinationInParameter
     {
         /// <summary>
         /// Magic of the input header.
@@ -34,7 +34,7 @@ namespace Ryujinx.Audio.Renderer.Parameter
         /// <summary>
         /// Biquad filter parameters.
         /// </summary>
-        public Array2<BiquadFilterParameter2> BiquadFilters;
+        public Array2<BiquadFilterParameter> BiquadFilters;
 
         /// <summary>
         /// Set to true if in use.
@@ -66,7 +66,7 @@ namespace Ryujinx.Audio.Renderer.Parameter
 
         readonly int ISplitterDestinationInParameter.DestinationId => DestinationId;
 
-        readonly Array2<BiquadFilterParameter2> ISplitterDestinationInParameter.BiquadFilters2 => BiquadFilters;
+        readonly Array2<BiquadFilterParameter> ISplitterDestinationInParameter.BiquadFilters => BiquadFilters;
 
         readonly bool ISplitterDestinationInParameter.IsUsed => IsUsed;
         readonly bool ISplitterDestinationInParameter.ResetPrevVolume => ResetPrevVolume;

src/Ryujinx.Audio/Renderer/Parameter/SplitterDestinationInParameterVersion2a.cs

@@ -1,100 +0,0 @@
-using Ryujinx.Audio.Renderer.Dsp;
-using Ryujinx.Common.Memory;
-using Ryujinx.Common.Utilities;
-using System;
-using System.Runtime.InteropServices;
-
-namespace Ryujinx.Audio.Renderer.Parameter
-{
-    /// <summary>
-    /// Input header for a splitter destination version 2 update.
-    /// </summary>
-    [StructLayout(LayoutKind.Sequential, Pack = 1)]
-    public struct SplitterDestinationInParameterVersion2a : ISplitterDestinationInParameter
-    {
-        /// <summary>
-        /// Magic of the input header.
-        /// </summary>
-        public uint Magic;
-
-        /// <summary>
-        /// Target splitter destination data id.
-        /// </summary>
-        public int Id;
-
-        /// <summary>
-        /// Mix buffer volumes storage.
-        /// </summary>
-        private MixArray _mixBufferVolume;
-
-        /// <summary>
-        /// The mix to output the result of the splitter.
-        /// </summary>
-        public int DestinationId;
-
-        /// <summary>
-        /// Biquad filter parameters.
-        /// </summary>
-        public Array2<BiquadFilterParameter1> BiquadFilters;
-
-        /// <summary>
-        /// Set to true if in use.
-        /// </summary>
-        [MarshalAs(UnmanagedType.I1)]
-        public bool IsUsed;
-
-        /// <summary>
-        /// Set to true to force resetting the previous mix volumes.
-        /// </summary>
-        [MarshalAs(UnmanagedType.I1)]
-        public bool ResetPrevVolume;
-
-        /// <summary>
-        /// Reserved/padding.
-        /// </summary>
-        private unsafe fixed byte _reserved[10];
-
-        [StructLayout(LayoutKind.Sequential, Size = sizeof(float) * Constants.MixBufferCountMax, Pack = 1)]
-        private struct MixArray { }
-
-        /// <summary>
-        /// Mix buffer volumes.
-        /// </summary>
-        /// <remarks>Used when a splitter id is specified in the mix.</remarks>
-        public Span<float> MixBufferVolume => SpanHelpers.AsSpan<MixArray, float>(ref _mixBufferVolume);
-
-        readonly int ISplitterDestinationInParameter.Id => Id;
-
-        readonly int ISplitterDestinationInParameter.DestinationId => DestinationId;
-        
-        readonly Array2<BiquadFilterParameter2> ISplitterDestinationInParameter.BiquadFilters2
-        {
-            get
-            {
-                Array2<BiquadFilterParameter2> newFilters = new();
-                Span<BiquadFilterParameter2> newFiltersSpan = newFilters.AsSpan();
-                newFiltersSpan[0] = BiquadFilterHelper.ToBiquadFilterParameter2(BiquadFilters[0]);
-                newFiltersSpan[1] = BiquadFilterHelper.ToBiquadFilterParameter2(BiquadFilters[1]);
-                
-                return newFilters;
-            }
-        }
-
-        readonly bool ISplitterDestinationInParameter.IsUsed => IsUsed;
-        readonly bool ISplitterDestinationInParameter.ResetPrevVolume => ResetPrevVolume;
-
-        /// <summary>
-        /// The expected constant of any input header.
-        /// </summary>
-        private const uint ValidMagic = 0x44444E53;
-
-        /// <summary>
-        /// Check if the magic is valid.
-        /// </summary>
-        /// <returns>Returns true if the magic is valid.</returns>
-        public readonly bool IsMagicValid()
-        {
-            return Magic == ValidMagic;
-        }
-    }
-}

src/Ryujinx.Audio/Renderer/Parameter/VoiceInParameter.cs

@@ -12,7 +12,7 @@ namespace Ryujinx.Audio.Renderer.Parameter
     /// Input information for a voice.
     /// </summary>
     [StructLayout(LayoutKind.Sequential, Size = 0x170, Pack = 1)]
-    public struct VoiceInParameter1
+    public struct VoiceInParameter
     {
         /// <summary>
         /// Id of the voice.
@@ -79,7 +79,7 @@ namespace Ryujinx.Audio.Renderer.Parameter
         /// <summary>
         /// Biquad filters to apply to the output of the voice.
         /// </summary>
-        public Array2<BiquadFilterParameter1> BiquadFilters;
+        public Array2<BiquadFilterParameter> BiquadFilters;
 
         /// <summary>
         /// Total count of <see cref="WaveBufferInternal"/> of the voice.
@@ -171,7 +171,6 @@ namespace Ryujinx.Audio.Renderer.Parameter
         /// Reserved/unused.
         /// </summary>
         private unsafe fixed uint _reserved3[2];
-    }
 
         /// <summary>
         /// Input information for a voice wavebuffer.
@@ -330,3 +329,4 @@ namespace Ryujinx.Audio.Renderer.Parameter
             Low,
         }
     }
+}

src/Ryujinx.Audio/Renderer/Parameter/VoiceInParameter2.cs

@@ -1,176 +0,0 @@
-using Ryujinx.Audio.Common;
-using Ryujinx.Audio.Renderer.Common;
-using Ryujinx.Audio.Renderer.Dsp;
-using Ryujinx.Common.Memory;
-using System;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-namespace Ryujinx.Audio.Renderer.Parameter
-{
-    /// <summary>
-    /// Input information for a voice.
-    /// </summary>
-    [StructLayout(LayoutKind.Sequential, Size = 0x188, Pack = 1)]
-    public struct VoiceInParameter2
-    {
-        /// <summary>
-        /// Id of the voice.
-        /// </summary>
-        public int Id;
-
-        /// <summary>
-        /// Node id of the voice.
-        /// </summary>
-        public int NodeId;
-
-        /// <summary>
-        /// Set to true if the voice is new.
-        /// </summary>
-        [MarshalAs(UnmanagedType.I1)]
-        public bool IsNew;
-
-        /// <summary>
-        /// Set to true if the voice is used.
-        /// </summary>
-        [MarshalAs(UnmanagedType.I1)]
-        public bool InUse;
-
-        /// <summary>
-        /// The voice <see cref="PlayState"/> wanted by the user.
-        /// </summary>
-        public PlayState PlayState;
-
-        /// <summary>
-        /// The <see cref="SampleFormat"/> of the voice.
-        /// </summary>
-        public SampleFormat SampleFormat;
-
-        /// <summary>
-        /// The sample rate of the voice.
-        /// </summary>
-        public uint SampleRate;
-
-        /// <summary>
-        /// The priority of the voice.
-        /// </summary>
-        public uint Priority;
-
-        /// <summary>
-        /// Target sorting position of the voice. (Used to sort voices with the same <see cref="Priority"/>)
-        /// </summary>
-        public uint SortingOrder;
-
-        /// <summary>
-        /// The total channel count used.
-        /// </summary>
-        public uint ChannelCount;
-
-        /// <summary>
-        /// The pitch used on the voice.
-        /// </summary>
-        public float Pitch;
-
-        /// <summary>
-        /// The output volume of the voice.
-        /// </summary>
-        public float Volume;
-
-        /// <summary>
-        /// Biquad filters to apply to the output of the voice.
-        /// </summary>
-        public Array2<BiquadFilterParameter2> BiquadFilters;
-
-        /// <summary>
-        /// Total count of <see cref="WaveBufferInternal"/> of the voice.
-        /// </summary>
-        public uint WaveBuffersCount;
-
-        /// <summary>
-        /// Current playing <see cref="WaveBufferInternal"/> of the voice.
-        /// </summary>
-        public uint WaveBuffersIndex;
-
-        /// <summary>
-        /// Reserved/unused.
-        /// </summary>
-        private readonly uint 
-            _reserved1;
-
-        /// <summary>
-        /// User state address required by the data source.
-        /// </summary>
-        /// <remarks>Only used for <see cref="SampleFormat.Adpcm"/> as the address of the GC-ADPCM coefficients.</remarks>
-        public ulong DataSourceStateAddress;
-
-        /// <summary>
-        /// User state size required by the data source.
-        /// </summary>
-        /// <remarks>Only used for <see cref="SampleFormat.Adpcm"/> as the size of the GC-ADPCM coefficients.</remarks>
-        public ulong DataSourceStateSize;
-
-        /// <summary>
-        /// The target mix id of the voice.
-        /// </summary>
-        public int MixId;
-
-        /// <summary>
-        /// The target splitter id of the voice.
-        /// </summary>
-        public uint SplitterId;
-
-        /// <summary>
-        /// The wavebuffer parameters of this voice.
-        /// </summary>
-        public Array4<WaveBufferInternal> WaveBuffers;
-
-        /// <summary>
-        /// The channel resource ids associated to the voice.
-        /// </summary>
-        public Array6<int> ChannelResourceIds;
-
-        /// <summary>
-        /// Reset the voice drop flag during voice server update.
-        /// </summary>
-        [MarshalAs(UnmanagedType.I1)]
-        public bool ResetVoiceDropFlag;
-
-        /// <summary>
-        /// Flush the amount of wavebuffer specified. This will result in the wavebuffer being skipped and marked played.
-        /// </summary>
-        /// <remarks>This was added on REV5.</remarks>
-        public byte FlushWaveBufferCount;
-
-        /// <summary>
-        /// Reserved/unused.
-        /// </summary>
-        private readonly ushort _reserved2;
-
-        /// <summary>
-        /// Change the behaviour of the voice.
-        /// </summary>
-        /// <remarks>This was added on REV5.</remarks>
-        public DecodingBehaviour DecodingBehaviourFlags;
-
-        /// <summary>
-        /// Change the Sample Rate Conversion (SRC) quality of the voice.
-        /// </summary>
-        /// <remarks>This was added on REV8.</remarks>
-        public SampleRateConversionQuality SrcQuality;
-
-        /// <summary>
-        /// This was previously used for opus codec support on the Audio Renderer and was removed on REV3.
-        /// </summary>
-        public uint ExternalContext;
-
-        /// <summary>
-        /// This was previously used for opus codec support on the Audio Renderer and was removed on REV3.
-        /// </summary>
-        public uint ExternalContextSize;
-
-        /// <summary>
-        /// Reserved/unused.
-        /// </summary>
-        private unsafe fixed uint _reserved3[2];
-    }
-}

src/Ryujinx.Audio/Renderer/Parameter/VoiceOutStatus.cs

@@ -1,5 +1,3 @@
-using Ryujinx.Audio.Renderer.Common;
-using Ryujinx.Audio.Renderer.Server;
 using System.Runtime.InteropServices;
 
 namespace Ryujinx.Audio.Renderer.Parameter
@@ -7,7 +5,7 @@ namespace Ryujinx.Audio.Renderer.Parameter
     /// <summary>
     /// Output information about a voice.
     /// </summary>
-    /// <remarks>See <seealso cref="StateUpdater.UpdateVoices1"/></remarks>
+    /// <remarks>See <seealso cref="Server.StateUpdater.UpdateVoices(Server.Voice.VoiceContext, System.Memory{Server.MemoryPool.MemoryPoolState})"/></remarks>
     [StructLayout(LayoutKind.Sequential, Pack = 1)]
     public struct VoiceOutStatus
     {
@@ -15,7 +13,7 @@ namespace Ryujinx.Audio.Renderer.Parameter
         /// The total amount of samples that was played.
         /// </summary>
         /// <remarks>This is reset to 0 when a <see cref="Common.WaveBuffer"/> finishes playing and <see cref="Common.WaveBuffer.IsEndOfStream"/> is set.</remarks>
-        /// <remarks>This is reset to 0 when looping while <see cref="DecodingBehaviour.PlayedSampleCountResetWhenLooping"/> is set.</remarks>
+        /// <remarks>This is reset to 0 when looping while <see cref="Parameter.VoiceInParameter.DecodingBehaviour.PlayedSampleCountResetWhenLooping"/> is set.</remarks>
         public ulong PlayedSampleCount;
 
         /// <summary>

src/Ryujinx.Audio/Renderer/Server/AudioRenderSystem.cs

@@ -31,7 +31,7 @@ namespace Ryujinx.Audio.Renderer.Server
         private AudioRendererRenderingDevice _renderingDevice;
         private AudioRendererExecutionMode _executionMode;
         private readonly IWritableEvent _systemEvent;
-        private MemoryPoolInfo _dspMemoryPoolInfo;
+        private MemoryPoolState _dspMemoryPoolState;
         private readonly VoiceContext _voiceContext;
         private readonly MixContext _mixContext;
         private readonly SinkContext _sinkContext;
@@ -40,13 +40,13 @@ namespace Ryujinx.Audio.Renderer.Server
         private PerformanceManager _performanceManager;
         private UpsamplerManager _upsamplerManager;
         private bool _isActive;
-        private BehaviourInfo _behaviourInfo;
+        private BehaviourContext _behaviourContext;
 #pragma warning disable IDE0052 // Remove unread private member
         private ulong _totalElapsedTicksUpdating;
         private ulong _totalElapsedTicks;
 #pragma warning restore IDE0052
         private int _sessionId;
-        private Memory<MemoryPoolInfo> _memoryPools;
+        private Memory<MemoryPoolState> _memoryPools;
 
         private uint _sampleRate;
         private uint _sampleCount;
@@ -84,7 +84,7 @@ namespace Ryujinx.Audio.Renderer.Server
         public AudioRenderSystem(AudioRendererManager manager, IWritableEvent systemEvent)
         {
             _manager = manager;
-            _dspMemoryPoolInfo = MemoryPoolInfo.Create(MemoryPoolInfo.LocationType.Dsp);
+            _dspMemoryPoolState = MemoryPoolState.Create(MemoryPoolState.LocationType.Dsp);
             _voiceContext = new VoiceContext();
             _mixContext = new MixContext();
             _sinkContext = new SinkContext();
@@ -93,7 +93,7 @@ namespace Ryujinx.Audio.Renderer.Server
 
             _commandProcessingTimeEstimator = null;
             _systemEvent = systemEvent;
-            _behaviourInfo = new BehaviourInfo();
+            _behaviourContext = new BehaviourContext();
 
             _totalElapsedTicksUpdating = 0;
             _sessionId = 0;
@@ -110,7 +110,7 @@ namespace Ryujinx.Audio.Renderer.Server
             ulong appletResourceId,
             IVirtualMemoryManager memoryManager)
         {
-            if (!BehaviourInfo.CheckValidRevision(parameter.Revision))
+            if (!BehaviourContext.CheckValidRevision(parameter.Revision))
             {
                 return ResultCode.OperationFailed;
             }
@@ -122,9 +122,9 @@ namespace Ryujinx.Audio.Renderer.Server
 
             Debug.Assert(parameter.RenderingDevice == AudioRendererRenderingDevice.Dsp && parameter.ExecutionMode == AudioRendererExecutionMode.Auto);
 
-            Logger.Info?.Print(LogClass.AudioRenderer, $"Initializing with REV{BehaviourInfo.GetRevisionNumber(parameter.Revision)}");
+            Logger.Info?.Print(LogClass.AudioRenderer, $"Initializing with REV{BehaviourContext.GetRevisionNumber(parameter.Revision)}");
 
-            _behaviourInfo.SetUserRevision(parameter.Revision);
+            _behaviourContext.SetUserRevision(parameter.Revision);
 
             _sampleRate = parameter.SampleRate;
             _sampleCount = parameter.SampleCount;
@@ -151,7 +151,7 @@ namespace Ryujinx.Audio.Renderer.Server
             workBufferAllocator = new WorkBufferAllocator(workBufferMemory);
 
             PoolMapper poolMapper = new(processHandle, false);
-            poolMapper.InitializeSystemPool(ref _dspMemoryPoolInfo, workBuffer, workBufferSize);
+            poolMapper.InitializeSystemPool(ref _dspMemoryPoolState, workBuffer, workBufferSize);
 
             _mixBuffer = workBufferAllocator.Allocate<float>(_sampleCount * (_voiceChannelCountMax + _mixBufferCount), 0x10);
 
@@ -176,7 +176,7 @@ namespace Ryujinx.Audio.Renderer.Server
 
             Memory<BiquadFilterState> splitterBqfStates = Memory<BiquadFilterState>.Empty;
 
-            if (_behaviourInfo.IsBiquadFilterParameterForSplitterEnabled() &&
+            if (_behaviourContext.IsBiquadFilterParameterForSplitterEnabled() &&
                 parameter.SplitterCount > 0 &&
                 parameter.SplitterDestinationCount > 0)
             {
@@ -191,23 +191,23 @@ namespace Ryujinx.Audio.Renderer.Server
             }
 
             // Invalidate DSP cache on what was currently allocated with workBuffer.
-            AudioProcessorMemoryManager.InvalidateDspCache(_dspMemoryPoolInfo.Translate(workBuffer, workBufferAllocator.Offset), workBufferAllocator.Offset);
+            AudioProcessorMemoryManager.InvalidateDspCache(_dspMemoryPoolState.Translate(workBuffer, workBufferAllocator.Offset), workBufferAllocator.Offset);
 
             Debug.Assert((workBufferAllocator.Offset % Constants.BufferAlignment) == 0);
 
-            Memory<VoiceInfo> voices = workBufferAllocator.Allocate<VoiceInfo>(parameter.VoiceCount, VoiceInfo.Alignment);
+            Memory<VoiceState> voices = workBufferAllocator.Allocate<VoiceState>(parameter.VoiceCount, VoiceState.Alignment);
 
             if (voices.IsEmpty)
             {
                 return ResultCode.WorkBufferTooSmall;
             }
 
-            foreach (ref VoiceInfo voice in voices.Span)
+            foreach (ref VoiceState voice in voices.Span)
             {
                 voice.Initialize();
             }
 
-            // A pain to handle as we can't have VoiceInfo*, use indices to be a bit more safe
+            // A pain to handle as we can't have VoiceState*, use indices to be a bit more safe
             Memory<int> sortedVoices = workBufferAllocator.Allocate<int>(parameter.VoiceCount, 0x10);
 
             if (sortedVoices.IsEmpty)
@@ -233,16 +233,16 @@ namespace Ryujinx.Audio.Renderer.Server
                 voiceChannelResource.IsUsed = false;
             }
 
-            Memory<VoiceState> voiceStates = workBufferAllocator.Allocate<VoiceState>(parameter.VoiceCount, VoiceState.Align);
+            Memory<VoiceUpdateState> voiceUpdateStates = workBufferAllocator.Allocate<VoiceUpdateState>(parameter.VoiceCount, VoiceUpdateState.Align);
 
-            if (voiceStates.IsEmpty)
+            if (voiceUpdateStates.IsEmpty)
             {
                 return ResultCode.WorkBufferTooSmall;
             }
 
             uint mixesCount = parameter.SubMixBufferCount + 1;
 
-            Memory<MixInfo> mixes = workBufferAllocator.Allocate<MixInfo>(mixesCount, MixInfo.Alignment);
+            Memory<MixState> mixes = workBufferAllocator.Allocate<MixState>(mixesCount, MixState.Alignment);
 
             if (mixes.IsEmpty)
             {
@@ -251,18 +251,18 @@ namespace Ryujinx.Audio.Renderer.Server
 
             if (parameter.EffectCount == 0)
             {
-                foreach (ref MixInfo mix in mixes.Span)
+                foreach (ref MixState mix in mixes.Span)
                 {
-                    mix = new MixInfo(Memory<int>.Empty, ref _behaviourInfo);
+                    mix = new MixState(Memory<int>.Empty, ref _behaviourContext);
                 }
             }
             else
             {
                 Memory<int> effectProcessingOrderArray = workBufferAllocator.Allocate<int>(parameter.EffectCount * mixesCount, 0x10);
 
-                foreach (ref MixInfo mix in mixes.Span)
+                foreach (ref MixState mix in mixes.Span)
                 {
-                    mix = new MixInfo(effectProcessingOrderArray[..(int)parameter.EffectCount], ref _behaviourInfo);
+                    mix = new MixState(effectProcessingOrderArray[..(int)parameter.EffectCount], ref _behaviourContext);
 
                     effectProcessingOrderArray = effectProcessingOrderArray[(int)parameter.EffectCount..];
                 }
@@ -271,20 +271,20 @@ namespace Ryujinx.Audio.Renderer.Server
             // Initialize the final mix id
             mixes.Span[0].MixId = Constants.FinalMixId;
 
-            Memory<int> sortedMixesInfo = workBufferAllocator.Allocate<int>(mixesCount, 0x10);
+            Memory<int> sortedMixesState = workBufferAllocator.Allocate<int>(mixesCount, 0x10);
 
-            if (sortedMixesInfo.IsEmpty)
+            if (sortedMixesState.IsEmpty)
             {
                 return ResultCode.WorkBufferTooSmall;
             }
 
             // Clear memory (use -1 as it's an invalid index)
-            sortedMixesInfo.Span.Fill(-1);
+            sortedMixesState.Span.Fill(-1);
 
             Memory<byte> nodeStatesWorkBuffer = Memory<byte>.Empty;
             Memory<byte> edgeMatrixWorkBuffer = Memory<byte>.Empty;
 
-            if (_behaviourInfo.IsSplitterSupported())
+            if (_behaviourContext.IsSplitterSupported())
             {
                 nodeStatesWorkBuffer = workBufferAllocator.Allocate((uint)NodeStates.GetWorkBufferSize((int)mixesCount), 1);
                 edgeMatrixWorkBuffer = workBufferAllocator.Allocate((uint)EdgeMatrix.GetWorkBufferSize((int)mixesCount), 1);
@@ -295,21 +295,21 @@ namespace Ryujinx.Audio.Renderer.Server
                 }
             }
 
-            _mixContext.Initialize(sortedMixesInfo, mixes, nodeStatesWorkBuffer, edgeMatrixWorkBuffer);
+            _mixContext.Initialize(sortedMixesState, mixes, nodeStatesWorkBuffer, edgeMatrixWorkBuffer);
 
-            _memoryPools = workBufferAllocator.Allocate<MemoryPoolInfo>(_memoryPoolCount, MemoryPoolInfo.Alignment);
+            _memoryPools = workBufferAllocator.Allocate<MemoryPoolState>(_memoryPoolCount, MemoryPoolState.Alignment);
 
             if (_memoryPools.IsEmpty)
             {
                 return ResultCode.WorkBufferTooSmall;
             }
 
-            foreach (ref MemoryPoolInfo info in _memoryPools.Span)
+            foreach (ref MemoryPoolState state in _memoryPools.Span)
             {
-                info = MemoryPoolInfo.Create(MemoryPoolInfo.LocationType.Cpu);
+                state = MemoryPoolState.Create(MemoryPoolState.LocationType.Cpu);
             }
 
-            if (!_splitterContext.Initialize(ref _behaviourInfo, ref parameter, workBufferAllocator, splitterBqfStates))
+            if (!_splitterContext.Initialize(ref _behaviourContext, ref parameter, workBufferAllocator, splitterBqfStates))
             {
                 return ResultCode.WorkBufferTooSmall;
             }
@@ -318,21 +318,21 @@ namespace Ryujinx.Audio.Renderer.Server
 
             _upsamplerManager = new UpsamplerManager(upSamplerWorkBuffer, _upsamplerCount);
 
-            _effectContext.Initialize(parameter.EffectCount, _behaviourInfo.IsEffectInfoVersion2Supported() ? parameter.EffectCount : 0);
+            _effectContext.Initialize(parameter.EffectCount, _behaviourContext.IsEffectInfoVersion2Supported() ? parameter.EffectCount : 0);
             _sinkContext.Initialize(parameter.SinkCount);
 
-            Memory<VoiceState> voiceStatesDsp = workBufferAllocator.Allocate<VoiceState>(parameter.VoiceCount, VoiceState.Align);
+            Memory<VoiceUpdateState> voiceUpdateStatesDsp = workBufferAllocator.Allocate<VoiceUpdateState>(parameter.VoiceCount, VoiceUpdateState.Align);
 
-            if (voiceStatesDsp.IsEmpty)
+            if (voiceUpdateStatesDsp.IsEmpty)
             {
                 return ResultCode.WorkBufferTooSmall;
             }
 
-            _voiceContext.Initialize(sortedVoices, voices, voiceChannelResources, voiceStates, voiceStatesDsp, parameter.VoiceCount);
+            _voiceContext.Initialize(sortedVoices, voices, voiceChannelResources, voiceUpdateStates, voiceUpdateStatesDsp, parameter.VoiceCount);
 
             if (parameter.PerformanceMetricFramesCount > 0)
             {
-                ulong performanceBufferSize = PerformanceManager.GetRequiredBufferSizeForPerformanceMetricsPerFrame(ref parameter, ref _behaviourInfo) * (parameter.PerformanceMetricFramesCount + 1) + 0xC;
+                ulong performanceBufferSize = PerformanceManager.GetRequiredBufferSizeForPerformanceMetricsPerFrame(ref parameter, ref _behaviourContext) * (parameter.PerformanceMetricFramesCount + 1) + 0xC;
 
                 _performanceBuffer = workBufferAllocator.Allocate(performanceBufferSize, Constants.BufferAlignment);
 
@@ -341,7 +341,7 @@ namespace Ryujinx.Audio.Renderer.Server
                     return ResultCode.WorkBufferTooSmall;
                 }
 
-                _performanceManager = PerformanceManager.Create(_performanceBuffer, ref parameter, _behaviourInfo);
+                _performanceManager = PerformanceManager.Create(_performanceBuffer, ref parameter, _behaviourContext);
             }
             else
             {
@@ -359,14 +359,14 @@ namespace Ryujinx.Audio.Renderer.Server
             _elapsedFrameCount = 0;
             _voiceDropParameter = 1.0f;
 
-            _commandProcessingTimeEstimator = _behaviourInfo.GetCommandProcessingTimeEstimatorVersion() switch
+            _commandProcessingTimeEstimator = _behaviourContext.GetCommandProcessingTimeEstimatorVersion() switch
             {
                 1 => new CommandProcessingTimeEstimatorVersion1(_sampleCount, _mixBufferCount),
                 2 => new CommandProcessingTimeEstimatorVersion2(_sampleCount, _mixBufferCount),
                 3 => new CommandProcessingTimeEstimatorVersion3(_sampleCount, _mixBufferCount),
                 4 => new CommandProcessingTimeEstimatorVersion4(_sampleCount, _mixBufferCount),
                 5 => new CommandProcessingTimeEstimatorVersion5(_sampleCount, _mixBufferCount),
-                _ => throw new NotImplementedException($"Unsupported processing time estimator version {_behaviourInfo.GetCommandProcessingTimeEstimatorVersion()}."),
+                _ => throw new NotImplementedException($"Unsupported processing time estimator version {_behaviourContext.GetCommandProcessingTimeEstimatorVersion()}."),
             };
 
             return ResultCode.Success;
@@ -411,11 +411,11 @@ namespace Ryujinx.Audio.Renderer.Server
 
                 output.Span.Clear();
 
-                StateUpdater stateUpdater = new(input, output, _processHandle, _behaviourInfo);
+                StateUpdater stateUpdater = new(input, output, _processHandle, _behaviourContext);
 
                 ResultCode result;
 
-                result = stateUpdater.UpdateBehaviourInfo();
+                result = stateUpdater.UpdateBehaviourContext();
 
                 if (result != ResultCode.Success)
                 {
@@ -436,16 +436,9 @@ namespace Ryujinx.Audio.Renderer.Server
                     return result;
                 }
 
-                PoolMapper poolMapper = new(_processHandle, _memoryPools, _behaviourInfo.IsMemoryPoolForceMappingEnabled());
+                PoolMapper poolMapper = new(_processHandle, _memoryPools, _behaviourContext.IsMemoryPoolForceMappingEnabled());
 
-                if (_behaviourInfo.IsBiquadFilterParameterFloatSupported())
+                result = stateUpdater.UpdateVoices(_voiceContext, poolMapper);
-                {
-                    result = stateUpdater.UpdateVoices2(_voiceContext, poolMapper);
-                }
-                else
-                {
-                    result = stateUpdater.UpdateVoices1(_voiceContext, poolMapper);
-                }
 
                 if (result != ResultCode.Success)
                 {
@@ -459,7 +452,7 @@ namespace Ryujinx.Audio.Renderer.Server
                     return result;
                 }
 
-                if (_behaviourInfo.IsSplitterSupported())
+                if (_behaviourContext.IsSplitterSupported())
                 {
                     result = stateUpdater.UpdateSplitter(_splitterContext);
 
@@ -497,7 +490,7 @@ namespace Ryujinx.Audio.Renderer.Server
                     return result;
                 }
 
-                if (_behaviourInfo.IsElapsedFrameCountSupported())
+                if (_behaviourContext.IsElapsedFrameCountSupported())
                 {
                     result = stateUpdater.UpdateRendererInfo(_elapsedFrameCount);
 
@@ -564,7 +557,7 @@ namespace Ryujinx.Audio.Renderer.Server
                     break;
                 }
 
-                ref VoiceInfo voice = ref _voiceContext.GetState(NodeIdHelper.GetBase(targetNodeId));
+                ref VoiceState voice = ref _voiceContext.GetState(NodeIdHelper.GetBase(targetNodeId));
 
                 if (voice.Priority == Constants.VoiceHighestPriority)
                 {
@@ -653,7 +646,7 @@ namespace Ryujinx.Audio.Renderer.Server
 
             _voiceContext.UpdateForCommandGeneration();
 
-            if (_behaviourInfo.IsEffectInfoVersion2Supported())
+            if (_behaviourContext.IsEffectInfoVersion2Supported())
             {
                 _effectContext.UpdateResultStateForCommandGeneration();
             }
@@ -668,7 +661,7 @@ namespace Ryujinx.Audio.Renderer.Server
 
         private int GetMaxAllocatedTimeForDsp()
         {
-            return (int)(Constants.AudioProcessorMaxUpdateTimePerSessions * _behaviourInfo.GetAudioRendererProcessingTimeLimit() * (GetRenderingTimeLimit() / 100.0f));
+            return (int)(Constants.AudioProcessorMaxUpdateTimePerSessions * _behaviourContext.GetAudioRendererProcessingTimeLimit() * (GetRenderingTimeLimit() / 100.0f));
         }
 
         public void SendCommands()
@@ -743,7 +736,7 @@ namespace Ryujinx.Audio.Renderer.Server
             return new RendererSystemContext
             {
                 ChannelCount = _manager.Processor.OutputDevices[_sessionId].GetChannelCount(),
-                BehaviourInfo = _behaviourInfo,
+                BehaviourContext = _behaviourContext,
                 DepopBuffer = _depopBuffer,
                 MixBufferCount = GetMixBufferCount(),
                 SessionId = _sessionId,
@@ -758,9 +751,9 @@ namespace Ryujinx.Audio.Renderer.Server
 
         public static ulong GetWorkBufferSize(ref AudioRendererConfiguration parameter)
         {
-            BehaviourInfo behaviourInfo = new();
+            BehaviourContext behaviourContext = new();
 
-            behaviourInfo.SetUserRevision(parameter.Revision);
+            behaviourContext.SetUserRevision(parameter.Revision);
 
             uint mixesCount = parameter.SubMixBufferCount + 1;
 
@@ -778,28 +771,28 @@ namespace Ryujinx.Audio.Renderer.Server
             size = WorkBufferAllocator.GetTargetSize<float>(size, BitUtils.AlignUp<ulong>(parameter.MixBufferCount, Constants.BufferAlignment), Constants.BufferAlignment);
 
             // Voice
-            size = WorkBufferAllocator.GetTargetSize<VoiceInfo>(size, parameter.VoiceCount, VoiceInfo.Alignment);
+            size = WorkBufferAllocator.GetTargetSize<VoiceState>(size, parameter.VoiceCount, VoiceState.Alignment);
             size = WorkBufferAllocator.GetTargetSize<int>(size, parameter.VoiceCount, 0x10);
             size = WorkBufferAllocator.GetTargetSize<VoiceChannelResource>(size, parameter.VoiceCount, VoiceChannelResource.Alignment);
-            size = WorkBufferAllocator.GetTargetSize<VoiceState>(size, parameter.VoiceCount, VoiceState.Align);
+            size = WorkBufferAllocator.GetTargetSize<VoiceUpdateState>(size, parameter.VoiceCount, VoiceUpdateState.Align);
 
             // Mix
-            size = WorkBufferAllocator.GetTargetSize<MixInfo>(size, mixesCount, MixInfo.Alignment);
+            size = WorkBufferAllocator.GetTargetSize<MixState>(size, mixesCount, MixState.Alignment);
             size = WorkBufferAllocator.GetTargetSize<int>(size, parameter.EffectCount * mixesCount, 0x10);
             size = WorkBufferAllocator.GetTargetSize<int>(size, mixesCount, 0x10);
 
-            if (behaviourInfo.IsSplitterSupported())
+            if (behaviourContext.IsSplitterSupported())
             {
                 size += (ulong)BitUtils.AlignUp(NodeStates.GetWorkBufferSize((int)mixesCount) + EdgeMatrix.GetWorkBufferSize((int)mixesCount), 0x10);
             }
 
             // Memory Pool
-            size = WorkBufferAllocator.GetTargetSize<MemoryPoolInfo>(size, memoryPoolCount, MemoryPoolInfo.Alignment);
+            size = WorkBufferAllocator.GetTargetSize<MemoryPoolState>(size, memoryPoolCount, MemoryPoolState.Alignment);
 
             // Splitter
-            size = SplitterContext.GetWorkBufferSize(size, ref behaviourInfo, ref parameter);
+            size = SplitterContext.GetWorkBufferSize(size, ref behaviourContext, ref parameter);
 
-            if (behaviourInfo.IsBiquadFilterParameterForSplitterEnabled() &&
+            if (behaviourContext.IsBiquadFilterParameterForSplitterEnabled() &&
                 parameter.SplitterCount > 0 &&
                 parameter.SplitterDestinationCount > 0)
             {
@@ -807,12 +800,12 @@ namespace Ryujinx.Audio.Renderer.Server
             }
 
             // DSP Voice
-            size = WorkBufferAllocator.GetTargetSize<VoiceState>(size, parameter.VoiceCount, VoiceState.Align);
+            size = WorkBufferAllocator.GetTargetSize<VoiceUpdateState>(size, parameter.VoiceCount, VoiceUpdateState.Align);
 
             // Performance
             if (parameter.PerformanceMetricFramesCount > 0)
             {
-                ulong performanceMetricsPerFramesSize = PerformanceManager.GetRequiredBufferSizeForPerformanceMetricsPerFrame(ref parameter, ref behaviourInfo) * (parameter.PerformanceMetricFramesCount + 1) + 0xC;
+                ulong performanceMetricsPerFramesSize = PerformanceManager.GetRequiredBufferSizeForPerformanceMetricsPerFrame(ref parameter, ref behaviourContext) * (parameter.PerformanceMetricFramesCount + 1) + 0xC;
 
                 size += BitUtils.AlignUp<ulong>(performanceMetricsPerFramesSize, Constants.PerformanceMetricsPerFramesSizeAlignment);
             }
@@ -854,13 +847,13 @@ namespace Ryujinx.Audio.Renderer.Server
                 }
 
                 PoolMapper mapper = new(_processHandle, false);
-                mapper.Unmap(ref _dspMemoryPoolInfo);
+                mapper.Unmap(ref _dspMemoryPoolState);
 
                 PoolMapper.ClearUsageState(_memoryPools);
 
                 for (int i = 0; i < _memoryPoolCount; i++)
                 {
-                    ref MemoryPoolInfo memoryPool = ref _memoryPools.Span[i];
+                    ref MemoryPoolState memoryPool = ref _memoryPools.Span[i];
 
                     if (memoryPool.IsMapped())
                     {
@@ -882,7 +875,7 @@ namespace Ryujinx.Audio.Renderer.Server
 
         public void SetVoiceDropParameter(float voiceDropParameter)
         {
-            _voiceDropParameter = Math.Clamp(voiceDropParameter, 0.0f, 4.0f);
+            _voiceDropParameter = Math.Clamp(voiceDropParameter, 0.0f, 2.0f);
         }
 
         public float GetVoiceDropParameter()

src/Ryujinx.Audio/Renderer/Server/BehaviourContext.cs

@@ -1,5 +1,3 @@
-using Ryujinx.Audio.Renderer.Parameter;
-using Ryujinx.Common.Memory;
 using System;
 using System.Buffers;
 using System.Diagnostics;
@@ -11,7 +9,7 @@ namespace Ryujinx.Audio.Renderer.Server
     /// Behaviour context.
     /// </summary>
     /// <remarks>This handles features based on the audio renderer revision provided by the user.</remarks>
-    public class BehaviourInfo
+    public class BehaviourContext
     {
         /// <summary>
         /// The base magic of the Audio Renderer revision.
@@ -42,7 +40,7 @@ namespace Ryujinx.Audio.Renderer.Server
         public const int Revision4 = 4 << 24;
 
         /// <summary>
-        /// REV5: <see cref="VoiceInParameter1.DecodingBehaviour"/>, <see cref="VoiceInParameter1.FlushWaveBufferCount"/> were added to voice.
+        /// REV5: <see cref="Parameter.VoiceInParameter.DecodingBehaviour"/>, <see cref="Parameter.VoiceInParameter.FlushWaveBufferCount"/> were added to voice.
         /// A new performance frame format (version 2) was added with support for more information about DSP timing.
         /// <see cref="Parameter.RendererInfoOutStatus"/> was added to supply the count of update done sent to the DSP.
         /// A new version of the command estimator was added to address timing changes caused by the voice changes.
@@ -66,7 +64,7 @@ namespace Ryujinx.Audio.Renderer.Server
         /// <summary>
         /// REV8:
         /// Wavebuffer was changed to support more control over loop (you can now specify where to start and end a loop, and how many times to loop).
-        /// <see cref="VoiceInParameter1.SrcQuality"/> was added (see <see cref="VoiceInParameter1.SampleRateConversionQuality"/> for more info).
+        /// <see cref="Parameter.VoiceInParameter.SrcQuality"/> was added (see <see cref="Parameter.VoiceInParameter.SampleRateConversionQuality"/> for more info).
         /// Final leftovers of the codec system were removed.
         /// <see cref="Common.SampleFormat.PcmFloat"/> support was added.
         /// A new version of the command estimator was added to address timing changes caused by the voice and command changes.
@@ -118,26 +116,15 @@ namespace Ryujinx.Audio.Renderer.Server
         /// <remarks>This was added in system update 18.0.0</remarks>
         public const int Revision13 = 13 << 24;
 
-        /// <summary>
-        /// REV14:
-        /// Fixes the Depop Bug.
-        /// 
-        /// </summary>
-        /// <remarks>This was added in system update 19.0.0 </remarks>
-        public const int Revision14 = 14 << 24;
-        
-        /// <summary>
-        /// REV15:
-        /// Support for float coefficients in biquad filters
-        /// 
-        /// </summary>
-        /// <remarks>This was added in system update 19.0.0 </remarks>
-        public const int Revision15 = 15 << 24;
-
         /// <summary>
         /// Last revision supported by the implementation.
         /// </summary>
-        public const int LastRevision = Revision15;
+        public const int LastRevision = Revision13;
+
+        /// <summary>
+        /// Target revision magic supported by the implementation.
+        /// </summary>
+        public const int ProcessRevision = BaseRevisionMagic + LastRevision;
 
         /// <summary>
         /// Get the revision number from the revision magic.
@@ -146,25 +133,15 @@ namespace Ryujinx.Audio.Renderer.Server
         /// <returns>The revision number.</returns>
         public static int GetRevisionNumber(int revision) => (revision - BaseRevisionMagic) >> 24;
 
-        /// <summary>
-        /// Target revision magic supported by the implementation.
-        /// </summary>
-        public const int ProcessRevision = BaseRevisionMagic + LastRevision;
-        
         /// <summary>
         /// Current active revision.
         /// </summary>
         public int UserRevision { get; private set; }
 
-        /// <summary>
-        /// Current flags of the <see cref="BehaviourInfo"/>.
-        /// </summary>
-        private ulong _flags;
-
         /// <summary>
         /// Error storage.
         /// </summary>
-        private readonly Array10<ErrorInfo> _errorInfos;
+        private readonly ErrorInfo[] _errorInfos;
 
         /// <summary>
         /// Current position in the <see cref="_errorInfos"/> array.
@@ -172,12 +149,17 @@ namespace Ryujinx.Audio.Renderer.Server
         private uint _errorIndex;
 
         /// <summary>
-        /// Create a new instance of <see cref="BehaviourInfo"/>.
+        /// Current flags of the <see cref="BehaviourContext"/>.
         /// </summary>
-        public BehaviourInfo()
+        private ulong _flags;
+
+        /// <summary>
+        /// Create a new instance of <see cref="BehaviourContext"/>.
+        /// </summary>
+        public BehaviourContext()
         {
             UserRevision = 0;
-            _errorInfos = new Array10<ErrorInfo>();
+            _errorInfos = new ErrorInfo[Constants.MaxErrorInfos];
             _errorIndex = 0;
         }
 
@@ -191,7 +173,7 @@ namespace Ryujinx.Audio.Renderer.Server
         }
 
         /// <summary>
-        /// Update flags of the <see cref="BehaviourInfo"/>.
+        /// Update flags of the <see cref="BehaviourContext"/>.
         /// </summary>
         /// <param name="flags">The new flags.</param>
         public void UpdateFlags(ulong flags)
@@ -339,9 +321,9 @@ namespace Ryujinx.Audio.Renderer.Server
         }
 
         /// <summary>
-        /// Check if the audio renderer should support <see cref="VoiceInParameter1.DecodingBehaviour"/>.
+        /// Check if the audio renderer should support <see cref="Parameter.VoiceInParameter.DecodingBehaviour"/>.
         /// </summary>
-        /// <returns>True if the audio renderer should support <see cref="VoiceInParameter1.DecodingBehaviour"/>.</returns>
+        /// <returns>True if the audio renderer should support <see cref="Parameter.VoiceInParameter.DecodingBehaviour"/>.</returns>
         public bool IsDecodingBehaviourFlagSupported()
         {
             return CheckFeatureSupported(UserRevision, BaseRevisionMagic + Revision5);
@@ -419,24 +401,6 @@ namespace Ryujinx.Audio.Renderer.Server
             return CheckFeatureSupported(UserRevision, BaseRevisionMagic + Revision13);
         }
 
-        /// <summary>
-        /// Check if the audio renderer should support the depop bug fix.
-        /// </summary>
-        /// <returns>True if the audio renderer supports the depop bug fix</returns>
-        public bool IsSplitterDepopBugFixEnabled()
-        {
-            return CheckFeatureSupported(UserRevision, BaseRevisionMagic + Revision14);
-        }
-        
-        /// <summary>
-        /// Check if the audio renderer should support biquad filter with float coefficients.
-        /// </summary>
-        /// <returns>True if the audio renderer support biquad filter with float coefficients</returns>
-        public bool IsBiquadFilterParameterFloatSupported()
-        {
-            return CheckFeatureSupported(UserRevision, BaseRevisionMagic + Revision15);
-        }
-
         /// <summary>
         /// Get the version of the <see cref="ICommandProcessingTimeEstimator"/>.
         /// </summary>
@@ -476,7 +440,7 @@ namespace Ryujinx.Audio.Renderer.Server
 
             if (_errorIndex <= Constants.MaxErrorInfos - 1)
             {
-                _errorInfos[(int)_errorIndex++] = errorInfo;
+                _errorInfos[_errorIndex++] = errorInfo;
             }
         }
 
@@ -494,7 +458,21 @@ namespace Ryujinx.Audio.Renderer.Server
 
             errorCount = Math.Min(_errorIndex, Constants.MaxErrorInfos);
 
-            _errorInfos.AsSpan().CopyTo(errorInfos);
+            for (int i = 0; i < Constants.MaxErrorInfos; i++)
+            {
+                if (i < errorCount)
+                {
+                    errorInfos[i] = _errorInfos[i];
+                }
+                else
+                {
+                    errorInfos[i] = new ErrorInfo
+                    {
+                        ErrorCode = 0,
+                        ExtraErrorInfo = 0,
+                    };
+                }
+            }
         }
 
         /// <summary>

src/Ryujinx.Audio/Renderer/Server/CommandBuffer.cs

@@ -5,11 +5,9 @@ using Ryujinx.Audio.Renderer.Parameter;
 using Ryujinx.Audio.Renderer.Parameter.Effect;
 using Ryujinx.Audio.Renderer.Server.Performance;
 using Ryujinx.Audio.Renderer.Server.Sink;
-using Ryujinx.Audio.Renderer.Server.Splitter;
 using Ryujinx.Audio.Renderer.Server.Upsampler;
 using Ryujinx.Audio.Renderer.Server.Voice;
 using System;
-using System.Runtime.CompilerServices;
 using CpuAddress = System.UInt64;
 
 namespace Ryujinx.Audio.Renderer.Server
@@ -79,7 +77,7 @@ namespace Ryujinx.Audio.Renderer.Server
         /// <param name="bufferOffset">The target buffer offset.</param>
         /// <param name="nodeId">The node id associated to this command.</param>
         /// <param name="wasPlaying">Set to true if the voice was playing previously.</param>
-        public void GenerateDepopPrepare(Memory<VoiceState> state, Memory<float> depopBuffer, uint bufferCount, uint bufferOffset, int nodeId, bool wasPlaying)
+        public void GenerateDepopPrepare(Memory<VoiceUpdateState> state, Memory<float> depopBuffer, uint bufferCount, uint bufferOffset, int nodeId, bool wasPlaying)
         {
             DepopPrepareCommand command = new(state, depopBuffer, bufferCount, bufferOffset, nodeId, wasPlaying);
 
@@ -122,14 +120,14 @@ namespace Ryujinx.Audio.Renderer.Server
         /// <summary>
         /// Create a new <see cref="DataSourceVersion2Command"/>.
         /// </summary>
-        /// <param name="voiceInfo">The <see cref="VoiceInfo"/> to generate the command from.</param>
+        /// <param name="voiceState">The <see cref="VoiceState"/> to generate the command from.</param>
-        /// <param name="state">The <see cref="VoiceState"/> to generate the command from.</param>
+        /// <param name="state">The <see cref="VoiceUpdateState"/> to generate the command from.</param>
         /// <param name="outputBufferIndex">The output buffer index to use.</param>
         /// <param name="channelIndex">The target channel index.</param>
         /// <param name="nodeId">The node id associated to this command.</param>
-        public void GenerateDataSourceVersion2(ref VoiceInfo voiceInfo, Memory<VoiceState> state, ushort outputBufferIndex, ushort channelIndex, int nodeId)
+        public void GenerateDataSourceVersion2(ref VoiceState voiceState, Memory<VoiceUpdateState> state, ushort outputBufferIndex, ushort channelIndex, int nodeId)
         {
-            DataSourceVersion2Command command = new(ref voiceInfo, state, outputBufferIndex, channelIndex, nodeId);
+            DataSourceVersion2Command command = new(ref voiceState, state, outputBufferIndex, channelIndex, nodeId);
 
             command.EstimatedProcessingTime = _commandProcessingTimeEstimator.Estimate(command);
 
@@ -139,14 +137,14 @@ namespace Ryujinx.Audio.Renderer.Server
         /// <summary>
         /// Create a new <see cref="PcmInt16DataSourceCommandVersion1"/>.
         /// </summary>
-        /// <param name="voiceInfo">The <see cref="VoiceInfo"/> to generate the command from.</param>
+        /// <param name="voiceState">The <see cref="VoiceState"/> to generate the command from.</param>
-        /// <param name="state">The <see cref="VoiceState"/> to generate the command from.</param>
+        /// <param name="state">The <see cref="VoiceUpdateState"/> to generate the command from.</param>
         /// <param name="outputBufferIndex">The output buffer index to use.</param>
         /// <param name="channelIndex">The target channel index.</param>
         /// <param name="nodeId">The node id associated to this command.</param>
-        public void GeneratePcmInt16DataSourceVersion1(ref VoiceInfo voiceInfo, Memory<VoiceState> state, ushort outputBufferIndex, ushort channelIndex, int nodeId)
+        public void GeneratePcmInt16DataSourceVersion1(ref VoiceState voiceState, Memory<VoiceUpdateState> state, ushort outputBufferIndex, ushort channelIndex, int nodeId)
         {
-            PcmInt16DataSourceCommandVersion1 command = new(ref voiceInfo, state, outputBufferIndex, channelIndex, nodeId);
+            PcmInt16DataSourceCommandVersion1 command = new(ref voiceState, state, outputBufferIndex, channelIndex, nodeId);
 
             command.EstimatedProcessingTime = _commandProcessingTimeEstimator.Estimate(command);
 
@@ -156,14 +154,14 @@ namespace Ryujinx.Audio.Renderer.Server
         /// <summary>
         /// Create a new <see cref="PcmFloatDataSourceCommandVersion1"/>.
         /// </summary>
-        /// <param name="voiceInfo">The <see cref="VoiceInfo"/> to generate the command from.</param>
+        /// <param name="voiceState">The <see cref="VoiceState"/> to generate the command from.</param>
-        /// <param name="state">The <see cref="VoiceState"/> to generate the command from.</param>
+        /// <param name="state">The <see cref="VoiceUpdateState"/> to generate the command from.</param>
         /// <param name="outputBufferIndex">The output buffer index to use.</param>
         /// <param name="channelIndex">The target channel index.</param>
         /// <param name="nodeId">The node id associated to this command.</param>
-        public void GeneratePcmFloatDataSourceVersion1(ref VoiceInfo voiceInfo, Memory<VoiceState> state, ushort outputBufferIndex, ushort channelIndex, int nodeId)
+        public void GeneratePcmFloatDataSourceVersion1(ref VoiceState voiceState, Memory<VoiceUpdateState> state, ushort outputBufferIndex, ushort channelIndex, int nodeId)
         {
-            PcmFloatDataSourceCommandVersion1 command = new(ref voiceInfo, state, outputBufferIndex, channelIndex, nodeId);
+            PcmFloatDataSourceCommandVersion1 command = new(ref voiceState, state, outputBufferIndex, channelIndex, nodeId);
 
             command.EstimatedProcessingTime = _commandProcessingTimeEstimator.Estimate(command);
 
@@ -173,13 +171,13 @@ namespace Ryujinx.Audio.Renderer.Server
         /// <summary>
         /// Create a new <see cref="AdpcmDataSourceCommandVersion1"/>.
         /// </summary>
-        /// <param name="voiceInfo">The <see cref="VoiceInfo"/> to generate the command from.</param>
+        /// <param name="voiceState">The <see cref="VoiceState"/> to generate the command from.</param>
-        /// <param name="state">The <see cref="VoiceState"/> to generate the command from.</param>
+        /// <param name="state">The <see cref="VoiceUpdateState"/> to generate the command from.</param>
         /// <param name="outputBufferIndex">The output buffer index to use.</param>
         /// <param name="nodeId">The node id associated to this command.</param>
-        public void GenerateAdpcmDataSourceVersion1(ref VoiceInfo voiceInfo, Memory<VoiceState> state, ushort outputBufferIndex, int nodeId)
+        public void GenerateAdpcmDataSourceVersion1(ref VoiceState voiceState, Memory<VoiceUpdateState> state, ushort outputBufferIndex, int nodeId)
         {
-            AdpcmDataSourceCommandVersion1 command = new(ref voiceInfo, state, outputBufferIndex, nodeId);
+            AdpcmDataSourceCommandVersion1 command = new(ref voiceState, state, outputBufferIndex, nodeId);
 
             command.EstimatedProcessingTime = _commandProcessingTimeEstimator.Estimate(command);
 
@@ -196,7 +194,7 @@ namespace Ryujinx.Audio.Renderer.Server
         /// <param name="outputBufferOffset">The output buffer offset.</param>
         /// <param name="needInitialization">Set to true if the biquad filter state needs to be initialized.</param>
         /// <param name="nodeId">The node id associated to this command.</param>
-        public void GenerateBiquadFilter(int baseIndex, ref BiquadFilterParameter2 filter, Memory<BiquadFilterState> biquadFilterStateMemory, int inputBufferOffset, int outputBufferOffset, bool needInitialization, int nodeId)
+        public void GenerateBiquadFilter(int baseIndex, ref BiquadFilterParameter filter, Memory<BiquadFilterState> biquadFilterStateMemory, int inputBufferOffset, int outputBufferOffset, bool needInitialization, int nodeId)
         {
             BiquadFilterCommand command = new(baseIndex, ref filter, biquadFilterStateMemory, inputBufferOffset, outputBufferOffset, needInitialization, nodeId);
 
@@ -215,7 +213,7 @@ namespace Ryujinx.Audio.Renderer.Server
         /// <param name="outputBufferOffset">The output buffer offset.</param>
         /// <param name="isInitialized">Set to true if the biquad filter state is initialized.</param>
         /// <param name="nodeId">The node id associated to this command.</param>
-        public void GenerateMultiTapBiquadFilter(int baseIndex, ReadOnlySpan<BiquadFilterParameter2> filters, Memory<BiquadFilterState> biquadFilterStatesMemory, int inputBufferOffset, int outputBufferOffset, ReadOnlySpan<bool> isInitialized, int nodeId)
+        public void GenerateMultiTapBiquadFilter(int baseIndex, ReadOnlySpan<BiquadFilterParameter> filters, Memory<BiquadFilterState> biquadFilterStatesMemory, int inputBufferOffset, int outputBufferOffset, ReadOnlySpan<bool> isInitialized, int nodeId)
         {
             MultiTapBiquadFilterCommand command = new(baseIndex, filters, biquadFilterStatesMemory, inputBufferOffset, outputBufferOffset, isInitialized, nodeId);
 
@@ -232,9 +230,9 @@ namespace Ryujinx.Audio.Renderer.Server
         /// <param name="outputBufferIndex">The base output index.</param>
         /// <param name="previousVolume">The previous volume.</param>
         /// <param name="volume">The new volume.</param>
-        /// <param name="state">The <see cref="VoiceState"/> to generate the command from.</param>
+        /// <param name="state">The <see cref="VoiceUpdateState"/> to generate the command from.</param>
         /// <param name="nodeId">The node id associated to this command.</param>
-        public void GenerateMixRampGrouped(uint mixBufferCount, uint inputBufferIndex, uint outputBufferIndex, ReadOnlySpan<float> previousVolume, ReadOnlySpan<float> volume, Memory<VoiceState> state, int nodeId)
+        public void GenerateMixRampGrouped(uint mixBufferCount, uint inputBufferIndex, uint outputBufferIndex, ReadOnlySpan<float> previousVolume, ReadOnlySpan<float> volume, Memory<VoiceUpdateState> state, int nodeId)
         {
             MixRampGroupedCommand command = new(mixBufferCount, inputBufferIndex, outputBufferIndex, previousVolume, volume, state, nodeId);
 
@@ -250,10 +248,10 @@ namespace Ryujinx.Audio.Renderer.Server
         /// <param name="volume">The new volume.</param>
         /// <param name="inputBufferIndex">The input buffer index.</param>
         /// <param name="outputBufferIndex">The output buffer index.</param>
-        /// <param name="lastSampleIndex">The index in the <see cref="VoiceState.LastSamples"/> array to store the ramped sample.</param>
+        /// <param name="lastSampleIndex">The index in the <see cref="VoiceUpdateState.LastSamples"/> array to store the ramped sample.</param>
-        /// <param name="state">The <see cref="VoiceState"/> to generate the command from.</param>
+        /// <param name="state">The <see cref="VoiceUpdateState"/> to generate the command from.</param>
         /// <param name="nodeId">The node id associated to this command.</param>
-        public void GenerateMixRamp(float previousVolume, float volume, uint inputBufferIndex, uint outputBufferIndex, int lastSampleIndex, Memory<VoiceState> state, int nodeId)
+        public void GenerateMixRamp(float previousVolume, float volume, uint inputBufferIndex, uint outputBufferIndex, int lastSampleIndex, Memory<VoiceUpdateState> state, int nodeId)
         {
             MixRampCommand command = new(previousVolume, volume, inputBufferIndex, outputBufferIndex, lastSampleIndex, state, nodeId);
 
@@ -269,8 +267,8 @@ namespace Ryujinx.Audio.Renderer.Server
         /// <param name="volume">The new volume.</param>
         /// <param name="inputBufferIndex">The input buffer index.</param>
         /// <param name="outputBufferIndex">The output buffer index.</param>
-        /// <param name="lastSampleIndex">The index in the <see cref="VoiceState.LastSamples"/> array to store the ramped sample.</param>
+        /// <param name="lastSampleIndex">The index in the <see cref="VoiceUpdateState.LastSamples"/> array to store the ramped sample.</param>
-        /// <param name="state">The <see cref="VoiceState"/> to generate the command from.</param>
+        /// <param name="state">The <see cref="VoiceUpdateState"/> to generate the command from.</param>
         /// <param name="filter">The biquad filter parameter.</param>
         /// <param name="biquadFilterState">The biquad state.</param>
         /// <param name="previousBiquadFilterState">The previous biquad state.</param>
@@ -284,8 +282,8 @@ namespace Ryujinx.Audio.Renderer.Server
             uint inputBufferIndex,
             uint outputBufferIndex,
             int lastSampleIndex,
-            Memory<VoiceState> state,
+            Memory<VoiceUpdateState> state,
-            ref BiquadFilterParameter2 filter,
+            ref BiquadFilterParameter filter,
             Memory<BiquadFilterState> biquadFilterState,
             Memory<BiquadFilterState> previousBiquadFilterState,
             bool needInitialization,
@@ -320,8 +318,8 @@ namespace Ryujinx.Audio.Renderer.Server
         /// <param name="volume">The new volume.</param>
         /// <param name="inputBufferIndex">The input buffer index.</param>
         /// <param name="outputBufferIndex">The output buffer index.</param>
-        /// <param name="lastSampleIndex">The index in the <see cref="VoiceState.LastSamples"/> array to store the ramped sample.</param>
+        /// <param name="lastSampleIndex">The index in the <see cref="VoiceUpdateState.LastSamples"/> array to store the ramped sample.</param>
-        /// <param name="state">The <see cref="VoiceState"/> to generate the command from.</param>
+        /// <param name="state">The <see cref="VoiceUpdateState"/> to generate the command from.</param>
         /// <param name="filter0">First biquad filter parameter.</param>
         /// <param name="filter1">Second biquad filter parameter.</param>
         /// <param name="biquadFilterState0">First biquad state.</param>
@@ -339,9 +337,9 @@ namespace Ryujinx.Audio.Renderer.Server
             uint inputBufferIndex,
             uint outputBufferIndex,
             int lastSampleIndex,
-            Memory<VoiceState> state,
+            Memory<VoiceUpdateState> state,
-            ref BiquadFilterParameter2 filter0,
+            ref BiquadFilterParameter filter0,
-            ref BiquadFilterParameter2 filter1,
+            ref BiquadFilterParameter filter1,
             Memory<BiquadFilterState> biquadFilterState0,
             Memory<BiquadFilterState> biquadFilterState1,
             Memory<BiquadFilterState> previousBiquadFilterState0,
@@ -656,14 +654,14 @@ namespace Ryujinx.Audio.Renderer.Server
         /// Create a new <see cref="UpsampleCommand"/>.
         /// </summary>
         /// <param name="bufferOffset">The offset of the mix buffer.</param>
-        /// <param name="upsampler">The <see cref="UpsamplerInfo"/> associated.</param>
+        /// <param name="upsampler">The <see cref="UpsamplerState"/> associated.</param>
         /// <param name="inputCount">The total input count.</param>
         /// <param name="inputBufferOffset">The input buffer mix offset.</param>
         /// <param name="bufferCountPerSample">The buffer count per sample.</param>
         /// <param name="sampleCount">The source sample count.</param>
         /// <param name="sampleRate">The source sample rate.</param>
         /// <param name="nodeId">The node id associated to this command.</param>
-        public void GenerateUpsample(uint bufferOffset, UpsamplerInfo upsampler, uint inputCount, Span<byte> inputBufferOffset, uint bufferCountPerSample, uint sampleCount, uint sampleRate, int nodeId)
+        public void GenerateUpsample(uint bufferOffset, UpsamplerState upsampler, uint inputCount, Span<byte> inputBufferOffset, uint bufferCountPerSample, uint sampleCount, uint sampleRate, int nodeId)
         {
             UpsampleCommand command = new(bufferOffset, upsampler, inputCount, inputBufferOffset, bufferCountPerSample, sampleCount, sampleRate, nodeId);
 
@@ -688,23 +686,5 @@ namespace Ryujinx.Audio.Renderer.Server
 
             AddCommand(command);
         }
-
-        public void GenerateFillBuffer(SplitterDestination destination, float value, int length, int nodeId)
-        {
-            FillBufferCommand command;
-
-            if (Unsafe.IsNullRef(ref destination.GetV2RefOrNull()))
-            {
-                command = new(destination.GetV1RefOrNull(), length, value, nodeId);
-            }
-            else
-            {
-                command = new(destination.GetV2RefOrNull(), length, value, nodeId);
-            }
-            
-            command.EstimatedProcessingTime = _commandProcessingTimeEstimator.Estimate(command);
-            
-            AddCommand(command);
-        }
     }
 }

src/Ryujinx.Audio/Renderer/Server/CommandGenerator.cs

@@ -1,6 +1,5 @@
 using Ryujinx.Audio.Common;
 using Ryujinx.Audio.Renderer.Common;
-using Ryujinx.Audio.Renderer.Dsp;
 using Ryujinx.Audio.Renderer.Dsp.Command;
 using Ryujinx.Audio.Renderer.Dsp.State;
 using Ryujinx.Audio.Renderer.Parameter;
@@ -42,27 +41,27 @@ namespace Ryujinx.Audio.Renderer.Server
             _commandBuffer.GenerateClearMixBuffer(Constants.InvalidNodeId);
         }
 
-        private void GenerateDataSource(ref VoiceInfo voiceInfo, Memory<VoiceState> dspState, int channelIndex)
+        private void GenerateDataSource(ref VoiceState voiceState, Memory<VoiceUpdateState> dspState, int channelIndex)
         {
-            if (voiceInfo.MixId != Constants.UnusedMixId)
+            if (voiceState.MixId != Constants.UnusedMixId)
             {
-                ref MixInfo mix = ref _mixContext.GetState(voiceInfo.MixId);
+                ref MixState mix = ref _mixContext.GetState(voiceState.MixId);
 
                 _commandBuffer.GenerateDepopPrepare(
                     dspState,
                     _rendererContext.DepopBuffer,
                     mix.BufferCount,
                     mix.BufferOffset,
-                    voiceInfo.NodeId,
+                    voiceState.NodeId,
-                    voiceInfo.WasPlaying);
+                    voiceState.WasPlaying);
             }
-            else if (voiceInfo.SplitterId != Constants.UnusedSplitterId)
+            else if (voiceState.SplitterId != Constants.UnusedSplitterId)
             {
                 int destinationId = 0;
 
                 while (true)
                 {
-                    SplitterDestination destination = _splitterContext.GetDestination((int)voiceInfo.SplitterId, destinationId++);
+                    SplitterDestination destination = _splitterContext.GetDestination((int)voiceState.SplitterId, destinationId++);
 
                     if (destination.IsNull)
                     {
@@ -75,17 +74,15 @@ namespace Ryujinx.Audio.Renderer.Server
 
                         if (mixId < _mixContext.GetCount() && mixId != Constants.UnusedSplitterIdInt)
                         {
-                            ref MixInfo mix = ref _mixContext.GetState(mixId);
+                            ref MixState mix = ref _mixContext.GetState(mixId);
-                            
-                            // _commandBuffer.GenerateFillBuffer();
 
                             _commandBuffer.GenerateDepopPrepare(
                                 dspState,
                                 _rendererContext.DepopBuffer,
                                 mix.BufferCount,
                                 mix.BufferOffset,
-                                voiceInfo.NodeId,
+                                voiceState.NodeId,
-                                voiceInfo.WasPlaying);
+                                voiceState.WasPlaying);
 
                             destination.MarkAsNeedToUpdateInternalState();
                         }
@@ -93,71 +90,69 @@ namespace Ryujinx.Audio.Renderer.Server
                 }
             }
 
-            if (!voiceInfo.WasPlaying)
+            if (!voiceState.WasPlaying)
             {
-                Debug.Assert(voiceInfo.SampleFormat != SampleFormat.Adpcm || channelIndex == 0);
+                Debug.Assert(voiceState.SampleFormat != SampleFormat.Adpcm || channelIndex == 0);
 
-                if (_rendererContext.BehaviourInfo.IsWaveBufferVersion2Supported())
+                if (_rendererContext.BehaviourContext.IsWaveBufferVersion2Supported())
                 {
                     _commandBuffer.GenerateDataSourceVersion2(
-                        ref voiceInfo,
+                        ref voiceState,
                         dspState,
                         (ushort)_rendererContext.MixBufferCount,
                         (ushort)channelIndex,
-                        voiceInfo.NodeId);
+                        voiceState.NodeId);
                 }
                 else
                 {
-                    switch (voiceInfo.SampleFormat)
+                    switch (voiceState.SampleFormat)
                     {
                         case SampleFormat.PcmInt16:
                             _commandBuffer.GeneratePcmInt16DataSourceVersion1(
-                                ref voiceInfo,
+                                ref voiceState,
                                 dspState,
                                 (ushort)_rendererContext.MixBufferCount,
                                 (ushort)channelIndex,
-                                voiceInfo.NodeId);
+                                voiceState.NodeId);
                             break;
                         case SampleFormat.PcmFloat:
                             _commandBuffer.GeneratePcmFloatDataSourceVersion1(
-                                ref voiceInfo,
+                                ref voiceState,
                                 dspState,
                                 (ushort)_rendererContext.MixBufferCount,
                                 (ushort)channelIndex,
-                                voiceInfo.NodeId);
+                                voiceState.NodeId);
                             break;
                         case SampleFormat.Adpcm:
                             _commandBuffer.GenerateAdpcmDataSourceVersion1(
-                                ref voiceInfo,
+                                ref voiceState,
                                 dspState,
                                 (ushort)_rendererContext.MixBufferCount,
-                                voiceInfo.NodeId);
+                                voiceState.NodeId);
                             break;
                         default:
-                            throw new NotImplementedException($"Unsupported data source {voiceInfo.SampleFormat}");
+                            throw new NotImplementedException($"Unsupported data source {voiceState.SampleFormat}");
                     }
                 }
             }
         }
 
-        private void GenerateBiquadFilterForVoice(ref VoiceInfo voiceInfo, Memory<VoiceState> state, int baseIndex, int bufferOffset, int nodeId)
+        private void GenerateBiquadFilterForVoice(ref VoiceState voiceState, Memory<VoiceUpdateState> state, int baseIndex, int bufferOffset, int nodeId)
         {
-            bool supportsOptimizedPath = _rendererContext.BehaviourInfo.UseMultiTapBiquadFilterProcessing();
+            bool supportsOptimizedPath = _rendererContext.BehaviourContext.UseMultiTapBiquadFilterProcessing();
 
-            Span<BiquadFilterParameter2> biquadFiltersSpan = voiceInfo.BiquadFilters.AsSpan();
+            if (supportsOptimizedPath && voiceState.BiquadFilters[0].Enable && voiceState.BiquadFilters[1].Enable)
-
-            if (supportsOptimizedPath && biquadFiltersSpan[0].Enable && biquadFiltersSpan[1].Enable)
             {
                 Memory<byte> biquadStateRawMemory = SpanMemoryManager<byte>.Cast(state)[..(Unsafe.SizeOf<BiquadFilterState>() * Constants.VoiceBiquadFilterCount)];
                 Memory<BiquadFilterState> stateMemory = SpanMemoryManager<BiquadFilterState>.Cast(biquadStateRawMemory);
 
-                _commandBuffer.GenerateMultiTapBiquadFilter(baseIndex, biquadFiltersSpan, stateMemory, bufferOffset, bufferOffset, voiceInfo.BiquadFilterNeedInitialization, nodeId);
+                _commandBuffer.GenerateMultiTapBiquadFilter(baseIndex, voiceState.BiquadFilters.AsSpan(), stateMemory, bufferOffset, bufferOffset, voiceState.BiquadFilterNeedInitialization, nodeId);
             }
             else
             {
-                for (int i = 0; i < biquadFiltersSpan.Length; i++)
+                for (int i = 0; i < voiceState.BiquadFilters.Length; i++)
                 {
-                    ref BiquadFilterParameter2 filter = ref biquadFiltersSpan[i];
+                    ref BiquadFilterParameter filter = ref voiceState.BiquadFilters[i];
 
                     if (filter.Enable)
                     {
@@ -170,7 +165,7 @@ namespace Ryujinx.Audio.Renderer.Server
                             stateMemory.Slice(i, 1),
                             bufferOffset,
                             bufferOffset,
-                            !voiceInfo.BiquadFilterNeedInitialization[i],
+                            !voiceState.BiquadFilterNeedInitialization[i],
                             nodeId);
                     }
                 }
@@ -179,7 +174,7 @@ namespace Ryujinx.Audio.Renderer.Server
 
         private void GenerateVoiceMixWithSplitter(
             SplitterDestination destination,
-            Memory<VoiceState> state,
+            Memory<VoiceUpdateState> state,
             uint bufferOffset,
             uint bufferCount,
             uint bufferIndex,
@@ -188,8 +183,8 @@ namespace Ryujinx.Audio.Renderer.Server
             ReadOnlySpan<float> mixVolumes = destination.MixBufferVolume;
             ReadOnlySpan<float> previousMixVolumes = destination.PreviousMixBufferVolume;
 
-            ref BiquadFilterParameter2 bqf0 = ref destination.GetBiquadFilterParameter(0);
+            ref BiquadFilterParameter bqf0 = ref destination.GetBiquadFilterParameter(0);
-            ref BiquadFilterParameter2 bqf1 = ref destination.GetBiquadFilterParameter(1);
+            ref BiquadFilterParameter bqf1 = ref destination.GetBiquadFilterParameter(1);
 
             Memory<BiquadFilterState> bqfState = _splitterContext.GetBiquadFilterState(destination);
 
@@ -273,7 +268,7 @@ namespace Ryujinx.Audio.Renderer.Server
         private void GenerateVoiceMix(
             ReadOnlySpan<float> mixVolumes,
             ReadOnlySpan<float> previousMixVolumes,
-            Memory<VoiceState> state,
+            Memory<VoiceUpdateState> state,
             uint bufferOffset,
             uint bufferCount,
             uint bufferIndex,
@@ -312,27 +307,24 @@ namespace Ryujinx.Audio.Renderer.Server
             }
         }
 
-        private void GenerateVoice(ref VoiceInfo voiceInfo)
+        private void GenerateVoice(ref VoiceState voiceState)
         {
-            int nodeId = voiceInfo.NodeId;
+            int nodeId = voiceState.NodeId;
-            uint channelsCount = voiceInfo.ChannelsCount;
+            uint channelsCount = voiceState.ChannelsCount;
-            
-            Span<int> channelResourceIdsSpan = voiceInfo.ChannelResourceIds.AsSpan();
-            Span<BiquadFilterParameter2> biquadFiltersSpan = voiceInfo.BiquadFilters.AsSpan();
 
             for (int channelIndex = 0; channelIndex < channelsCount; channelIndex++)
             {
-                Memory<VoiceState> dspStateMemory = _voiceContext.GetUpdateStateForDsp(channelResourceIdsSpan[channelIndex]);
+                Memory<VoiceUpdateState> dspStateMemory = _voiceContext.GetUpdateStateForDsp(voiceState.ChannelResourceIds[channelIndex]);
 
-                ref VoiceChannelResource channelResource = ref _voiceContext.GetChannelResource(channelResourceIdsSpan[channelIndex]);
+                ref VoiceChannelResource channelResource = ref _voiceContext.GetChannelResource(voiceState.ChannelResourceIds[channelIndex]);
 
                 PerformanceDetailType dataSourceDetailType = PerformanceDetailType.Adpcm;
 
-                if (voiceInfo.SampleFormat == SampleFormat.PcmInt16)
+                if (voiceState.SampleFormat == SampleFormat.PcmInt16)
                 {
                     dataSourceDetailType = PerformanceDetailType.PcmInt16;
                 }
-                else if (voiceInfo.SampleFormat == SampleFormat.PcmFloat)
+                else if (voiceState.SampleFormat == SampleFormat.PcmFloat)
                 {
                     dataSourceDetailType = PerformanceDetailType.PcmFloat;
                 }
@@ -348,18 +340,18 @@ namespace Ryujinx.Audio.Renderer.Server
                     GeneratePerformance(ref performanceEntry, PerformanceCommand.Type.Start, nodeId);
                 }
 
-                GenerateDataSource(ref voiceInfo, dspStateMemory, channelIndex);
+                GenerateDataSource(ref voiceState, dspStateMemory, channelIndex);
 
                 if (performanceInitialized)
                 {
                     GeneratePerformance(ref performanceEntry, PerformanceCommand.Type.End, nodeId);
                 }
 
-                if (voiceInfo.WasPlaying)
+                if (voiceState.WasPlaying)
                 {
-                    voiceInfo.PreviousVolume = 0.0f;
+                    voiceState.PreviousVolume = 0.0f;
                 }
-                else if (voiceInfo.HasAnyDestination())
+                else if (voiceState.HasAnyDestination())
                 {
                     performanceInitialized = false;
 
@@ -370,7 +362,7 @@ namespace Ryujinx.Audio.Renderer.Server
                         GeneratePerformance(ref performanceEntry, PerformanceCommand.Type.Start, nodeId);
                     }
 
-                    GenerateBiquadFilterForVoice(ref voiceInfo, dspStateMemory, (int)_rendererContext.MixBufferCount, channelIndex, nodeId);
+                    GenerateBiquadFilterForVoice(ref voiceState, dspStateMemory, (int)_rendererContext.MixBufferCount, channelIndex, nodeId);
 
                     if (performanceInitialized)
                     {
@@ -387,8 +379,8 @@ namespace Ryujinx.Audio.Renderer.Server
                     }
 
                     _commandBuffer.GenerateVolumeRamp(
-                        voiceInfo.PreviousVolume,
+                        voiceState.PreviousVolume,
-                        voiceInfo.Volume,
+                        voiceState.Volume,
                         _rendererContext.MixBufferCount + (uint)channelIndex,
                         nodeId);
 
@@ -397,17 +389,17 @@ namespace Ryujinx.Audio.Renderer.Server
                         GeneratePerformance(ref performanceEntry, PerformanceCommand.Type.End, nodeId);
                     }
 
-                    voiceInfo.PreviousVolume = voiceInfo.Volume;
+                    voiceState.PreviousVolume = voiceState.Volume;
 
-                    if (voiceInfo.MixId == Constants.UnusedMixId)
+                    if (voiceState.MixId == Constants.UnusedMixId)
                     {
-                        if (voiceInfo.SplitterId != Constants.UnusedSplitterId)
+                        if (voiceState.SplitterId != Constants.UnusedSplitterId)
                         {
                             int destinationId = channelIndex;
 
                             while (true)
                             {
-                                SplitterDestination destination = _splitterContext.GetDestination((int)voiceInfo.SplitterId, destinationId);
+                                SplitterDestination destination = _splitterContext.GetDestination((int)voiceState.SplitterId, destinationId);
 
                                 if (destination.IsNull)
                                 {
@@ -422,7 +414,7 @@ namespace Ryujinx.Audio.Renderer.Server
 
                                     if (mixId < _mixContext.GetCount() && mixId != Constants.UnusedSplitterIdInt)
                                     {
-                                        ref MixInfo mix = ref _mixContext.GetState(mixId);
+                                        ref MixState mix = ref _mixContext.GetState(mixId);
 
                                         if (destination.IsBiquadFilterEnabled())
                                         {
@@ -454,7 +446,7 @@ namespace Ryujinx.Audio.Renderer.Server
                     }
                     else
                     {
-                        ref MixInfo mix = ref _mixContext.GetState(voiceInfo.MixId);
+                        ref MixState mix = ref _mixContext.GetState(voiceState.MixId);
 
                         performanceInitialized = false;
 
@@ -482,9 +474,9 @@ namespace Ryujinx.Audio.Renderer.Server
                         channelResource.UpdateState();
                     }
 
-                    for (int i = 0; i < voiceInfo.BiquadFilterNeedInitialization.Length; i++)
+                    for (int i = 0; i < voiceState.BiquadFilterNeedInitialization.Length; i++)
                     {
-                        voiceInfo.BiquadFilterNeedInitialization[i] = biquadFiltersSpan[i].Enable;
+                        voiceState.BiquadFilterNeedInitialization[i] = voiceState.BiquadFilters[i].Enable;
                     }
                 }
             }
@@ -494,11 +486,11 @@ namespace Ryujinx.Audio.Renderer.Server
         {
             for (int i = 0; i < _voiceContext.GetCount(); i++)
             {
-                ref VoiceInfo sortedInfo = ref _voiceContext.GetSortedState(i);
+                ref VoiceState sortedState = ref _voiceContext.GetSortedState(i);
 
-                if (!sortedInfo.ShouldSkip() && sortedInfo.UpdateForCommandGeneration(_voiceContext))
+                if (!sortedState.ShouldSkip() && sortedState.UpdateForCommandGeneration(_voiceContext))
                 {
-                    int nodeId = sortedInfo.NodeId;
+                    int nodeId = sortedState.NodeId;
 
                     PerformanceEntryAddresses performanceEntry = new();
 
@@ -511,7 +503,7 @@ namespace Ryujinx.Audio.Renderer.Server
                         GeneratePerformance(ref performanceEntry, PerformanceCommand.Type.Start, nodeId);
                     }
 
-                    GenerateVoice(ref sortedInfo);
+                    GenerateVoice(ref sortedState);
 
                     if (performanceInitialized)
                     {
@@ -534,19 +526,15 @@ namespace Ryujinx.Audio.Renderer.Server
 
             if (effect.IsEnabled)
             {
-                Span<float> volumesSpan = effect.Parameter.Volumes.AsSpan();
-                Span<byte> inputSpan = effect.Parameter.Input.AsSpan();
-                Span<byte> outputSpan = effect.Parameter.Output.AsSpan();
-                
                 for (int i = 0; i < effect.Parameter.MixesCount; i++)
                 {
-                    if (volumesSpan[i] != 0.0f)
+                    if (effect.Parameter.Volumes[i] != 0.0f)
                     {
                         _commandBuffer.GenerateMix(
-                            (uint)bufferOffset + inputSpan[i],
+                            (uint)bufferOffset + effect.Parameter.Input[i],
-                            (uint)bufferOffset + outputSpan[i],
+                            (uint)bufferOffset + effect.Parameter.Output[i],
                             nodeId,
-                            volumesSpan[i]);
+                            effect.Parameter.Volumes[i]);
                     }
                 }
             }
@@ -566,10 +554,6 @@ namespace Ryujinx.Audio.Renderer.Server
             {
                 int i = 0;
                 uint writeOffset = 0;
-                
-                Span<byte> inputSpan = effect.Parameter.Input.AsSpan();
-                Span<byte> outputSpan = effect.Parameter.Output.AsSpan();
-                
                 for (uint channelIndex = effect.Parameter.ChannelCount; channelIndex != 0; channelIndex--)
                 {
                     uint newUpdateCount = writeOffset + _commandBuffer.CommandList.SampleCount;
@@ -587,8 +571,8 @@ namespace Ryujinx.Audio.Renderer.Server
 
                     _commandBuffer.GenerateAuxEffect(
                         bufferOffset,
-                        inputSpan[i],
+                        effect.Parameter.Input[i],
-                        outputSpan[i],
+                        effect.Parameter.Output[i],
                         ref effect.State,
                         effect.IsEnabled,
                         effect.Parameter.BufferStorageSize,
@@ -636,15 +620,12 @@ namespace Ryujinx.Audio.Renderer.Server
         {
             Debug.Assert(effect.Type == EffectType.BiquadFilter);
 
-            Span<byte> inputSpan = effect.Parameter.Input.AsSpan();
-            Span<byte> outputSpan = effect.Parameter.Output.AsSpan();
-
             if (effect.IsEnabled)
             {
                 bool needInitialization = effect.Parameter.Status == UsageState.Invalid ||
-                    (effect.Parameter.Status == UsageState.New && !_rendererContext.BehaviourInfo.IsBiquadFilterEffectStateClearBugFixed());
+                    (effect.Parameter.Status == UsageState.New && !_rendererContext.BehaviourContext.IsBiquadFilterEffectStateClearBugFixed());
 
-                BiquadFilterParameter2 parameter = new()
+                BiquadFilterParameter parameter = new()
                 {
                     Enable = true,
                 };
@@ -658,8 +639,8 @@ namespace Ryujinx.Audio.Renderer.Server
                         (int)bufferOffset,
                         ref parameter,
                         effect.State.Slice(i, 1),
-                        inputSpan[i],
+                        effect.Parameter.Input[i],
-                        outputSpan[i],
+                        effect.Parameter.Output[i],
                         needInitialization,
                         nodeId);
                 }
@@ -668,8 +649,8 @@ namespace Ryujinx.Audio.Renderer.Server
             {
                 for (int i = 0; i < effect.Parameter.ChannelCount; i++)
                 {
-                    uint inputBufferIndex = bufferOffset + inputSpan[i];
+                    uint inputBufferIndex = bufferOffset + effect.Parameter.Input[i];
-                    uint outputBufferIndex = bufferOffset + outputSpan[i];
+                    uint outputBufferIndex = bufferOffset + effect.Parameter.Output[i];
 
                     // If the input and output isn't the same, generate a command.
                     if (inputBufferIndex != outputBufferIndex)
@@ -686,7 +667,7 @@ namespace Ryujinx.Audio.Renderer.Server
 
             ulong workBuffer = effect.GetWorkBuffer(-1);
 
-            if (_rendererContext.BehaviourInfo.IsEffectInfoVersion2Supported())
+            if (_rendererContext.BehaviourContext.IsEffectInfoVersion2Supported())
             {
                 Memory<EffectResultState> dspResultState;
 
@@ -721,8 +702,6 @@ namespace Ryujinx.Audio.Renderer.Server
                 int i = 0;
                 uint writeOffset = 0;
 
-                Span<byte> inputSpan = effect.Parameter.Input.AsSpan();
-
                 for (uint channelIndex = effect.Parameter.ChannelCount; channelIndex != 0; channelIndex--)
                 {
                     uint newUpdateCount = writeOffset + _commandBuffer.CommandList.SampleCount;
@@ -740,7 +719,7 @@ namespace Ryujinx.Audio.Renderer.Server
 
                     _commandBuffer.GenerateCaptureEffect(
                         bufferOffset,
-                        inputSpan[i],
+                        effect.Parameter.Input[i],
                         effect.State.SendBufferInfo,
                         effect.IsEnabled,
                         effect.Parameter.BufferStorageSize,
@@ -780,7 +759,7 @@ namespace Ryujinx.Audio.Renderer.Server
                 nodeId);
         }
 
-        private void GenerateEffect(ref MixInfo mix, int effectId, BaseEffect effect)
+        private void GenerateEffect(ref MixState mix, int effectId, BaseEffect effect)
         {
             int nodeId = mix.NodeId;
 
@@ -810,13 +789,13 @@ namespace Ryujinx.Audio.Renderer.Server
                     GenerateAuxEffect(mix.BufferOffset, (AuxiliaryBufferEffect)effect, nodeId);
                     break;
                 case EffectType.Delay:
-                    GenerateDelayEffect(mix.BufferOffset, (DelayEffect)effect, nodeId, _rendererContext.BehaviourInfo.IsNewEffectChannelMappingSupported());
+                    GenerateDelayEffect(mix.BufferOffset, (DelayEffect)effect, nodeId, _rendererContext.BehaviourContext.IsNewEffectChannelMappingSupported());
                     break;
                 case EffectType.Reverb:
-                    GenerateReverbEffect(mix.BufferOffset, (ReverbEffect)effect, nodeId, mix.IsLongSizePreDelaySupported, _rendererContext.BehaviourInfo.IsNewEffectChannelMappingSupported());
+                    GenerateReverbEffect(mix.BufferOffset, (ReverbEffect)effect, nodeId, mix.IsLongSizePreDelaySupported, _rendererContext.BehaviourContext.IsNewEffectChannelMappingSupported());
                     break;
                 case EffectType.Reverb3d:
-                    GenerateReverb3dEffect(mix.BufferOffset, (Reverb3dEffect)effect, nodeId, _rendererContext.BehaviourInfo.IsNewEffectChannelMappingSupported());
+                    GenerateReverb3dEffect(mix.BufferOffset, (Reverb3dEffect)effect, nodeId, _rendererContext.BehaviourContext.IsNewEffectChannelMappingSupported());
                     break;
                 case EffectType.BiquadFilter:
                     GenerateBiquadFilterEffect(mix.BufferOffset, (BiquadFilterEffect)effect, nodeId);
@@ -842,7 +821,7 @@ namespace Ryujinx.Audio.Renderer.Server
             effect.UpdateForCommandGeneration();
         }
 
-        private void GenerateEffects(ref MixInfo mix)
+        private void GenerateEffects(ref MixState mix)
         {
             ReadOnlySpan<int> effectProcessingOrderArray = mix.EffectProcessingOrderArray;
 
@@ -878,8 +857,8 @@ namespace Ryujinx.Audio.Renderer.Server
             ref bool isFirstMixBuffer,
             int nodeId)
         {
-            ref BiquadFilterParameter2 bqf0 = ref destination.GetBiquadFilterParameter(0);
+            ref BiquadFilterParameter bqf0 = ref destination.GetBiquadFilterParameter(0);
-            ref BiquadFilterParameter2 bqf1 = ref destination.GetBiquadFilterParameter(1);
+            ref BiquadFilterParameter bqf1 = ref destination.GetBiquadFilterParameter(1);
 
             Memory<BiquadFilterState> bqfState = _splitterContext.GetBiquadFilterState(destination);
 
@@ -891,7 +870,7 @@ namespace Ryujinx.Audio.Renderer.Server
                     inputBufferIndex,
                     outputBufferIndex,
                     0,
-                    Memory<VoiceState>.Empty,
+                    Memory<VoiceUpdateState>.Empty,
                     ref bqf0,
                     ref bqf1,
                     bqfState[..1],
@@ -915,7 +894,7 @@ namespace Ryujinx.Audio.Renderer.Server
                     inputBufferIndex,
                     outputBufferIndex,
                     0,
-                    Memory<VoiceState>.Empty,
+                    Memory<VoiceUpdateState>.Empty,
                     ref bqf0,
                     bqfState[..1],
                     bqfState.Slice(1, 1),
@@ -934,7 +913,7 @@ namespace Ryujinx.Audio.Renderer.Server
                     inputBufferIndex,
                     outputBufferIndex,
                     0,
-                    Memory<VoiceState>.Empty,
+                    Memory<VoiceUpdateState>.Empty,
                     ref bqf1,
                     bqfState[..1],
                     bqfState.Slice(1, 1),
@@ -949,7 +928,7 @@ namespace Ryujinx.Audio.Renderer.Server
             isFirstMixBuffer = false;
         }
 
-        private void GenerateMix(ref MixInfo mix)
+        private void GenerateMix(ref MixState mix)
         {
             if (mix.HasAnyDestination())
             {
@@ -978,7 +957,7 @@ namespace Ryujinx.Audio.Renderer.Server
 
                                 if (mixId < _mixContext.GetCount() && mixId != Constants.UnusedSplitterIdInt)
                                 {
-                                    ref MixInfo destinationMix = ref _mixContext.GetState(mixId);
+                                    ref MixState destinationMix = ref _mixContext.GetState(mixId);
 
                                     uint inputBufferIndex = mix.BufferOffset + ((uint)destinationIndex % mix.BufferCount);
 
@@ -1017,7 +996,7 @@ namespace Ryujinx.Audio.Renderer.Server
                 }
                 else
                 {
-                    ref MixInfo destinationMix = ref _mixContext.GetState(mix.DestinationMixId);
+                    ref MixState destinationMix = ref _mixContext.GetState(mix.DestinationMixId);
 
                     for (uint bufferIndex = 0; bufferIndex < mix.BufferCount; bufferIndex++)
                     {
@@ -1039,7 +1018,7 @@ namespace Ryujinx.Audio.Renderer.Server
             }
         }
 
-        private void GenerateSubMix(ref MixInfo subMix)
+        private void GenerateSubMix(ref MixState subMix)
         {
             _commandBuffer.GenerateDepopForMixBuffers(
                 _rendererContext.DepopBuffer,
@@ -1075,11 +1054,11 @@ namespace Ryujinx.Audio.Renderer.Server
         {
             for (int id = 0; id < _mixContext.GetCount(); id++)
             {
-                ref MixInfo sortedInfo = ref _mixContext.GetSortedState(id);
+                ref MixState sortedState = ref _mixContext.GetSortedState(id);
 
-                if (sortedInfo.IsUsed && sortedInfo.MixId != Constants.FinalMixId)
+                if (sortedState.IsUsed && sortedState.MixId != Constants.FinalMixId)
                 {
-                    int nodeId = sortedInfo.NodeId;
+                    int nodeId = sortedState.NodeId;
 
                     PerformanceEntryAddresses performanceEntry = new();
 
@@ -1092,7 +1071,7 @@ namespace Ryujinx.Audio.Renderer.Server
                         GeneratePerformance(ref performanceEntry, PerformanceCommand.Type.Start, nodeId);
                     }
 
-                    GenerateSubMix(ref sortedInfo);
+                    GenerateSubMix(ref sortedState);
 
                     if (performanceInitialized)
                     {
@@ -1104,7 +1083,7 @@ namespace Ryujinx.Audio.Renderer.Server
 
         private void GenerateFinalMix()
         {
-            ref MixInfo finalMix = ref _mixContext.GetFinalState();
+            ref MixState finalMix = ref _mixContext.GetFinalState();
 
             _commandBuffer.GenerateDepopForMixBuffers(
                 _rendererContext.DepopBuffer,
@@ -1183,16 +1162,16 @@ namespace Ryujinx.Audio.Renderer.Server
             }
         }
 
-        private void GenerateCircularBuffer(CircularBufferSink sink, ref MixInfo finalMix)
+        private void GenerateCircularBuffer(CircularBufferSink sink, ref MixState finalMix)
         {
             _commandBuffer.GenerateCircularBuffer(finalMix.BufferOffset, sink, Constants.InvalidNodeId);
         }
 
-        private void GenerateDevice(DeviceSink sink, ref MixInfo finalMix)
+        private void GenerateDevice(DeviceSink sink, ref MixState finalMix)
         {
-            if (_commandBuffer.CommandList.SampleRate != 48000 && sink.UpsamplerInfo == null)
+            if (_commandBuffer.CommandList.SampleRate != 48000 && sink.UpsamplerState == null)
             {
-                sink.UpsamplerInfo = _rendererContext.UpsamplerManager.Allocate();
+                sink.UpsamplerState = _rendererContext.UpsamplerManager.Allocate();
             }
 
             bool useCustomDownMixingCommand = _rendererContext.ChannelCount == 2 && sink.Parameter.DownMixParameterEnabled;
@@ -1219,11 +1198,11 @@ namespace Ryujinx.Audio.Renderer.Server
 
             CommandList commandList = _commandBuffer.CommandList;
 
-            if (sink.UpsamplerInfo != null)
+            if (sink.UpsamplerState != null)
             {
                 _commandBuffer.GenerateUpsample(
                     finalMix.BufferOffset,
-                    sink.UpsamplerInfo,
+                    sink.UpsamplerState,
                     sink.Parameter.InputCount,
                     sink.Parameter.Input.AsSpan(),
                     commandList.BufferCount,
@@ -1240,7 +1219,7 @@ namespace Ryujinx.Audio.Renderer.Server
                 Constants.InvalidNodeId);
         }
 
-        private void GenerateSink(BaseSink sink, ref MixInfo finalMix)
+        private void GenerateSink(BaseSink sink, ref MixState finalMix)
         {
             bool performanceInitialized = false;
 
@@ -1278,7 +1257,7 @@ namespace Ryujinx.Audio.Renderer.Server
 
         public void GenerateSinks()
         {
-            ref MixInfo finalMix = ref _mixContext.GetFinalState();
+            ref MixState finalMix = ref _mixContext.GetFinalState();
 
             for (int i = 0; i < _sinkContext.GetCount(); i++)
             {

src/Ryujinx.Audio/Renderer/Server/CommandProcessingTimeEstimatorVersion1.cs

@@ -194,10 +194,5 @@ namespace Ryujinx.Audio.Renderer.Server
         {
             return 0;
         }
-
-        public uint Estimate(FillBufferCommand command)
-        {
-            return 0;
-        }
     }
 }

src/Ryujinx.Audio/Renderer/Server/CommandProcessingTimeEstimatorVersion2.cs

@@ -486,10 +486,5 @@ namespace Ryujinx.Audio.Renderer.Server
         {
             return 0;
         }
-
-        public uint Estimate(FillBufferCommand command)
-        {
-            return 0;
-        }
     }
 }

src/Ryujinx.Audio/Renderer/Server/CommandProcessingTimeEstimatorVersion3.cs

@@ -3,7 +3,7 @@ using Ryujinx.Audio.Renderer.Dsp.Command;
 using Ryujinx.Audio.Renderer.Parameter.Effect;
 using System;
 using System.Diagnostics;
-using Ryujinx.Audio.Renderer.Parameter;
+using static Ryujinx.Audio.Renderer.Parameter.VoiceInParameter;
 
 namespace Ryujinx.Audio.Renderer.Server
 {
@@ -656,10 +656,5 @@ namespace Ryujinx.Audio.Renderer.Server
         {
             return 0;
         }
-
-        public virtual uint Estimate(FillBufferCommand command)
-        {
-            return 0;
-        }
     }
 }

src/Ryujinx.Audio/Renderer/Server/CommandProcessingTimeEstimatorVersion5.cs

@@ -286,10 +286,5 @@ namespace Ryujinx.Audio.Renderer.Server
                 return 8683;
             }
         }
-
-        public override uint Estimate(FillBufferCommand command)
-        {
-            return 0;
-        }
     }
 }

src/Ryujinx.Audio/Renderer/Server/Effect/BaseEffect.cs

@@ -175,19 +175,6 @@ namespace Ryujinx.Audio.Renderer.Server.Effect
             updateErrorInfo = new ErrorInfo();
         }
 
-        /// <summary>
-        /// Update the internal state from a user version 3 parameter.
-        /// </summary>
-        /// <param name="updateErrorInfo">The possible <see cref="ErrorInfo"/> that was generated.</param>
-        /// <param name="parameter">The user parameter.</param>
-        /// <param name="mapper">The mapper to use.</param>
-        public virtual void Update(out ErrorInfo updateErrorInfo, in EffectInParameterVersion3 parameter, PoolMapper mapper)
-        {
-            Debug.Assert(IsTypeValid(in parameter));
-
-            updateErrorInfo = new ErrorInfo();
-        }
-
         /// <summary>
         /// Get the work buffer DSP address at the given index.
         /// </summary>

src/Ryujinx.Audio/Renderer/Server/Effect/BiquadFilterEffect.cs

@@ -1,5 +1,4 @@
 using Ryujinx.Audio.Renderer.Common;
-using Ryujinx.Audio.Renderer.Dsp;
 using Ryujinx.Audio.Renderer.Dsp.State;
 using Ryujinx.Audio.Renderer.Parameter;
 using Ryujinx.Audio.Renderer.Parameter.Effect;
@@ -18,7 +17,7 @@ namespace Ryujinx.Audio.Renderer.Server.Effect
         /// <summary>
         /// The biquad filter parameter.
         /// </summary>
-        public BiquadFilterEffectParameter2 Parameter;
+        public BiquadFilterEffectParameter Parameter;
 
         /// <summary>
         /// The biquad filter state.
@@ -30,7 +29,7 @@ namespace Ryujinx.Audio.Renderer.Server.Effect
         /// </summary>
         public BiquadFilterEffect()
         {
-            Parameter = new BiquadFilterEffectParameter2();
+            Parameter = new BiquadFilterEffectParameter();
             State = new BiquadFilterState[Constants.ChannelCountMax];
         }
 
@@ -46,28 +45,13 @@ namespace Ryujinx.Audio.Renderer.Server.Effect
             Update(out updateErrorInfo, in parameter, mapper);
         }
 
-        public override void Update(out BehaviourParameter.ErrorInfo updateErrorInfo, in EffectInParameterVersion3 parameter, PoolMapper mapper)
-        {
-            Update(out updateErrorInfo, in parameter, mapper);
-        }
-
         public void Update<T>(out BehaviourParameter.ErrorInfo updateErrorInfo, in T parameter, PoolMapper mapper) where T : unmanaged, IEffectInParameter
         {
             Debug.Assert(IsTypeValid(in parameter));
 
             UpdateParameterBase(in parameter);
 
-            if (typeof(T) == typeof(EffectInParameterVersion3))
+            Parameter = MemoryMarshal.Cast<byte, BiquadFilterEffectParameter>(parameter.SpecificData)[0];
-            {
-                Parameter = MemoryMarshal.Cast<byte, BiquadFilterEffectParameter2>(parameter.SpecificData)[0];
-            }
-            else
-            {
-                BiquadFilterEffectParameter1 oldParameter =
-                    MemoryMarshal.Cast<byte, BiquadFilterEffectParameter1>(parameter.SpecificData)[0];
-                Parameter = BiquadFilterHelper.ToBiquadFilterEffectParameter2(oldParameter);
-            }
-            
             IsEnabled = parameter.IsEnabled;
 
             updateErrorInfo = new BehaviourParameter.ErrorInfo();

src/Ryujinx.Audio/Renderer/Server/ICommandProcessingTimeEstimator.cs

@@ -38,6 +38,5 @@ namespace Ryujinx.Audio.Renderer.Server
         uint Estimate(CompressorCommand command);
         uint Estimate(BiquadFilterAndMixCommand command);
         uint Estimate(MultiTapBiquadFilterAndMixCommand command);
-        uint Estimate(FillBufferCommand command);
     }
 }

src/Ryujinx.Audio/Renderer/Server/MemoryPool/AddressInfo.cs

@@ -20,14 +20,14 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
         /// </summary>
         public ulong Size;
 
-        private unsafe MemoryPoolInfo* _memoryPools;
+        private unsafe MemoryPoolState* _memoryPools;
 
         /// <summary>
         /// The forced DSP address of the region.
         /// </summary>
         public DspAddress ForceMappedDspAddress;
 
-        private readonly unsafe ref MemoryPoolInfo MemoryPoolInfo => ref *_memoryPools;
+        private readonly unsafe ref MemoryPoolState MemoryPoolState => ref *_memoryPools;
 
         public readonly unsafe bool HasMemoryPoolState => (nint)_memoryPools != nint.Zero;
 
@@ -53,7 +53,7 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
                 return new AddressInfo
                 {
                     CpuAddress = cpuAddress,
-                    _memoryPools = MemoryPoolInfo.Null,
+                    _memoryPools = MemoryPoolState.Null,
                     Size = size,
                     ForceMappedDspAddress = 0,
                 };
@@ -73,19 +73,19 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
 
             unsafe
             {
-                _memoryPools = MemoryPoolInfo.Null;
+                _memoryPools = MemoryPoolState.Null;
             }
         }
 
         /// <summary>
-        /// Set the <see cref="MemoryPoolInfo"/> associated.
+        /// Set the <see cref="MemoryPoolState"/> associated.
         /// </summary>
-        /// <param name="memoryPoolState">The <see cref="MemoryPoolInfo"/> associated.</param>
+        /// <param name="memoryPoolState">The <see cref="MemoryPoolState"/> associated.</param>
-        public void SetupMemoryPool(Span<MemoryPoolInfo> memoryPoolState)
+        public void SetupMemoryPool(Span<MemoryPoolState> memoryPoolState)
         {
             unsafe
             {
-                fixed (MemoryPoolInfo* ptr = &MemoryMarshal.GetReference(memoryPoolState))
+                fixed (MemoryPoolState* ptr = &MemoryMarshal.GetReference(memoryPoolState))
                 {
                     SetupMemoryPool(ptr);
                 }
@@ -93,27 +93,27 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
         }
 
         /// <summary>
-        /// Set the <see cref="MemoryPoolInfo"/> associated.
+        /// Set the <see cref="MemoryPoolState"/> associated.
         /// </summary>
-        /// <param name="memoryPoolState">The <see cref="MemoryPoolInfo"/> associated.</param>
+        /// <param name="memoryPoolState">The <see cref="MemoryPoolState"/> associated.</param>
-        public unsafe void SetupMemoryPool(MemoryPoolInfo* memoryPoolState)
+        public unsafe void SetupMemoryPool(MemoryPoolState* memoryPoolState)
         {
             _memoryPools = memoryPoolState;
         }
 
         /// <summary>
-        /// Check if the <see cref="MemoryPoolInfo"/> is mapped.
+        /// Check if the <see cref="MemoryPoolState"/> is mapped.
         /// </summary>
-        /// <returns>Returns true if the <see cref="MemoryPoolInfo"/> is mapped.</returns>
+        /// <returns>Returns true if the <see cref="MemoryPoolState"/> is mapped.</returns>
         public readonly bool HasMappedMemoryPool()
         {
-            return HasMemoryPoolState && MemoryPoolInfo.IsMapped();
+            return HasMemoryPoolState && MemoryPoolState.IsMapped();
         }
 
         /// <summary>
         /// Get the DSP address associated to the <see cref="AddressInfo"/>.
         /// </summary>
-        /// <param name="markUsed">If true, mark the <see cref="MemoryPoolInfo"/> as used.</param>
+        /// <param name="markUsed">If true, mark the <see cref="MemoryPoolState"/> as used.</param>
         /// <returns>Returns the DSP address associated to the <see cref="AddressInfo"/>.</returns>
         public readonly DspAddress GetReference(bool markUsed)
         {
@@ -124,10 +124,10 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
 
             if (markUsed)
             {
-                MemoryPoolInfo.IsUsed = true;
+                MemoryPoolState.IsUsed = true;
             }
 
-            return MemoryPoolInfo.Translate(CpuAddress, Size);
+            return MemoryPoolState.Translate(CpuAddress, Size);
         }
     }
 }

src/Ryujinx.Audio/Renderer/Server/MemoryPool/MemoryPoolState.cs

@@ -8,62 +8,62 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
     /// Server state for a memory pool.
     /// </summary>
     [StructLayout(LayoutKind.Sequential, Size = 0x20, Pack = Alignment)]
-    public struct MemoryPoolInfo
+    public struct MemoryPoolState
     {
         public const int Alignment = 0x10;
 
         /// <summary>
-        /// The location of the <see cref="MemoryPoolInfo"/>.
+        /// The location of the <see cref="MemoryPoolState"/>.
         /// </summary>
         public enum LocationType : uint
         {
             /// <summary>
-            /// <see cref="MemoryPoolInfo"/> located on the CPU side for user use.
+            /// <see cref="MemoryPoolState"/> located on the CPU side for user use.
             /// </summary>
             Cpu,
 
             /// <summary>
-            /// <see cref="MemoryPoolInfo"/> located on the DSP side for system use.
+            /// <see cref="MemoryPoolState"/> located on the DSP side for system use.
             /// </summary>
             Dsp,
         }
 
         /// <summary>
-        /// The CPU address associated to the <see cref="MemoryPoolInfo"/>.
+        /// The CPU address associated to the <see cref="MemoryPoolState"/>.
         /// </summary>
         public CpuAddress CpuAddress;
 
         /// <summary>
-        /// The DSP address associated to the <see cref="MemoryPoolInfo"/>.
+        /// The DSP address associated to the <see cref="MemoryPoolState"/>.
         /// </summary>
         public DspAddress DspAddress;
 
         /// <summary>
-        /// The size associated to the <see cref="MemoryPoolInfo"/>.
+        /// The size associated to the <see cref="MemoryPoolState"/>.
         /// </summary>
         public ulong Size;
 
         /// <summary>
-        /// The <see cref="LocationType"/> associated to the <see cref="MemoryPoolInfo"/>.
+        /// The <see cref="LocationType"/> associated to the <see cref="MemoryPoolState"/>.
         /// </summary>
         public LocationType Location;
 
         /// <summary>
-        /// Set to true if the <see cref="MemoryPoolInfo"/> is used.
+        /// Set to true if the <see cref="MemoryPoolState"/> is used.
         /// </summary>
         [MarshalAs(UnmanagedType.I1)]
         public bool IsUsed;
 
-        public static unsafe MemoryPoolInfo* Null => (MemoryPoolInfo*)nint.Zero.ToPointer();
+        public static unsafe MemoryPoolState* Null => (MemoryPoolState*)nint.Zero.ToPointer();
 
         /// <summary>
-        /// Create a new <see cref="MemoryPoolInfo"/> with the given <see cref="LocationType"/>.
+        /// Create a new <see cref="MemoryPoolState"/> with the given <see cref="LocationType"/>.
         /// </summary>
         /// <param name="location">The location type to use.</param>
-        /// <returns>A new <see cref="MemoryPoolInfo"/> with the given <see cref="LocationType"/>.</returns>
+        /// <returns>A new <see cref="MemoryPoolState"/> with the given <see cref="LocationType"/>.</returns>
-        public static MemoryPoolInfo Create(LocationType location)
+        public static MemoryPoolState Create(LocationType location)
         {
-            return new MemoryPoolInfo
+            return new MemoryPoolState
             {
                 CpuAddress = 0,
                 DspAddress = 0,
@@ -73,7 +73,7 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
         }
 
         /// <summary>
-        /// Set the <see cref="CpuAddress"/> and size of the <see cref="MemoryPoolInfo"/>.
+        /// Set the <see cref="CpuAddress"/> and size of the <see cref="MemoryPoolState"/>.
         /// </summary>
         /// <param name="cpuAddress">The <see cref="CpuAddress"/>.</param>
         /// <param name="size">The size.</param>
@@ -84,11 +84,11 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
         }
 
         /// <summary>
-        /// Check if the given <see cref="CpuAddress"/> and size is contains in the <see cref="MemoryPoolInfo"/>.
+        /// Check if the given <see cref="CpuAddress"/> and size is contains in the <see cref="MemoryPoolState"/>.
         /// </summary>
         /// <param name="targetCpuAddress">The <see cref="CpuAddress"/>.</param>
         /// <param name="size">The size.</param>
-        /// <returns>True if the <see cref="CpuAddress"/> is contained inside the <see cref="MemoryPoolInfo"/>.</returns>
+        /// <returns>True if the <see cref="CpuAddress"/> is contained inside the <see cref="MemoryPoolState"/>.</returns>
         public readonly bool Contains(CpuAddress targetCpuAddress, ulong size)
         {
             if (CpuAddress <= targetCpuAddress && size + targetCpuAddress <= Size + CpuAddress)
@@ -118,9 +118,9 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
         }
 
         /// <summary>
-        /// Is the <see cref="MemoryPoolInfo"/> mapped on the DSP?
+        /// Is the <see cref="MemoryPoolState"/> mapped on the DSP?
         /// </summary>
-        /// <returns>Returns true if the <see cref="MemoryPoolInfo"/> is mapped on the DSP.</returns>
+        /// <returns>Returns true if the <see cref="MemoryPoolState"/> is mapped on the DSP.</returns>
         public readonly bool IsMapped()
         {
             return DspAddress != 0;

src/Ryujinx.Audio/Renderer/Server/MemoryPool/PoolMapper.cs

@@ -18,7 +18,7 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
         const uint CurrentProcessPseudoHandle = 0xFFFF8001;
 
         /// <summary>
-        /// The result of <see cref="Update(ref MemoryPoolInfo, ref MemoryPoolInParameter, ref MemoryPoolOutStatus)"/>.
+        /// The result of <see cref="Update(ref MemoryPoolState, ref MemoryPoolInParameter, ref MemoryPoolOutStatus)"/>.
         /// </summary>
         public enum UpdateResult : uint
         {
@@ -49,9 +49,9 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
         private readonly uint _processHandle;
 
         /// <summary>
-        /// The <see cref="Memory{MemoryPoolInfo}"/> that will be manipulated.
+        /// The <see cref="Memory{MemoryPoolState}"/> that will be manipulated.
         /// </summary>
-        private readonly Memory<MemoryPoolInfo> _memoryPools;
+        private readonly Memory<MemoryPoolState> _memoryPools;
 
         /// <summary>
         /// If set to true, this will try to force map memory pool even if their state are considered invalid.
@@ -67,7 +67,7 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
         {
             _processHandle = processHandle;
             _isForceMapEnabled = isForceMapEnabled;
-            _memoryPools = Memory<MemoryPoolInfo>.Empty;
+            _memoryPools = Memory<MemoryPoolState>.Empty;
         }
 
         /// <summary>
@@ -76,7 +76,7 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
         /// <param name="processHandle">The handle of the process owning the CPU memory manipulated.</param>
         /// <param name="memoryPool">The user memory pools.</param>
         /// <param name="isForceMapEnabled">If set to true, this will try to force map memory pool even if their state are considered invalid.</param>
-        public PoolMapper(uint processHandle, Memory<MemoryPoolInfo> memoryPool, bool isForceMapEnabled)
+        public PoolMapper(uint processHandle, Memory<MemoryPoolState> memoryPool, bool isForceMapEnabled)
         {
             _processHandle = processHandle;
             _memoryPools = memoryPool;
@@ -84,15 +84,15 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
         }
 
         /// <summary>
-        /// Initialize the <see cref="MemoryPoolInfo"/> for system use.
+        /// Initialize the <see cref="MemoryPoolState"/> for system use.
         /// </summary>
-        /// <param name="memoryPool">The <see cref="MemoryPoolInfo"/> for system use.</param>
+        /// <param name="memoryPool">The <see cref="MemoryPoolState"/> for system use.</param>
         /// <param name="cpuAddress">The <see cref="CpuAddress"/> to assign.</param>
         /// <param name="size">The size to assign.</param>
         /// <returns>Returns true if mapping on the <see cref="Dsp.AudioProcessor"/> succeeded.</returns>
-        public bool InitializeSystemPool(ref MemoryPoolInfo memoryPool, CpuAddress cpuAddress, ulong size)
+        public bool InitializeSystemPool(ref MemoryPoolState memoryPool, CpuAddress cpuAddress, ulong size)
         {
-            if (memoryPool.Location != MemoryPoolInfo.LocationType.Dsp)
+            if (memoryPool.Location != MemoryPoolState.LocationType.Dsp)
             {
                 return false;
             }
@@ -101,13 +101,13 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
         }
 
         /// <summary>
-        /// Initialize the <see cref="MemoryPoolInfo"/>.
+        /// Initialize the <see cref="MemoryPoolState"/>.
         /// </summary>
-        /// <param name="memoryPool">The <see cref="MemoryPoolInfo"/>.</param>
+        /// <param name="memoryPool">The <see cref="MemoryPoolState"/>.</param>
         /// <param name="cpuAddress">The <see cref="CpuAddress"/> to assign.</param>
         /// <param name="size">The size to assign.</param>
         /// <returns>Returns true if mapping on the <see cref="Dsp.AudioProcessor"/> succeeded.</returns>
-        public bool InitializePool(ref MemoryPoolInfo memoryPool, CpuAddress cpuAddress, ulong size)
+        public bool InitializePool(ref MemoryPoolState memoryPool, CpuAddress cpuAddress, ulong size)
         {
             memoryPool.SetCpuAddress(cpuAddress, size);
 
@@ -115,18 +115,18 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
         }
 
         /// <summary>
-        /// Get the process handle associated to the <see cref="MemoryPoolInfo"/>.
+        /// Get the process handle associated to the <see cref="MemoryPoolState"/>.
         /// </summary>
-        /// <param name="memoryPool">The <see cref="MemoryPoolInfo"/>.</param>
+        /// <param name="memoryPool">The <see cref="MemoryPoolState"/>.</param>
-        /// <returns>Returns the process handle associated to the <see cref="MemoryPoolInfo"/>.</returns>
+        /// <returns>Returns the process handle associated to the <see cref="MemoryPoolState"/>.</returns>
-        public uint GetProcessHandle(ref MemoryPoolInfo memoryPool)
+        public uint GetProcessHandle(ref MemoryPoolState memoryPool)
         {
-            if (memoryPool.Location == MemoryPoolInfo.LocationType.Cpu)
+            if (memoryPool.Location == MemoryPoolState.LocationType.Cpu)
             {
                 return CurrentProcessPseudoHandle;
             }
 
-            if (memoryPool.Location == MemoryPoolInfo.LocationType.Dsp)
+            if (memoryPool.Location == MemoryPoolState.LocationType.Dsp)
             {
                 return _processHandle;
             }
@@ -135,11 +135,11 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
         }
 
         /// <summary>
-        /// Map the <see cref="MemoryPoolInfo"/> on the <see cref="Dsp.AudioProcessor"/>.
+        /// Map the <see cref="MemoryPoolState"/> on the <see cref="Dsp.AudioProcessor"/>.
         /// </summary>
-        /// <param name="memoryPool">The <see cref="MemoryPoolInfo"/> to map.</param>
+        /// <param name="memoryPool">The <see cref="MemoryPoolState"/> to map.</param>
         /// <returns>Returns the DSP address mapped.</returns>
-        public DspAddress Map(ref MemoryPoolInfo memoryPool)
+        public DspAddress Map(ref MemoryPoolState memoryPool)
         {
             DspAddress result = AudioProcessorMemoryManager.Map(GetProcessHandle(ref memoryPool), memoryPool.CpuAddress, memoryPool.Size);
 
@@ -152,11 +152,11 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
         }
 
         /// <summary>
-        /// Unmap the <see cref="MemoryPoolInfo"/> from the <see cref="Dsp.AudioProcessor"/>.
+        /// Unmap the <see cref="MemoryPoolState"/> from the <see cref="Dsp.AudioProcessor"/>.
         /// </summary>
-        /// <param name="memoryPool">The <see cref="MemoryPoolInfo"/> to unmap.</param>
+        /// <param name="memoryPool">The <see cref="MemoryPoolState"/> to unmap.</param>
         /// <returns>Returns true if unmapped.</returns>
-        public bool Unmap(ref MemoryPoolInfo memoryPool)
+        public bool Unmap(ref MemoryPoolState memoryPool)
         {
             if (memoryPool.IsUsed)
             {
@@ -172,12 +172,12 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
         }
 
         /// <summary>
-        /// Find a <see cref="MemoryPoolInfo"/> associated to the region given.
+        /// Find a <see cref="MemoryPoolState"/> associated to the region given.
         /// </summary>
         /// <param name="cpuAddress">The region <see cref="CpuAddress"/>.</param>
         /// <param name="size">The region size.</param>
-        /// <returns>Returns the <see cref="MemoryPoolInfo"/> found or <see cref="Memory{MemoryPoolInfo}.Empty"/> if not found.</returns>
+        /// <returns>Returns the <see cref="MemoryPoolState"/> found or <see cref="Memory{MemoryPoolState}.Empty"/> if not found.</returns>
-        private Span<MemoryPoolInfo> FindMemoryPool(CpuAddress cpuAddress, ulong size)
+        private Span<MemoryPoolState> FindMemoryPool(CpuAddress cpuAddress, ulong size)
         {
             if (!_memoryPools.IsEmpty && _memoryPools.Length > 0)
             {
@@ -190,7 +190,7 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
                 }
             }
 
-            return Span<MemoryPoolInfo>.Empty;
+            return Span<MemoryPoolState>.Empty;
         }
 
         /// <summary>
@@ -201,7 +201,7 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
         {
             if (_isForceMapEnabled)
             {
-                Span<MemoryPoolInfo> memoryPool = FindMemoryPool(addressInfo.CpuAddress, addressInfo.Size);
+                Span<MemoryPoolState> memoryPool = FindMemoryPool(addressInfo.CpuAddress, addressInfo.Size);
 
                 if (!memoryPool.IsEmpty)
                 {
@@ -243,13 +243,13 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
         }
 
         /// <summary>
-        /// Update a <see cref="MemoryPoolInfo"/> using user parameters.
+        /// Update a <see cref="MemoryPoolState"/> using user parameters.
         /// </summary>
-        /// <param name="memoryPool">The <see cref="MemoryPoolInfo"/> to update.</param>
+        /// <param name="memoryPool">The <see cref="MemoryPoolState"/> to update.</param>
         /// <param name="inParameter">Input user parameter.</param>
         /// <param name="outStatus">Output user parameter.</param>
         /// <returns>Returns the <see cref="UpdateResult"/> of the operations performed.</returns>
-        public UpdateResult Update(ref MemoryPoolInfo memoryPool, in MemoryPoolInParameter inParameter, ref MemoryPoolOutStatus outStatus)
+        public UpdateResult Update(ref MemoryPoolState memoryPool, in MemoryPoolInParameter inParameter, ref MemoryPoolOutStatus outStatus)
         {
             MemoryPoolUserState inputState = inParameter.State;
 
@@ -321,7 +321,7 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
 
             if (_memoryPools.Length > 0)
             {
-                Span<MemoryPoolInfo> memoryPool = FindMemoryPool(addressInfo.CpuAddress, addressInfo.Size);
+                Span<MemoryPoolState> memoryPool = FindMemoryPool(addressInfo.CpuAddress, addressInfo.Size);
 
                 if (!memoryPool.IsEmpty)
                 {
@@ -343,7 +343,7 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
             {
                 unsafe
                 {
-                    addressInfo.SetupMemoryPool(MemoryPoolInfo.Null);
+                    addressInfo.SetupMemoryPool(MemoryPoolState.Null);
                 }
             }
 
@@ -351,12 +351,12 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
         }
 
         /// <summary>
-        /// Remove the usage flag from all the <see cref="MemoryPoolInfo"/>.
+        /// Remove the usage flag from all the <see cref="MemoryPoolState"/>.
         /// </summary>
-        /// <param name="memoryPool">The <see cref="Memory{MemoryPoolInfo}"/> to reset.</param>
+        /// <param name="memoryPool">The <see cref="Memory{MemoryPoolState}"/> to reset.</param>
-        public static void ClearUsageState(Memory<MemoryPoolInfo> memoryPool)
+        public static void ClearUsageState(Memory<MemoryPoolState> memoryPool)
         {
-            foreach (ref MemoryPoolInfo info in memoryPool.Span)
+            foreach (ref MemoryPoolState info in memoryPool.Span)
             {
                 info.IsUsed = false;
             }

src/Ryujinx.Audio/Renderer/Server/Mix/MixContext.cs

@@ -17,12 +17,12 @@ namespace Ryujinx.Audio.Renderer.Server.Mix
         private uint _mixesCount;
 
         /// <summary>
-        /// Storage for <see cref="MixInfo"/>.
+        /// Storage for <see cref="MixState"/>.
         /// </summary>
-        private Memory<MixInfo> _mixes;
+        private Memory<MixState> _mixes;
 
         /// <summary>
-        /// Storage of the sorted indices to <see cref="MixInfo"/>.
+        /// Storage of the sorted indices to <see cref="MixState"/>.
         /// </summary>
         private Memory<int> _sortedMixes;
 
@@ -49,10 +49,10 @@ namespace Ryujinx.Audio.Renderer.Server.Mix
         /// Initialize the <see cref="MixContext"/>.
         /// </summary>
         /// <param name="sortedMixes">The storage for sorted indices.</param>
-        /// <param name="mixes">The storage of <see cref="MixInfo"/>.</param>
+        /// <param name="mixes">The storage of <see cref="MixState"/>.</param>
         /// <param name="nodeStatesWorkBuffer">The storage used for the <see cref="NodeStates"/>.</param>
         /// <param name="edgeMatrixWorkBuffer">The storage used for the <see cref="EdgeMatrix"/>.</param>
-        public void Initialize(Memory<int> sortedMixes, Memory<MixInfo> mixes, Memory<byte> nodeStatesWorkBuffer, Memory<byte> edgeMatrixWorkBuffer)
+        public void Initialize(Memory<int> sortedMixes, Memory<MixState> mixes, Memory<byte> nodeStatesWorkBuffer, Memory<byte> edgeMatrixWorkBuffer)
         {
             _mixesCount = (uint)mixes.Length;
             _mixes = mixes;
@@ -82,30 +82,30 @@ namespace Ryujinx.Audio.Renderer.Server.Mix
         }
 
         /// <summary>
-        /// Get a reference to the final <see cref="MixInfo"/>.
+        /// Get a reference to the final <see cref="MixState"/>.
         /// </summary>
-        /// <returns>A reference to the final <see cref="MixInfo"/>.</returns>
+        /// <returns>A reference to the final <see cref="MixState"/>.</returns>
-        public ref MixInfo GetFinalState()
+        public ref MixState GetFinalState()
         {
             return ref GetState(Constants.FinalMixId);
         }
 
         /// <summary>
-        /// Get a reference to a <see cref="MixInfo"/> at the given <paramref name="id"/>.
+        /// Get a reference to a <see cref="MixState"/> at the given <paramref name="id"/>.
         /// </summary>
         /// <param name="id">The index to use.</param>
-        /// <returns>A reference to a <see cref="MixInfo"/> at the given <paramref name="id"/>.</returns>
+        /// <returns>A reference to a <see cref="MixState"/> at the given <paramref name="id"/>.</returns>
-        public ref MixInfo GetState(int id)
+        public ref MixState GetState(int id)
         {
             return ref SpanIOHelper.GetFromMemory(_mixes, id, _mixesCount);
         }
 
         /// <summary>
-        /// Get a reference to a <see cref="MixInfo"/> at the given <paramref name="id"/> of the sorted mix info.
+        /// Get a reference to a <see cref="MixState"/> at the given <paramref name="id"/> of the sorted mix info.
         /// </summary>
         /// <param name="id">The index to use.</param>
-        /// <returns>A reference to a <see cref="MixInfo"/> at the given <paramref name="id"/>.</returns>
+        /// <returns>A reference to a <see cref="MixState"/> at the given <paramref name="id"/>.</returns>
-        public ref MixInfo GetSortedState(int id)
+        public ref MixState GetSortedState(int id)
         {
             Debug.Assert(id >= 0 && id < _mixesCount);
 
@@ -122,18 +122,18 @@ namespace Ryujinx.Audio.Renderer.Server.Mix
         }
 
         /// <summary>
-        /// Update the internal distance from the final mix value of every <see cref="MixInfo"/>.
+        /// Update the internal distance from the final mix value of every <see cref="MixState"/>.
         /// </summary>
         private void UpdateDistancesFromFinalMix()
         {
-            foreach (ref MixInfo mix in _mixes.Span)
+            foreach (ref MixState mix in _mixes.Span)
             {
                 mix.ClearDistanceFromFinalMix();
             }
 
             for (int i = 0; i < GetCount(); i++)
             {
-                ref MixInfo mix = ref GetState(i);
+                ref MixState mix = ref GetState(i);
 
                 SetSortedState(i, i);
 
@@ -149,13 +149,13 @@ namespace Ryujinx.Audio.Renderer.Server.Mix
                         {
                             if (mixId == Constants.UnusedMixId)
                             {
-                                distance = MixInfo.InvalidDistanceFromFinalMix;
+                                distance = MixState.InvalidDistanceFromFinalMix;
                                 break;
                             }
 
-                            ref MixInfo distanceMix = ref GetState(mixId);
+                            ref MixState distanceMix = ref GetState(mixId);
 
-                            if (distanceMix.DistanceFromFinalMix != MixInfo.InvalidDistanceFromFinalMix)
+                            if (distanceMix.DistanceFromFinalMix != MixState.InvalidDistanceFromFinalMix)
                             {
                                 distance = distanceMix.DistanceFromFinalMix + 1;
                                 break;
@@ -171,12 +171,12 @@ namespace Ryujinx.Audio.Renderer.Server.Mix
 
                         if (distance > GetCount())
                         {
-                            distance = MixInfo.InvalidDistanceFromFinalMix;
+                            distance = MixState.InvalidDistanceFromFinalMix;
                         }
                     }
                     else
                     {
-                        distance = MixInfo.InvalidDistanceFromFinalMix;
+                        distance = MixState.InvalidDistanceFromFinalMix;
                     }
 
                     mix.DistanceFromFinalMix = distance;
@@ -185,13 +185,13 @@ namespace Ryujinx.Audio.Renderer.Server.Mix
         }
 
         /// <summary>
-        /// Update the internal mix buffer offset of all <see cref="MixInfo"/>.
+        /// Update the internal mix buffer offset of all <see cref="MixState"/>.
         /// </summary>
         private void UpdateMixBufferOffset()
         {
             uint offset = 0;
 
-            foreach (ref MixInfo mix in _mixes.Span)
+            foreach (ref MixState mix in _mixes.Span)
             {
                 mix.BufferOffset = offset;
 
@@ -210,10 +210,10 @@ namespace Ryujinx.Audio.Renderer.Server.Mix
 
             Array.Sort(sortedMixesTemp, (a, b) =>
             {
-                ref MixInfo infoA = ref GetState(a);
+                ref MixState stateA = ref GetState(a);
-                ref MixInfo infoB = ref GetState(b);
+                ref MixState stateB = ref GetState(b);
 
-                return infoB.DistanceFromFinalMix.CompareTo(infoA.DistanceFromFinalMix);
+                return stateB.DistanceFromFinalMix.CompareTo(stateA.DistanceFromFinalMix);
             });
 
             sortedMixesTemp.AsSpan().CopyTo(_sortedMixes.Span);

src/Ryujinx.Audio/Renderer/Server/Mix/MixState.cs

@@ -15,7 +15,7 @@ namespace Ryujinx.Audio.Renderer.Server.Mix
     /// Server state for a mix.
     /// </summary>
     [StructLayout(LayoutKind.Sequential, Size = 0x940, Pack = Alignment)]
-    public struct MixInfo
+    public struct MixState
     {
         public const uint InvalidDistanceFromFinalMix = 0x80000000;
 
@@ -136,11 +136,11 @@ namespace Ryujinx.Audio.Renderer.Server.Mix
         }
 
         /// <summary>
-        /// Create a new <see cref="MixInfo"/>
+        /// Create a new <see cref="MixState"/>
         /// </summary>
         /// <param name="effectProcessingOrderArray"></param>
-        /// <param name="behaviourInfo"></param>
+        /// <param name="behaviourContext"></param>
-        public MixInfo(Memory<int> effectProcessingOrderArray, ref BehaviourInfo behaviourInfo) : this()
+        public MixState(Memory<int> effectProcessingOrderArray, ref BehaviourContext behaviourContext) : this()
         {
             MixId = UnusedMixId;
 
@@ -158,7 +158,7 @@ namespace Ryujinx.Audio.Renderer.Server.Mix
 
             EffectProcessingOrderArrayMaxCount = (uint)effectProcessingOrderArray.Length;
 
-            IsLongSizePreDelaySupported = behaviourInfo.IsLongSizePreDelaySupported();
+            IsLongSizePreDelaySupported = behaviourContext.IsLongSizePreDelaySupported();
 
             ClearEffectProcessingOrder();
         }
@@ -257,9 +257,9 @@ namespace Ryujinx.Audio.Renderer.Server.Mix
         /// <param name="parameter">The input parameter of the mix.</param>
         /// <param name="effectContext">The effect context.</param>
         /// <param name="splitterContext">The splitter context.</param>
-        /// <param name="behaviourInfo">The behaviour context.</param>
+        /// <param name="behaviourContext">The behaviour context.</param>
         /// <returns>Return true if the mix was changed.</returns>
-        public bool Update(EdgeMatrix edgeMatrix, in MixParameter parameter, EffectContext effectContext, SplitterContext splitterContext, BehaviourInfo behaviourInfo)
+        public bool Update(EdgeMatrix edgeMatrix, in MixParameter parameter, EffectContext effectContext, SplitterContext splitterContext, BehaviourContext behaviourContext)
         {
             bool isDirty;
 
@@ -271,7 +271,7 @@ namespace Ryujinx.Audio.Renderer.Server.Mix
             NodeId = parameter.NodeId;
             parameter.MixBufferVolume.CopyTo(MixBufferVolume);
 
-            if (behaviourInfo.IsSplitterSupported())
+            if (behaviourContext.IsSplitterSupported())
             {
                 isDirty = UpdateConnection(edgeMatrix, in parameter, ref splitterContext);
             }
@@ -279,7 +279,10 @@ namespace Ryujinx.Audio.Renderer.Server.Mix
             {
                 isDirty = DestinationMixId != parameter.DestinationMixId;
 
+                if (DestinationMixId != parameter.DestinationMixId)
+                {
                     DestinationMixId = parameter.DestinationMixId;
+                }
 
                 DestinationSplitterId = UnusedSplitterId;
             }

src/Ryujinx.Audio/Renderer/Server/Performance/PerformanceManager.cs

@@ -10,11 +10,11 @@ namespace Ryujinx.Audio.Renderer.Server.Performance
         /// Get the required size for a single performance frame.
         /// </summary>
         /// <param name="parameter">The audio renderer configuration.</param>
-        /// <param name="behaviourInfo">The behaviour context.</param>
+        /// <param name="behaviourContext">The behaviour context.</param>
         /// <returns>The required size for a single performance frame.</returns>
-        public static ulong GetRequiredBufferSizeForPerformanceMetricsPerFrame(ref AudioRendererConfiguration parameter, ref BehaviourInfo behaviourInfo)
+        public static ulong GetRequiredBufferSizeForPerformanceMetricsPerFrame(ref AudioRendererConfiguration parameter, ref BehaviourContext behaviourContext)
         {
-            uint version = behaviourInfo.GetPerformanceMetricsDataFormat();
+            uint version = behaviourContext.GetPerformanceMetricsDataFormat();
 
             if (version == 2)
             {
@@ -81,11 +81,11 @@ namespace Ryujinx.Audio.Renderer.Server.Performance
         /// </summary>
         /// <param name="performanceBuffer">The backing memory available for use by the manager.</param>
         /// <param name="parameter">The audio renderer configuration.</param>
-        /// <param name="behaviourInfo">The behaviour context;</param>
+        /// <param name="behaviourContext">The behaviour context;</param>
         /// <returns>A new <see cref="PerformanceManager"/>.</returns>
-        public static PerformanceManager Create(Memory<byte> performanceBuffer, ref AudioRendererConfiguration parameter, BehaviourInfo behaviourInfo)
+        public static PerformanceManager Create(Memory<byte> performanceBuffer, ref AudioRendererConfiguration parameter, BehaviourContext behaviourContext)
         {
-            uint version = behaviourInfo.GetPerformanceMetricsDataFormat();
+            uint version = behaviourContext.GetPerformanceMetricsDataFormat();
 
             return version switch
             {

src/Ryujinx.Audio/Renderer/Server/RendererSystemContext.cs

@@ -1,4 +1,3 @@
-using Ryujinx.Audio.Renderer.Server.Mix;
 using Ryujinx.Audio.Renderer.Server.Upsampler;
 using System;
 
@@ -20,7 +19,7 @@ namespace Ryujinx.Audio.Renderer.Server
         /// <summary>
         /// The target channel count for sink.
         /// </summary>
-        /// <remarks>See <see cref="CommandGenerator.GenerateDevice(Sink.DeviceSink, ref MixInfo)"/> for usage.</remarks>
+        /// <remarks>See <see cref="CommandGenerator.GenerateDevice(Sink.DeviceSink, ref Mix.MixState)"/> for usage.</remarks>
         public uint ChannelCount;
 
         /// <summary>
@@ -29,12 +28,12 @@ namespace Ryujinx.Audio.Renderer.Server
         public uint MixBufferCount;
 
         /// <summary>
-        /// Instance of the <see cref="BehaviourInfo"/> used to derive bug fixes and features of the current audio renderer revision.
+        /// Instance of the <see cref="BehaviourContext"/> used to derive bug fixes and features of the current audio renderer revision.
         /// </summary>
-        public BehaviourInfo BehaviourInfo;
+        public BehaviourContext BehaviourContext;
 
         /// <summary>
-        /// Instance of the <see cref="UpsamplerManager"/> used for upsampling (see <see cref="UpsamplerInfo"/>)
+        /// Instance of the <see cref="UpsamplerManager"/> used for upsampling (see <see cref="UpsamplerState"/>)
         /// </summary>
         public UpsamplerManager UpsamplerManager;
 

src/Ryujinx.Audio/Renderer/Server/Sink/DeviceSink.cs

@@ -28,7 +28,7 @@ namespace Ryujinx.Audio.Renderer.Server.Sink
         /// The upsampler instance used by this sink.
         /// </summary>
         /// <remarks>Null if no upsampling is needed.</remarks>
-        public UpsamplerInfo UpsamplerInfo;
+        public UpsamplerState UpsamplerState;
 
         /// <summary>
         /// Create a new <see cref="DeviceSink"/>.
@@ -40,9 +40,9 @@ namespace Ryujinx.Audio.Renderer.Server.Sink
 
         public override void CleanUp()
         {
-            UpsamplerInfo?.Release();
+            UpsamplerState?.Release();
 
-            UpsamplerInfo = null;
+            UpsamplerState = null;
 
             base.CleanUp();
         }

src/Ryujinx.Audio/Renderer/Server/Splitter/SplitterContext.cs

@@ -56,26 +56,21 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
         /// </summary>
         public bool IsSplitterPrevVolumeResetSupported { get; private set; }
 
-        /// <summary>
-        /// If set to true, the previous mix volume is explicitly resetted using the input parameter, instead of implicitly on first use.
-        /// </summary>
-        public bool IsBiquadFilterParameterFloatSupported { get; private set; }
-
         /// <summary>
         /// Initialize <see cref="SplitterContext"/>.
         /// </summary>
-        /// <param name="behaviourInfo">The behaviour context.</param>
+        /// <param name="behaviourContext">The behaviour context.</param>
         /// <param name="parameter">The audio renderer configuration.</param>
         /// <param name="workBufferAllocator">The <see cref="WorkBufferAllocator"/>.</param>
         /// <param name="splitterBqfStates">Memory to store the biquad filtering state for splitters during processing.</param>
         /// <returns>Return true if the initialization was successful.</returns>
         public bool Initialize(
-            ref BehaviourInfo behaviourInfo,
+            ref BehaviourContext behaviourContext,
             ref AudioRendererConfiguration parameter,
             WorkBufferAllocator workBufferAllocator,
             Memory<BiquadFilterState> splitterBqfStates)
         {
-            if (!behaviourInfo.IsSplitterSupported() || parameter.SplitterCount <= 0 || parameter.SplitterDestinationCount <= 0)
+            if (!behaviourContext.IsSplitterSupported() || parameter.SplitterCount <= 0 || parameter.SplitterDestinationCount <= 0)
             {
                 Setup(Memory<SplitterState>.Empty, Memory<SplitterDestinationVersion1>.Empty, Memory<SplitterDestinationVersion2>.Empty, false);
 
@@ -99,7 +94,7 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
             Memory<SplitterDestinationVersion1> splitterDestinationsV1 = Memory<SplitterDestinationVersion1>.Empty;
             Memory<SplitterDestinationVersion2> splitterDestinationsV2 = Memory<SplitterDestinationVersion2>.Empty;
 
-            if (!behaviourInfo.IsBiquadFilterParameterForSplitterEnabled())
+            if (!behaviourContext.IsBiquadFilterParameterForSplitterEnabled())
             {
                 Version = 1;
 
@@ -149,12 +144,11 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
                 }
             }
 
-            IsSplitterPrevVolumeResetSupported = behaviourInfo.IsSplitterPrevVolumeResetSupported();
+            IsSplitterPrevVolumeResetSupported = behaviourContext.IsSplitterPrevVolumeResetSupported();
-            IsBiquadFilterParameterFloatSupported = behaviourInfo.IsBiquadFilterParameterFloatSupported();
 
             SplitterState.InitializeSplitters(splitters.Span);
 
-            Setup(splitters, splitterDestinationsV1, splitterDestinationsV2, behaviourInfo.IsSplitterBugFixed());
+            Setup(splitters, splitterDestinationsV1, splitterDestinationsV2, behaviourContext.IsSplitterBugFixed());
 
             return true;
         }
@@ -163,16 +157,16 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
         /// Get the work buffer size while adding the size needed for splitter to operate.
         /// </summary>
         /// <param name="size">The current size.</param>
-        /// <param name="behaviourInfo">The behaviour context.</param>
+        /// <param name="behaviourContext">The behaviour context.</param>
         /// <param name="parameter">The renderer configuration.</param>
         /// <returns>Return the new size taking splitter into account.</returns>
-        public static ulong GetWorkBufferSize(ulong size, ref BehaviourInfo behaviourInfo, ref AudioRendererConfiguration parameter)
+        public static ulong GetWorkBufferSize(ulong size, ref BehaviourContext behaviourContext, ref AudioRendererConfiguration parameter)
         {
-            if (behaviourInfo.IsSplitterSupported())
+            if (behaviourContext.IsSplitterSupported())
             {
                 size = WorkBufferAllocator.GetTargetSize<SplitterState>(size, parameter.SplitterCount, SplitterState.Alignment);
 
-                if (behaviourInfo.IsBiquadFilterParameterForSplitterEnabled())
+                if (behaviourContext.IsBiquadFilterParameterForSplitterEnabled())
                 {
                     size = WorkBufferAllocator.GetTargetSize<SplitterDestinationVersion2>(size, parameter.SplitterDestinationCount, SplitterDestinationVersion2.Alignment);
                 }
@@ -181,10 +175,12 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
                     size = WorkBufferAllocator.GetTargetSize<SplitterDestinationVersion1>(size, parameter.SplitterDestinationCount, SplitterDestinationVersion1.Alignment);
                 }
 
-                if (behaviourInfo.IsSplitterBugFixed())
+                if (behaviourContext.IsSplitterBugFixed())
                 {
                     size = WorkBufferAllocator.GetTargetSize<int>(size, parameter.SplitterDestinationCount, 0x10);
                 }
+
+                return size;
             }
 
             return size;
@@ -231,16 +227,7 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
                 return 0;
             }
 
-            int length;
+            int length = _splitterDestinationsV2.IsEmpty ? _splitterDestinationsV1.Length : _splitterDestinationsV2.Length;
-
-            if (_splitterDestinationsV2.IsEmpty)
-            {
-                length = _splitterDestinationsV1.Length;
-            }
-            else
-            {
-                length = _splitterDestinationsV2.Length;
-            }
 
             return length / _splitters.Length;
         }
@@ -291,16 +278,7 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
 
             if (parameter.IsMagicValid())
             {
-                int length;
+                int length = _splitterDestinationsV2.IsEmpty ? _splitterDestinationsV1.Length : _splitterDestinationsV2.Length;
-
-                if (_splitterDestinationsV2.IsEmpty)
-                {
-                    length = _splitterDestinationsV1.Length;
-                }
-                else
-                {
-                    length = _splitterDestinationsV2.Length;
-                }
 
                 if (parameter.Id >= 0 && parameter.Id < length)
                 {
@@ -337,22 +315,12 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
                 }
                 else if (Version == 2)
                 {
-                    if (IsBiquadFilterParameterFloatSupported)
+                    if (!UpdateData<SplitterDestinationInParameterVersion2>(ref input))
-                    {
-                        if (!UpdateData<SplitterDestinationInParameterVersion2b>(ref input))
                     {
                         break;
                     }
                 }
                 else
-                    {
-                        if (!UpdateData<SplitterDestinationInParameterVersion2a>(ref input))
-                        {
-                            break;
-                        }
-                    }
-                }
-                else
                 {
                     Debug.Fail($"Invalid splitter context version {Version}.");
                 }
@@ -413,9 +381,11 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
             {
                 return new SplitterDestination(ref SpanIOHelper.GetFromMemory(_splitterDestinationsV1, id, (uint)_splitterDestinationsV1.Length));
             }
-                
+            else
+            {
                 return new SplitterDestination(ref SpanIOHelper.GetFromMemory(_splitterDestinationsV2, id, (uint)_splitterDestinationsV2.Length));
             }
+        }
 
         /// <summary>
         /// Get a <see cref="SplitterDestination"/> in the <see cref="SplitterState"/> at <paramref name="id"/> and pass <paramref name="destinationId"/> to <see cref="SplitterState.GetData(int)"/>.

src/Ryujinx.Audio/Renderer/Server/Splitter/SplitterDestination.cs

@@ -31,13 +31,17 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
                     {
                         return 0;
                     }
-                    
+                    else
+                    {
                         return _v1.Id;
                     }
-                
+                }
+                else
+                {
                     return _v2.Id;
                 }
             }
+        }
 
         /// <summary>
         /// The mix to output the result of the splitter.
@@ -52,13 +56,17 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
                     {
                         return 0;
                     }
-                    
+                    else
+                    {
                         return _v1.DestinationId;
                     }
-                
+                }
+                else
+                {
                     return _v2.DestinationId;
                 }
             }
+        }
 
         /// <summary>
         /// Mix buffer volumes.
@@ -74,13 +82,17 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
                     {
                         return Span<float>.Empty;
                     }
-                    
+                    else
+                    {
                         return _v1.MixBufferVolume;
                     }
-                
+                }
+                else
+                {
                     return _v2.MixBufferVolume;
                 }
             }
+        }
 
         /// <summary>
         /// Previous mix buffer volumes.
@@ -96,13 +108,17 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
                     {
                         return Span<float>.Empty;
                     }
-                    
+                    else
+                    {
                         return _v1.PreviousMixBufferVolume;
                     }
-                
+                }
+                else
+                {
                     return _v2.PreviousMixBufferVolume;
                 }
             }
+        }
 
         /// <summary>
         /// Get the <see cref="SplitterDestination"/> of the next element or null if not present.
@@ -119,14 +135,18 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
                         {
                             return new SplitterDestination();
                         }
-                        
+                        else
+                        {
                             return new SplitterDestination(ref _v1.Next);
                         }
-                    
+                    }
+                    else
+                    {
                         return new SplitterDestination(ref _v2.Next);
                     }
                 }
             }
+        }
 
         /// <summary>
         /// Creates a new splitter destination wrapper for the version 1 splitter destination data.
@@ -149,7 +169,6 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
             _v2 = ref v2;
         }
 
-
         /// <summary>
         /// Creates a new splitter destination wrapper for the splitter destination data.
         /// </summary>
@@ -214,12 +233,7 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
         /// <returns>True if the splitter destination is used and has a destination.</returns>
         public readonly bool IsConfigured()
         {
-            if (Unsafe.IsNullRef(ref _v2))
+            return Unsafe.IsNullRef(ref _v2) ? _v1.IsConfigured() : _v2.IsConfigured();
-            {
-                return _v1.IsConfigured();
-            }
-                
-            return _v2.IsConfigured();
         }
 
         /// <summary>
@@ -229,12 +243,7 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
         /// <returns>The volume for the given destination.</returns>
         public float GetMixVolume(int destinationIndex)
         {
-            if (Unsafe.IsNullRef(ref _v2))
+            return Unsafe.IsNullRef(ref _v2) ? _v1.GetMixVolume(destinationIndex) : _v2.GetMixVolume(destinationIndex);
-            {
-                return _v1.GetMixVolume(destinationIndex);
-            }
-                
-            return _v2.GetMixVolume(destinationIndex);
         }
 
         /// <summary>
@@ -244,12 +253,7 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
         /// <returns>The volume for the given destination.</returns>
         public float GetMixVolumePrev(int destinationIndex)
         {
-            if (Unsafe.IsNullRef(ref _v2))
+            return Unsafe.IsNullRef(ref _v2) ? _v1.GetMixVolumePrev(destinationIndex) : _v2.GetMixVolumePrev(destinationIndex);
-            {
-                return _v1.GetMixVolumePrev(destinationIndex);
-            }
-                
-            return _v2.GetMixVolumePrev(destinationIndex);
         }
 
         /// <summary>
@@ -304,7 +308,6 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
 
         /// <summary>
         /// Checks if any biquad filter is enabled.
-        /// Virtual function at function table + 0x8.
         /// </summary>
         /// <returns>True if any biquad filter is enabled.</returns>
         public bool IsBiquadFilterEnabled()
@@ -323,11 +326,10 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
 
         /// <summary>
         /// Gets the biquad filter parameters.
-        /// /// Virtual function at function table + 0x10.
         /// </summary>
         /// <param name="index">Biquad filter index (0 or 1).</param>
         /// <returns>Biquad filter parameters.</returns>
-        public ref BiquadFilterParameter2 GetBiquadFilterParameter(int index)
+        public ref BiquadFilterParameter GetBiquadFilterParameter(int index)
         {
             Debug.Assert(!Unsafe.IsNullRef(ref _v2));
 

src/Ryujinx.Audio/Renderer/Server/Splitter/SplitterDestinationVersion2.cs

@@ -1,4 +1,3 @@
-using Ryujinx.Audio.Renderer.Dsp;
 using Ryujinx.Audio.Renderer.Parameter;
 using Ryujinx.Common.Memory;
 using Ryujinx.Common.Utilities;
@@ -12,7 +11,7 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
     /// <summary>
     /// Server state for a splitter destination (version 2).
     /// </summary>
-    [StructLayout(LayoutKind.Sequential, Size = 0x128, Pack = Alignment)]
+    [StructLayout(LayoutKind.Sequential, Size = 0x110, Pack = Alignment)]
     public struct SplitterDestinationVersion2
     {
         public const int Alignment = 0x10;
@@ -79,7 +78,7 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
             }
         }
 
-        private Array2<BiquadFilterParameter2> _biquadFilters;
+        private Array2<BiquadFilterParameter> _biquadFilters;
 
         private Array2<bool> _isPreviousBiquadFilterEnabled;
 
@@ -110,7 +109,7 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
 
                 parameter.MixBufferVolume.CopyTo(MixBufferVolume);
 
-                _biquadFilters = parameter.BiquadFilters2;
+                _biquadFilters = parameter.BiquadFilters;
 
                 bool resetPrevVolume = isPrevVolumeResetSupported ? parameter.ResetPrevVolume : !IsUsed && parameter.IsUsed;
                 if (resetPrevVolume)
@@ -219,8 +218,7 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
         /// <returns>True if any biquad filter is enabled.</returns>
         public bool IsBiquadFilterEnabled()
         {
-            Span<BiquadFilterParameter2> biquadFiltersSpan = _biquadFilters.AsSpan();
+            return _biquadFilters[0].Enable || _biquadFilters[1].Enable;
-            return biquadFiltersSpan[0].Enable || biquadFiltersSpan[1].Enable;
         }
 
         /// <summary>
@@ -237,7 +235,7 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
         /// </summary>
         /// <param name="index">Biquad filter index (0 or 1).</param>
         /// <returns>Biquad filter parameters.</returns>
-        public ref BiquadFilterParameter2 GetBiquadFilterParameter(int index)
+        public ref BiquadFilterParameter GetBiquadFilterParameter(int index)
         {
             return ref _biquadFilters[index];
         }

src/Ryujinx.Audio/Renderer/Server/StateUpdater.cs

@@ -27,39 +27,39 @@ namespace Ryujinx.Audio.Renderer.Server
 
         private Memory<byte> _output;
         private readonly uint _processHandle;
-        private BehaviourInfo _behaviourInfo;
+        private BehaviourContext _behaviourContext;
 
         private readonly ref readonly UpdateDataHeader _inputHeader;
         private readonly Memory<UpdateDataHeader> _outputHeader;
 
         private readonly ref UpdateDataHeader OutputHeader => ref _outputHeader.Span[0];
 
-        public StateUpdater(ReadOnlySequence<byte> input, Memory<byte> output, uint processHandle, BehaviourInfo behaviourInfo)
+        public StateUpdater(ReadOnlySequence<byte> input, Memory<byte> output, uint processHandle, BehaviourContext behaviourContext)
         {
             _inputReader = new SequenceReader<byte>(input);
             _output = output;
             _outputOrigin = _output;
             _processHandle = processHandle;
-            _behaviourInfo = behaviourInfo;
+            _behaviourContext = behaviourContext;
 
             _inputHeader = ref _inputReader.GetRefOrRefToCopy<UpdateDataHeader>(out _);
 
             _outputHeader = SpanMemoryManager<UpdateDataHeader>.Cast(_output[..Unsafe.SizeOf<UpdateDataHeader>()]);
-            OutputHeader.Initialize(_behaviourInfo.UserRevision);
+            OutputHeader.Initialize(_behaviourContext.UserRevision);
             _output = _output[Unsafe.SizeOf<UpdateDataHeader>()..];
         }
 
-        public ResultCode UpdateBehaviourInfo()
+        public ResultCode UpdateBehaviourContext()
         {
             ref readonly BehaviourParameter parameter = ref _inputReader.GetRefOrRefToCopy<BehaviourParameter>(out _);
 
-            if (!BehaviourInfo.CheckValidRevision(parameter.UserRevision) || parameter.UserRevision != _behaviourInfo.UserRevision)
+            if (!BehaviourContext.CheckValidRevision(parameter.UserRevision) || parameter.UserRevision != _behaviourContext.UserRevision)
             {
                 return ResultCode.InvalidUpdateInfo;
             }
 
-            _behaviourInfo.ClearError();
+            _behaviourContext.ClearError();
-            _behaviourInfo.UpdateFlags(parameter.Flags);
+            _behaviourContext.UpdateFlags(parameter.Flags);
 
             if (_inputHeader.BehaviourSize != Unsafe.SizeOf<BehaviourParameter>())
             {
@@ -69,16 +69,16 @@ namespace Ryujinx.Audio.Renderer.Server
             return ResultCode.Success;
         }
 
-        public ResultCode UpdateMemoryPools(Span<MemoryPoolInfo> memoryPools)
+        public ResultCode UpdateMemoryPools(Span<MemoryPoolState> memoryPools)
         {
-            PoolMapper mapper = new(_processHandle, _behaviourInfo.IsMemoryPoolForceMappingEnabled());
+            PoolMapper mapper = new(_processHandle, _behaviourContext.IsMemoryPoolForceMappingEnabled());
 
             if (memoryPools.Length * Unsafe.SizeOf<MemoryPoolInParameter>() != _inputHeader.MemoryPoolsSize)
             {
                 return ResultCode.InvalidUpdateInfo;
             }
 
-            foreach (ref MemoryPoolInfo memoryPool in memoryPools)
+            foreach (ref MemoryPoolState memoryPool in memoryPools)
             {
                 ref readonly MemoryPoolInParameter parameter = ref _inputReader.GetRefOrRefToCopy<MemoryPoolInParameter>(out _);
 
@@ -126,9 +126,9 @@ namespace Ryujinx.Audio.Renderer.Server
             return ResultCode.Success;
         }
 
-        public ResultCode UpdateVoices2(VoiceContext context, PoolMapper mapper)
+        public ResultCode UpdateVoices(VoiceContext context, PoolMapper mapper)
         {
-            if (context.GetCount() * Unsafe.SizeOf<VoiceInParameter2>() != _inputHeader.VoicesSize)
+            if (context.GetCount() * Unsafe.SizeOf<VoiceInParameter>() != _inputHeader.VoicesSize)
             {
                 return ResultCode.InvalidUpdateInfo;
             }
@@ -140,153 +140,64 @@ namespace Ryujinx.Audio.Renderer.Server
             // First make everything not in use.
             for (int i = 0; i < context.GetCount(); i++)
             {
-                ref VoiceInfo info = ref context.GetState(i);
+                ref VoiceState state = ref context.GetState(i);
 
-                info.InUse = false;
+                state.InUse = false;
             }
 
-            Memory<VoiceState>[] voiceStatesArray = ArrayPool<Memory<VoiceState>>.Shared.Rent(Constants.VoiceChannelCountMax);
+            Memory<VoiceUpdateState>[] voiceUpdateStatesArray = ArrayPool<Memory<VoiceUpdateState>>.Shared.Rent(Constants.VoiceChannelCountMax);
 
-            Span<Memory<VoiceState>> voiceStates = voiceStatesArray.AsSpan(0, Constants.VoiceChannelCountMax);
+            Span<Memory<VoiceUpdateState>> voiceUpdateStates = voiceUpdateStatesArray.AsSpan(0, Constants.VoiceChannelCountMax);
 
             // Start processing
             for (int i = 0; i < context.GetCount(); i++)
             {
-                ref readonly VoiceInParameter2 parameter = ref _inputReader.GetRefOrRefToCopy<VoiceInParameter2>(out _);
+                ref readonly VoiceInParameter parameter = ref _inputReader.GetRefOrRefToCopy<VoiceInParameter>(out _);
 
-                voiceStates.Fill(Memory<VoiceState>.Empty);
+                voiceUpdateStates.Fill(Memory<VoiceUpdateState>.Empty);
 
                 ref VoiceOutStatus outStatus = ref SpanIOHelper.GetWriteRef<VoiceOutStatus>(ref _output)[0];
 
                 if (parameter.InUse)
                 {
-                    ref VoiceInfo currentVoiceInfo = ref context.GetState(i);
+                    ref VoiceState currentVoiceState = ref context.GetState(i);
-
-                    Span<int> channelResourceIdsSpan = parameter.ChannelResourceIds.AsSpan();
 
                     for (int channelResourceIndex = 0; channelResourceIndex < parameter.ChannelCount; channelResourceIndex++)
                     {
-                        int channelId = channelResourceIdsSpan[channelResourceIndex];
+                        int channelId = parameter.ChannelResourceIds[channelResourceIndex];
 
                         Debug.Assert(channelId >= 0 && channelId < context.GetCount());
 
-                        voiceStates[channelResourceIndex] = context.GetUpdateStateForCpu(channelId);
+                        voiceUpdateStates[channelResourceIndex] = context.GetUpdateStateForCpu(channelId);
                     }
 
                     if (parameter.IsNew)
                     {
-                        currentVoiceInfo.Initialize();
+                        currentVoiceState.Initialize();
                     }
 
-                    currentVoiceInfo.UpdateParameters2(out ErrorInfo updateParameterError, in parameter, mapper, ref _behaviourInfo);
+                    currentVoiceState.UpdateParameters(out ErrorInfo updateParameterError, in parameter, mapper, ref _behaviourContext);
 
                     if (updateParameterError.ErrorCode != ResultCode.Success)
                     {
-                        _behaviourInfo.AppendError(ref updateParameterError);
+                        _behaviourContext.AppendError(ref updateParameterError);
                     }
 
-                    currentVoiceInfo.UpdateWaveBuffers2(out ErrorInfo[] waveBufferUpdateErrorInfos, in parameter, voiceStates, mapper, ref _behaviourInfo);
+                    currentVoiceState.UpdateWaveBuffers(out ErrorInfo[] waveBufferUpdateErrorInfos, in parameter, voiceUpdateStates, mapper, ref _behaviourContext);
 
                     foreach (ref ErrorInfo errorInfo in waveBufferUpdateErrorInfos.AsSpan())
                     {
                         if (errorInfo.ErrorCode != ResultCode.Success)
                         {
-                            _behaviourInfo.AppendError(ref errorInfo);
+                            _behaviourContext.AppendError(ref errorInfo);
                         }
                     }
 
-                    currentVoiceInfo.WriteOutStatus2(ref outStatus, in parameter, voiceStates);
+                    currentVoiceState.WriteOutStatus(ref outStatus, in parameter, voiceUpdateStates);
                 }
             }
 
-            ArrayPool<Memory<VoiceState>>.Shared.Return(voiceStatesArray);
+            ArrayPool<Memory<VoiceUpdateState>>.Shared.Return(voiceUpdateStatesArray);
-
-            int currentOutputSize = _output.Length;
-
-            OutputHeader.VoicesSize = (uint)(Unsafe.SizeOf<VoiceOutStatus>() * context.GetCount());
-            OutputHeader.TotalSize += OutputHeader.VoicesSize;
-
-            Debug.Assert((initialOutputSize - currentOutputSize) == OutputHeader.VoicesSize);
-
-            _inputReader.SetConsumed(initialInputConsumed + _inputHeader.VoicesSize);
-
-            return ResultCode.Success;
-        }
-
-        public ResultCode UpdateVoices1(VoiceContext context, PoolMapper mapper)
-        {
-            if (context.GetCount() * Unsafe.SizeOf<VoiceInParameter1>() != _inputHeader.VoicesSize)
-            {
-                return ResultCode.InvalidUpdateInfo;
-            }
-
-            int initialOutputSize = _output.Length;
-
-            long initialInputConsumed = _inputReader.Consumed;
-
-            // First make everything not in use.
-            for (int i = 0; i < context.GetCount(); i++)
-            {
-                ref VoiceInfo info = ref context.GetState(i);
-
-                info.InUse = false;
-            }
-
-            Memory<VoiceState>[] voiceStatesArray = ArrayPool<Memory<VoiceState>>.Shared.Rent(Constants.VoiceChannelCountMax);
-
-            Span<Memory<VoiceState>> voiceStates = voiceStatesArray.AsSpan(0, Constants.VoiceChannelCountMax);
-
-            // Start processing
-            for (int i = 0; i < context.GetCount(); i++)
-            {
-                ref readonly VoiceInParameter1 parameter = ref _inputReader.GetRefOrRefToCopy<VoiceInParameter1>(out _);
-
-                voiceStates.Fill(Memory<VoiceState>.Empty);
-
-                ref VoiceOutStatus outStatus = ref SpanIOHelper.GetWriteRef<VoiceOutStatus>(ref _output)[0];
-
-                if (parameter.InUse)
-                {
-                    ref VoiceInfo currentVoiceInfo = ref context.GetState(i);
-
-                    Span<int> channelResourceIdsSpan = parameter.ChannelResourceIds.AsSpan();
-
-                    for (int channelResourceIndex = 0; channelResourceIndex < parameter.ChannelCount; channelResourceIndex++)
-                    {
-                        int channelId = channelResourceIdsSpan[channelResourceIndex];
-
-                        Debug.Assert(channelId >= 0 && channelId < context.GetCount());
-
-                        voiceStates[channelResourceIndex] = context.GetUpdateStateForCpu(channelId);
-                    }
-
-                    if (parameter.IsNew)
-                    {
-                        currentVoiceInfo.Initialize();
-                    }
-
-                    currentVoiceInfo.UpdateParameters1(out ErrorInfo updateParameterError, in parameter, mapper, ref _behaviourInfo);
-
-                    if (updateParameterError.ErrorCode != ResultCode.Success)
-                    {
-                        _behaviourInfo.AppendError(ref updateParameterError);
-                    }
-
-                    currentVoiceInfo.UpdateWaveBuffers1(out ErrorInfo[] waveBufferUpdateErrorInfos, in parameter, voiceStates, mapper, ref _behaviourInfo);
-
-                    foreach (ref ErrorInfo errorInfo in waveBufferUpdateErrorInfos.AsSpan())
-                    {
-                        if (errorInfo.ErrorCode != ResultCode.Success)
-                        {
-                            _behaviourInfo.AppendError(ref errorInfo);
-                        }
-                    }
-
-                    currentVoiceInfo.WriteOutStatus1(ref outStatus, in parameter, voiceStates);
-                }
-            }
-
-            ArrayPool<Memory<VoiceState>>.Shared.Return(voiceStatesArray);
 
             int currentOutputSize = _output.Length;
 
@@ -322,12 +233,7 @@ namespace Ryujinx.Audio.Renderer.Server
 
         public ResultCode UpdateEffects(EffectContext context, bool isAudioRendererActive, PoolMapper mapper)
         {
-            if (_behaviourInfo.IsBiquadFilterParameterFloatSupported())
+            if (_behaviourContext.IsEffectInfoVersion2Supported())
-            {
-                return UpdateEffectsVersion3(context, isAudioRendererActive, mapper);
-            }
-            
-            if (_behaviourInfo.IsEffectInfoVersion2Supported())
             {
                 return UpdateEffectsVersion2(context, isAudioRendererActive, mapper);
             }
@@ -335,60 +241,6 @@ namespace Ryujinx.Audio.Renderer.Server
             return UpdateEffectsVersion1(context, isAudioRendererActive, mapper);
         }
 
-        public ResultCode UpdateEffectsVersion3(EffectContext context, bool isAudioRendererActive, PoolMapper mapper)
-        {
-            if (context.GetCount() * Unsafe.SizeOf<EffectInParameterVersion2>() != _inputHeader.EffectsSize)
-            {
-                return ResultCode.InvalidUpdateInfo;
-            }
-
-            int initialOutputSize = _output.Length;
-
-            long initialInputConsumed = _inputReader.Consumed;
-
-            for (int i = 0; i < context.GetCount(); i++)
-            {
-                ref readonly EffectInParameterVersion3 parameter = ref _inputReader.GetRefOrRefToCopy<EffectInParameterVersion3>(out _);
-
-                ref EffectOutStatusVersion2 outStatus = ref SpanIOHelper.GetWriteRef<EffectOutStatusVersion2>(ref _output)[0];
-
-                ref BaseEffect effect = ref context.GetEffect(i);
-
-                if (!effect.IsTypeValid(in parameter))
-                {
-                    ResetEffect(ref effect, in parameter, mapper);
-                }
-
-                effect.Update(out ErrorInfo updateErrorInfo, in parameter, mapper);
-
-                if (updateErrorInfo.ErrorCode != ResultCode.Success)
-                {
-                    _behaviourInfo.AppendError(ref updateErrorInfo);
-                }
-
-                effect.StoreStatus(ref outStatus, isAudioRendererActive);
-
-                if (parameter.IsNew)
-                {
-                    effect.InitializeResultState(ref context.GetDspState(i));
-                    effect.InitializeResultState(ref context.GetState(i));
-                }
-
-                effect.UpdateResultState(ref outStatus.ResultState, ref context.GetState(i));
-            }
-
-            int currentOutputSize = _output.Length;
-
-            OutputHeader.EffectsSize = (uint)(Unsafe.SizeOf<EffectOutStatusVersion2>() * context.GetCount());
-            OutputHeader.TotalSize += OutputHeader.EffectsSize;
-
-            Debug.Assert((initialOutputSize - currentOutputSize) == OutputHeader.EffectsSize);
-
-            _inputReader.SetConsumed(initialInputConsumed + _inputHeader.EffectsSize);
-
-            return ResultCode.Success;
-        }
-        
         public ResultCode UpdateEffectsVersion2(EffectContext context, bool isAudioRendererActive, PoolMapper mapper)
         {
             if (context.GetCount() * Unsafe.SizeOf<EffectInParameterVersion2>() != _inputHeader.EffectsSize)
@@ -417,7 +269,7 @@ namespace Ryujinx.Audio.Renderer.Server
 
                 if (updateErrorInfo.ErrorCode != ResultCode.Success)
                 {
-                    _behaviourInfo.AppendError(ref updateErrorInfo);
+                    _behaviourContext.AppendError(ref updateErrorInfo);
                 }
 
                 effect.StoreStatus(ref outStatus, isAudioRendererActive);
@@ -471,7 +323,7 @@ namespace Ryujinx.Audio.Renderer.Server
 
                 if (updateErrorInfo.ErrorCode != ResultCode.Success)
                 {
-                    _behaviourInfo.AppendError(ref updateErrorInfo);
+                    _behaviourContext.AppendError(ref updateErrorInfo);
                 }
 
                 effect.StoreStatus(ref outStatus, isAudioRendererActive);
@@ -530,7 +382,7 @@ namespace Ryujinx.Audio.Renderer.Server
             uint inputMixSize;
             uint inputSize = 0;
 
-            if (_behaviourInfo.IsMixInParameterDirtyOnlyUpdateSupported())
+            if (_behaviourContext.IsMixInParameterDirtyOnlyUpdateSupported())
             {
                 ref readonly MixInParameterDirtyOnlyUpdate parameter = ref _inputReader.GetRefOrRefToCopy<MixInParameterDirtyOnlyUpdate>(out _);
 
@@ -569,12 +421,12 @@ namespace Ryujinx.Audio.Renderer.Server
 
                 int mixId = i;
 
-                if (_behaviourInfo.IsMixInParameterDirtyOnlyUpdateSupported())
+                if (_behaviourContext.IsMixInParameterDirtyOnlyUpdateSupported())
                 {
                     mixId = parameter.MixId;
                 }
 
-                ref MixInfo mix = ref mixContext.GetState(mixId);
+                ref MixState mix = ref mixContext.GetState(mixId);
 
                 if (parameter.IsUsed != mix.IsUsed)
                 {
@@ -590,13 +442,13 @@ namespace Ryujinx.Audio.Renderer.Server
 
                 if (mix.IsUsed)
                 {
-                    isMixContextDirty |= mix.Update(mixContext.EdgeMatrix, in parameter, effectContext, splitterContext, _behaviourInfo);
+                    isMixContextDirty |= mix.Update(mixContext.EdgeMatrix, in parameter, effectContext, splitterContext, _behaviourContext);
                 }
             }
 
             if (isMixContextDirty)
             {
-                if (_behaviourInfo.IsSplitterSupported() && splitterContext.UsingSplitter())
+                if (_behaviourContext.IsSplitterSupported() && splitterContext.UsingSplitter())
                 {
                     if (!mixContext.Sort(splitterContext))
                     {
@@ -653,7 +505,7 @@ namespace Ryujinx.Audio.Renderer.Server
 
                 if (updateErrorInfo.ErrorCode != ResultCode.Success)
                 {
-                    _behaviourInfo.AppendError(ref updateErrorInfo);
+                    _behaviourContext.AppendError(ref updateErrorInfo);
                 }
             }
 
@@ -701,7 +553,7 @@ namespace Ryujinx.Audio.Renderer.Server
         {
             ref BehaviourErrorInfoOutStatus outStatus = ref SpanIOHelper.GetWriteRef<BehaviourErrorInfoOutStatus>(ref _output)[0];
 
-            _behaviourInfo.CopyErrorInfo(outStatus.ErrorInfos.AsSpan(), out outStatus.ErrorInfosCount);
+            _behaviourContext.CopyErrorInfo(outStatus.ErrorInfos.AsSpan(), out outStatus.ErrorInfosCount);
 
             OutputHeader.BehaviourSize = (uint)Unsafe.SizeOf<BehaviourErrorInfoOutStatus>();
             OutputHeader.TotalSize += OutputHeader.BehaviourSize;

src/Ryujinx.Audio/Renderer/Server/Types/PlayState.cs

@@ -1,9 +1,7 @@
-using Ryujinx.Audio.Renderer.Server.Voice;
-
 namespace Ryujinx.Audio.Renderer.Server.Types
 {
     /// <summary>
-    /// The internal play state of a <see cref="VoiceInfo"/>
+    /// The internal play state of a <see cref="Voice.VoiceState"/>
     /// </summary>
     public enum PlayState
     {
@@ -26,7 +24,7 @@ namespace Ryujinx.Audio.Renderer.Server.Types
         /// </summary>
         /// <remarks>
         /// This is changed to the <see cref="Stopped"/> state after command generation.
-        /// <seealso cref="VoiceInfo.UpdateForCommandGeneration(Voice.VoiceContext)"/>
+        /// <seealso cref="Voice.VoiceState.UpdateForCommandGeneration(Voice.VoiceContext)"/>
         /// </remarks>
         Stopping,
 

src/Ryujinx.Audio/Renderer/Server/Upsampler/UpsamplerManager.cs

@@ -22,7 +22,7 @@ namespace Ryujinx.Audio.Renderer.Server.Upsampler
         /// <summary>
         /// The upsamplers instances.
         /// </summary>
-        private readonly UpsamplerInfo[] _upsamplers;
+        private readonly UpsamplerState[] _upsamplers;
 
         /// <summary>
         /// The count of upsamplers.
@@ -39,14 +39,14 @@ namespace Ryujinx.Audio.Renderer.Server.Upsampler
             _upSamplerWorkBuffer = upSamplerWorkBuffer;
             _count = count;
 
-            _upsamplers = new UpsamplerInfo[_count];
+            _upsamplers = new UpsamplerState[_count];
         }
 
         /// <summary>
-        /// Allocate a new <see cref="UpsamplerInfo"/>.
+        /// Allocate a new <see cref="UpsamplerState"/>.
         /// </summary>
-        /// <returns>A new <see cref="UpsamplerInfo"/> or null if out of memory.</returns>
+        /// <returns>A new <see cref="UpsamplerState"/> or null if out of memory.</returns>
-        public UpsamplerInfo Allocate()
+        public UpsamplerState Allocate()
         {
             int workBufferOffset = 0;
 
@@ -56,7 +56,7 @@ namespace Ryujinx.Audio.Renderer.Server.Upsampler
                 {
                     if (_upsamplers[i] == null)
                     {
-                        _upsamplers[i] = new UpsamplerInfo(this, i, _upSamplerWorkBuffer.Slice(workBufferOffset, Constants.UpSampleEntrySize), Constants.TargetSampleCount);
+                        _upsamplers[i] = new UpsamplerState(this, i, _upSamplerWorkBuffer.Slice(workBufferOffset, Constants.UpSampleEntrySize), Constants.TargetSampleCount);
 
                         return _upsamplers[i];
                     }
@@ -69,9 +69,9 @@ namespace Ryujinx.Audio.Renderer.Server.Upsampler
         }
 
         /// <summary>
-        /// Free a <see cref="UpsamplerInfo"/> at the given index.
+        /// Free a <see cref="UpsamplerState"/> at the given index.
         /// </summary>
-        /// <param name="index">The index of the <see cref="UpsamplerInfo"/> to free.</param>
+        /// <param name="index">The index of the <see cref="UpsamplerState"/> to free.</param>
         public void Free(int index)
         {
             lock (_lock)

src/Ryujinx.Audio/Renderer/Server/Upsampler/UpsamplerState.cs

@@ -5,7 +5,7 @@ namespace Ryujinx.Audio.Renderer.Server.Upsampler
     /// <summary>
     /// Server state for a upsampling.
     /// </summary>
-    public class UpsamplerInfo
+    public class UpsamplerState
     {
         /// <summary>
         /// The output buffer containing the target samples.
@@ -18,7 +18,7 @@ namespace Ryujinx.Audio.Renderer.Server.Upsampler
         public uint SampleCount { get; }
 
         /// <summary>
-        /// The index of the <see cref="UpsamplerInfo"/>. (used to free it)
+        /// The index of the <see cref="UpsamplerState"/>. (used to free it)
         /// </summary>
         private readonly int _index;
 
@@ -43,13 +43,13 @@ namespace Ryujinx.Audio.Renderer.Server.Upsampler
         public UpsamplerBufferState[] BufferStates;
 
         /// <summary>
-        /// Create a new <see cref="UpsamplerInfo"/>.
+        /// Create a new <see cref="UpsamplerState"/>.
         /// </summary>
         /// <param name="manager">The upsampler manager.</param>
-        /// <param name="index">The index of the <see cref="UpsamplerInfo"/>. (used to free it)</param>
+        /// <param name="index">The index of the <see cref="UpsamplerState"/>. (used to free it)</param>
         /// <param name="outputBuffer">The output buffer used to contain the target samples.</param>
         /// <param name="sampleCount">The target sample count.</param>
-        public UpsamplerInfo(UpsamplerManager manager, int index, Memory<float> outputBuffer, uint sampleCount)
+        public UpsamplerState(UpsamplerManager manager, int index, Memory<float> outputBuffer, uint sampleCount)
         {
             _manager = manager;
             _index = index;
@@ -58,7 +58,7 @@ namespace Ryujinx.Audio.Renderer.Server.Upsampler
         }
 
         /// <summary>
-        /// Release the <see cref="UpsamplerInfo"/>.
+        /// Release the <see cref="UpsamplerState"/>.
         /// </summary>
         public void Release()
         {

src/Ryujinx.Audio/Renderer/Server/Voice/VoiceContext.cs

@@ -11,14 +11,14 @@ namespace Ryujinx.Audio.Renderer.Server.Voice
     public class VoiceContext
     {
         /// <summary>
-        /// Storage of the sorted indices to <see cref="VoiceInfo"/>.
+        /// Storage of the sorted indices to <see cref="VoiceState"/>.
         /// </summary>
         private Memory<int> _sortedVoices;
 
         /// <summary>
-        /// Storage for <see cref="VoiceInfo"/>.
+        /// Storage for <see cref="VoiceState"/>.
         /// </summary>
-        private Memory<VoiceInfo> _voices;
+        private Memory<VoiceState> _voices;
 
         /// <summary>
         /// Storage for <see cref="VoiceChannelResource"/>.
@@ -26,27 +26,27 @@ namespace Ryujinx.Audio.Renderer.Server.Voice
         private Memory<VoiceChannelResource> _voiceChannelResources;
 
         /// <summary>
-        /// Storage for <see cref="VoiceState"/> that are used during audio renderer server updates.
+        /// Storage for <see cref="VoiceUpdateState"/> that are used during audio renderer server updates.
         /// </summary>
-        private Memory<VoiceState> _voiceStatesCpu;
+        private Memory<VoiceUpdateState> _voiceUpdateStatesCpu;
 
         /// <summary>
-        /// Storage for <see cref="VoiceState"/> for the <see cref="Dsp.AudioProcessor"/>.
+        /// Storage for <see cref="VoiceUpdateState"/> for the <see cref="Dsp.AudioProcessor"/>.
         /// </summary>
-        private Memory<VoiceState> _voiceStatesDsp;
+        private Memory<VoiceUpdateState> _voiceUpdateStatesDsp;
 
         /// <summary>
         /// The total voice count.
         /// </summary>
         private uint _voiceCount;
 
-        public void Initialize(Memory<int> sortedVoices, Memory<VoiceInfo> voices, Memory<VoiceChannelResource> voiceChannelResources, Memory<VoiceState> voiceStatesCpu, Memory<VoiceState> voiceStatesDsp, uint voiceCount)
+        public void Initialize(Memory<int> sortedVoices, Memory<VoiceState> voices, Memory<VoiceChannelResource> voiceChannelResources, Memory<VoiceUpdateState> voiceUpdateStatesCpu, Memory<VoiceUpdateState> voiceUpdateStatesDsp, uint voiceCount)
         {
             _sortedVoices = sortedVoices;
             _voices = voices;
             _voiceChannelResources = voiceChannelResources;
-            _voiceStatesCpu = voiceStatesCpu;
+            _voiceUpdateStatesCpu = voiceUpdateStatesCpu;
-            _voiceStatesDsp = voiceStatesDsp;
+            _voiceUpdateStatesDsp = voiceUpdateStatesDsp;
             _voiceCount = voiceCount;
         }
 
@@ -70,38 +70,38 @@ namespace Ryujinx.Audio.Renderer.Server.Voice
         }
 
         /// <summary>
-        /// Get a <see cref="Memory{VoiceState}"/> at the given <paramref name="id"/>.
+        /// Get a <see cref="Memory{VoiceUpdateState}"/> at the given <paramref name="id"/>.
         /// </summary>
         /// <param name="id">The index to use.</param>
-        /// <returns>A <see cref="Memory{VoiceState}"/> at the given <paramref name="id"/>.</returns>
+        /// <returns>A <see cref="Memory{VoiceUpdateState}"/> at the given <paramref name="id"/>.</returns>
-        /// <remarks>The returned <see cref="Memory{VoiceState}"/> should only be used when updating the server state.</remarks>
+        /// <remarks>The returned <see cref="Memory{VoiceUpdateState}"/> should only be used when updating the server state.</remarks>
-        public Memory<VoiceState> GetUpdateStateForCpu(int id)
+        public Memory<VoiceUpdateState> GetUpdateStateForCpu(int id)
         {
-            return SpanIOHelper.GetMemory(_voiceStatesCpu, id, _voiceCount);
+            return SpanIOHelper.GetMemory(_voiceUpdateStatesCpu, id, _voiceCount);
         }
 
         /// <summary>
-        /// Get a <see cref="Memory{VoiceState}"/> at the given <paramref name="id"/>.
+        /// Get a <see cref="Memory{VoiceUpdateState}"/> at the given <paramref name="id"/>.
         /// </summary>
         /// <param name="id">The index to use.</param>
-        /// <returns>A <see cref="Memory{VoiceState}"/> at the given <paramref name="id"/>.</returns>
+        /// <returns>A <see cref="Memory{VoiceUpdateState}"/> at the given <paramref name="id"/>.</returns>
-        /// <remarks>The returned <see cref="Memory{VoiceState}"/> should only be used in the context of processing on the <see cref="Dsp.AudioProcessor"/>.</remarks>
+        /// <remarks>The returned <see cref="Memory{VoiceUpdateState}"/> should only be used in the context of processing on the <see cref="Dsp.AudioProcessor"/>.</remarks>
-        public Memory<VoiceState> GetUpdateStateForDsp(int id)
+        public Memory<VoiceUpdateState> GetUpdateStateForDsp(int id)
         {
-            return SpanIOHelper.GetMemory(_voiceStatesDsp, id, _voiceCount);
+            return SpanIOHelper.GetMemory(_voiceUpdateStatesDsp, id, _voiceCount);
         }
 
         /// <summary>
-        /// Get a reference to a <see cref="VoiceInfo"/> at the given <paramref name="id"/>.
+        /// Get a reference to a <see cref="VoiceState"/> at the given <paramref name="id"/>.
         /// </summary>
         /// <param name="id">The index to use.</param>
-        /// <returns>A reference to a <see cref="VoiceInfo"/> at the given <paramref name="id"/>.</returns>
+        /// <returns>A reference to a <see cref="VoiceState"/> at the given <paramref name="id"/>.</returns>
-        public ref VoiceInfo GetState(int id)
+        public ref VoiceState GetState(int id)
         {
             return ref SpanIOHelper.GetFromMemory(_voices, id, _voiceCount);
         }
 
-        public ref VoiceInfo GetSortedState(int id)
+        public ref VoiceState GetSortedState(int id)
         {
             Debug.Assert(id >= 0 && id < _voiceCount);
 
@@ -113,7 +113,7 @@ namespace Ryujinx.Audio.Renderer.Server.Voice
         /// </summary>
         public void UpdateForCommandGeneration()
         {
-            _voiceStatesDsp.CopyTo(_voiceStatesCpu);
+            _voiceUpdateStatesDsp.CopyTo(_voiceUpdateStatesCpu);
         }
 
         /// <summary>
@@ -126,24 +126,24 @@ namespace Ryujinx.Audio.Renderer.Server.Voice
                 _sortedVoices.Span[i] = i;
             }
 
-            Span<int> sortedVoicesTemp = _sortedVoices[..(int)_voiceCount].Span;
+            int[] sortedVoicesTemp = _sortedVoices[..(int)GetCount()].ToArray();
 
-            sortedVoicesTemp.Sort((a, b) =>
+            Array.Sort(sortedVoicesTemp, (a, b) =>
             {
-                ref VoiceInfo aInfo = ref GetState(a);
+                ref VoiceState aState = ref GetState(a);
-                ref VoiceInfo bInfo = ref GetState(b);
+                ref VoiceState bState = ref GetState(b);
 
-                int result = aInfo.Priority.CompareTo(bInfo.Priority);
+                int result = aState.Priority.CompareTo(bState.Priority);
 
                 if (result == 0)
                 {
-                    return aInfo.SortingOrder.CompareTo(bInfo.SortingOrder);
+                    return aState.SortingOrder.CompareTo(bState.SortingOrder);
                 }
 
                 return result;
             });
 
-            // sortedVoicesTemp.CopyTo(_sortedVoices.Span);
+            sortedVoicesTemp.AsSpan().CopyTo(_sortedVoices.Span);
         }
     }
 }

src/Ryujinx.Audio/Renderer/Server/Voice/VoiceState.cs

@@ -1,6 +1,5 @@
 using Ryujinx.Audio.Common;
 using Ryujinx.Audio.Renderer.Common;
-using Ryujinx.Audio.Renderer.Dsp;
 using Ryujinx.Audio.Renderer.Dsp.State;
 using Ryujinx.Audio.Renderer.Parameter;
 using Ryujinx.Audio.Renderer.Server.MemoryPool;
@@ -10,13 +9,13 @@ using System;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using static Ryujinx.Audio.Renderer.Common.BehaviourParameter;
-using static Ryujinx.Audio.Renderer.Parameter.VoiceInParameter1;
+using static Ryujinx.Audio.Renderer.Parameter.VoiceInParameter;
 using PlayState = Ryujinx.Audio.Renderer.Server.Types.PlayState;
 
 namespace Ryujinx.Audio.Renderer.Server.Voice
 {
     [StructLayout(LayoutKind.Sequential, Pack = Alignment)]
-    public struct VoiceInfo
+    public struct VoiceState
     {
         public const int Alignment = 0x10;
 
@@ -103,7 +102,7 @@ namespace Ryujinx.Audio.Renderer.Server.Voice
         /// <summary>
         /// Biquad filters to apply to the output of the voice.
         /// </summary>
-        public Array2<BiquadFilterParameter2> BiquadFilters;
+        public Array2<BiquadFilterParameter> BiquadFilters;
 
         /// <summary>
         /// Total count of <see cref="WaveBufferInternal"/> of the voice.
@@ -186,7 +185,7 @@ namespace Ryujinx.Audio.Renderer.Server.Voice
         public Span<bool> BiquadFilterNeedInitialization => SpanHelpers.AsSpan<BiquadFilterNeedInitializationArrayStruct, bool>(ref _biquadFilterNeedInitialization);
 
         /// <summary>
-        /// Initialize the <see cref="VoiceInfo"/>.
+        /// Initialize the <see cref="VoiceState"/>.
         /// </summary>
         public void Initialize()
         {
@@ -216,21 +215,19 @@ namespace Ryujinx.Audio.Renderer.Server.Voice
         }
 
         /// <summary>
-        /// Initialize the <see cref="WaveBuffer"/> in this <see cref="VoiceInfo"/>.
+        /// Initialize the <see cref="WaveBuffer"/> in this <see cref="VoiceState"/>.
         /// </summary>
         private void InitializeWaveBuffers()
         {
-            Span<WaveBuffer> waveBuffersSpan = WaveBuffers.AsSpan();
+            for (int i = 0; i < WaveBuffers.Length; i++)
-            
-            for (int i = 0; i < waveBuffersSpan.Length; i++)
             {
-                waveBuffersSpan[i].StartSampleOffset = 0;
+                WaveBuffers[i].StartSampleOffset = 0;
-                waveBuffersSpan[i].EndSampleOffset = 0;
+                WaveBuffers[i].EndSampleOffset = 0;
-                waveBuffersSpan[i].ShouldLoop = false;
+                WaveBuffers[i].ShouldLoop = false;
-                waveBuffersSpan[i].IsEndOfStream = false;
+                WaveBuffers[i].IsEndOfStream = false;
-                waveBuffersSpan[i].BufferAddressInfo.Setup(0, 0);
+                WaveBuffers[i].BufferAddressInfo.Setup(0, 0);
-                waveBuffersSpan[i].ContextAddressInfo.Setup(0, 0);
+                WaveBuffers[i].ContextAddressInfo.Setup(0, 0);
-                waveBuffersSpan[i].IsSendToAudioProcessor = true;
+                WaveBuffers[i].IsSendToAudioProcessor = true;
             }
         }
 
@@ -257,24 +254,7 @@ namespace Ryujinx.Audio.Renderer.Server.Voice
         /// </summary>
         /// <param name="parameter">The user parameter.</param>
         /// <returns>Return true, if the server voice information needs to be updated.</returns>
-        private readonly bool ShouldUpdateParameters2(in VoiceInParameter2 parameter)
+        private readonly bool ShouldUpdateParameters(in VoiceInParameter parameter)
-        {
-            if (DataSourceStateAddressInfo.CpuAddress == parameter.DataSourceStateAddress)
-            {
-                return DataSourceStateAddressInfo.Size != parameter.DataSourceStateSize;
-            }
-
-            return DataSourceStateAddressInfo.CpuAddress != parameter.DataSourceStateAddress ||
-                   DataSourceStateAddressInfo.Size != parameter.DataSourceStateSize ||
-                   DataSourceStateUnmapped;
-        }
-
-        /// <summary>
-        /// Indicate if the server voice information needs to be updated.
-        /// </summary>
-        /// <param name="parameter">The user parameter.</param>
-        /// <returns>Return true, if the server voice information needs to be updated.</returns>
-        private readonly bool ShouldUpdateParameters1(in VoiceInParameter1 parameter)
         {
             if (DataSourceStateAddressInfo.CpuAddress == parameter.DataSourceStateAddress)
             {
@@ -292,8 +272,8 @@ namespace Ryujinx.Audio.Renderer.Server.Voice
         /// <param name="outErrorInfo">The possible <see cref="ErrorInfo"/> that was generated.</param>
         /// <param name="parameter">The user parameter.</param>
         /// <param name="poolMapper">The mapper to use.</param>
-        /// <param name="behaviourInfo">The behaviour context.</param>
+        /// <param name="behaviourContext">The behaviour context.</param>
-        public void UpdateParameters2(out ErrorInfo outErrorInfo, in VoiceInParameter2 parameter, PoolMapper poolMapper, ref BehaviourInfo behaviourInfo)
+        public void UpdateParameters(out ErrorInfo outErrorInfo, in VoiceInParameter parameter, PoolMapper poolMapper, ref BehaviourContext behaviourContext)
         {
             InUse = parameter.InUse;
             Id = parameter.Id;
@@ -314,14 +294,14 @@ namespace Ryujinx.Audio.Renderer.Server.Voice
             WaveBuffersCount = parameter.WaveBuffersCount;
             WaveBuffersIndex = parameter.WaveBuffersIndex;
 
-            if (behaviourInfo.IsFlushVoiceWaveBuffersSupported())
+            if (behaviourContext.IsFlushVoiceWaveBuffersSupported())
             {
                 FlushWaveBufferCount += parameter.FlushWaveBufferCount;
             }
 
             MixId = parameter.MixId;
 
-            if (behaviourInfo.IsSplitterSupported())
+            if (behaviourContext.IsSplitterSupported())
             {
                 SplitterId = parameter.SplitterId;
             }
@@ -334,7 +314,7 @@ namespace Ryujinx.Audio.Renderer.Server.Voice
 
             DecodingBehaviour behaviour = DecodingBehaviour.Default;
 
-            if (behaviourInfo.IsDecodingBehaviourFlagSupported())
+            if (behaviourContext.IsDecodingBehaviourFlagSupported())
             {
                 behaviour = parameter.DecodingBehaviourFlags;
             }
@@ -346,78 +326,7 @@ namespace Ryujinx.Audio.Renderer.Server.Voice
                 VoiceDropFlag = false;
             }
 
-            if (ShouldUpdateParameters2(in parameter))
+            if (ShouldUpdateParameters(in parameter))
-            {
-                DataSourceStateUnmapped = !poolMapper.TryAttachBuffer(out outErrorInfo, ref DataSourceStateAddressInfo, parameter.DataSourceStateAddress, parameter.DataSourceStateSize);
-            }
-            else
-            {
-                outErrorInfo = new ErrorInfo();
-            }
-        }
-
-        /// <summary>
-        /// Update the internal state from a user parameter.
-        /// </summary>
-        /// <param name="outErrorInfo">The possible <see cref="ErrorInfo"/> that was generated.</param>
-        /// <param name="parameter">The user paramter2.</param>
-        /// <param name="poolMapper">The mapper to use.</param>
-        /// <param name="behaviourInfo">The behaviour context.</param>
-        public void UpdateParameters1(out ErrorInfo outErrorInfo, in VoiceInParameter1 parameter, PoolMapper poolMapper, ref BehaviourInfo behaviourInfo)
-        {
-            InUse = parameter.InUse;
-            Id = parameter.Id;
-            NodeId = parameter.NodeId;
-
-            UpdatePlayState(parameter.PlayState);
-
-            SrcQuality = parameter.SrcQuality;
-
-            Priority = parameter.Priority;
-            SortingOrder = parameter.SortingOrder;
-            SampleRate = parameter.SampleRate;
-            SampleFormat = parameter.SampleFormat;
-            ChannelsCount = parameter.ChannelCount;
-            Pitch = parameter.Pitch;
-            Volume = parameter.Volume;
-            BiquadFilters[0] = BiquadFilterHelper.ToBiquadFilterParameter2(parameter.BiquadFilters[0]);
-            BiquadFilters[1] = BiquadFilterHelper.ToBiquadFilterParameter2(parameter.BiquadFilters[1]);
-            WaveBuffersCount = parameter.WaveBuffersCount;
-            WaveBuffersIndex = parameter.WaveBuffersIndex;
-
-            if (behaviourInfo.IsFlushVoiceWaveBuffersSupported())
-            {
-                FlushWaveBufferCount += parameter.FlushWaveBufferCount;
-            }
-
-            MixId = parameter.MixId;
-
-            if (behaviourInfo.IsSplitterSupported())
-            {
-                SplitterId = parameter.SplitterId;
-            }
-            else
-            {
-                SplitterId = Constants.UnusedSplitterId;
-            }
-
-            parameter.ChannelResourceIds.AsSpan().CopyTo(ChannelResourceIds.AsSpan());
-
-            DecodingBehaviour behaviour = DecodingBehaviour.Default;
-
-            if (behaviourInfo.IsDecodingBehaviourFlagSupported())
-            {
-                behaviour = parameter.DecodingBehaviourFlags;
-            }
-
-            DecodingBehaviour = behaviour;
-
-            if (parameter.ResetVoiceDropFlag)
-            {
-                VoiceDropFlag = false;
-            }
-
-            if (ShouldUpdateParameters1(in parameter))
             {
                 DataSourceStateUnmapped = !poolMapper.TryAttachBuffer(out outErrorInfo, ref DataSourceStateAddressInfo, parameter.DataSourceStateAddress, parameter.DataSourceStateSize);
             }
@@ -470,8 +379,8 @@ namespace Ryujinx.Audio.Renderer.Server.Voice
         /// </summary>
         /// <param name="outStatus">The given user output.</param>
         /// <param name="parameter">The user parameter.</param>
-        /// <param name="voiceStates">The voice states associated to the <see cref="VoiceInfo"/>.</param>
+        /// <param name="voiceUpdateStates">The voice states associated to the <see cref="VoiceState"/>.</param>
-        public void WriteOutStatus2(ref VoiceOutStatus outStatus, in VoiceInParameter2 parameter, ReadOnlySpan<Memory<VoiceState>> voiceStates)
+        public void WriteOutStatus(ref VoiceOutStatus outStatus, in VoiceInParameter parameter, ReadOnlySpan<Memory<VoiceUpdateState>> voiceUpdateStates)
         {
 #if DEBUG
             // Sanity check in debug mode of the internal state
@@ -479,8 +388,8 @@ namespace Ryujinx.Audio.Renderer.Server.Voice
             {
                 for (int i = 1; i < ChannelsCount; i++)
                 {
-                    ref VoiceState stateA = ref voiceStates[i - 1].Span[0];
+                    ref VoiceUpdateState stateA = ref voiceUpdateStates[i - 1].Span[0];
-                    ref VoiceState stateB = ref voiceStates[i].Span[0];
+                    ref VoiceUpdateState stateB = ref voiceUpdateStates[i].Span[0];
 
                     Debug.Assert(stateA.WaveBufferConsumed == stateB.WaveBufferConsumed);
                     Debug.Assert(stateA.PlayedSampleCount == stateB.PlayedSampleCount);
@@ -501,7 +410,7 @@ namespace Ryujinx.Audio.Renderer.Server.Voice
             }
             else
             {
-                ref VoiceState state = ref voiceStates[0].Span[0];
+                ref VoiceUpdateState state = ref voiceUpdateStates[0].Span[0];
 
                 outStatus.VoiceDropFlag = VoiceDropFlag;
                 outStatus.PlayedWaveBuffersCount = state.WaveBufferConsumed;
@@ -510,63 +419,19 @@ namespace Ryujinx.Audio.Renderer.Server.Voice
         }
 
         /// <summary>
-        /// Write the status of the voice to the given user output.
+        /// Update the internal state of all the <see cref="WaveBuffer"/> of the <see cref="VoiceState"/>.
-        /// </summary>
-        /// <param name="outStatus">The given user output.</param>
-        /// <param name="parameter">The user parameter.</param>
-        /// <param name="voiceStates">The voice states associated to the <see cref="VoiceInfo"/>.</param>
-        public void WriteOutStatus1(ref VoiceOutStatus outStatus, in VoiceInParameter1 parameter, ReadOnlySpan<Memory<VoiceState>> voiceStates)
-        {
-#if DEBUG
-            // Sanity check in debug mode of the internal state
-            if (!parameter.IsNew && !IsNew)
-            {
-                for (int i = 1; i < ChannelsCount; i++)
-                {
-                    ref VoiceState stateA = ref voiceStates[i - 1].Span[0];
-                    ref VoiceState stateB = ref voiceStates[i].Span[0];
-
-                    Debug.Assert(stateA.WaveBufferConsumed == stateB.WaveBufferConsumed);
-                    Debug.Assert(stateA.PlayedSampleCount == stateB.PlayedSampleCount);
-                    Debug.Assert(stateA.Offset == stateB.Offset);
-                    Debug.Assert(stateA.WaveBufferIndex == stateB.WaveBufferIndex);
-                    Debug.Assert(stateA.Fraction == stateB.Fraction);
-                    Debug.Assert(stateA.IsWaveBufferValid.SequenceEqual(stateB.IsWaveBufferValid));
-                }
-            }
-#endif
-            if (parameter.IsNew || IsNew)
-            {
-                IsNew = true;
-
-                outStatus.VoiceDropFlag = false;
-                outStatus.PlayedWaveBuffersCount = 0;
-                outStatus.PlayedSampleCount = 0;
-            }
-            else
-            {
-                ref VoiceState state = ref voiceStates[0].Span[0];
-
-                outStatus.VoiceDropFlag = VoiceDropFlag;
-                outStatus.PlayedWaveBuffersCount = state.WaveBufferConsumed;
-                outStatus.PlayedSampleCount = state.PlayedSampleCount;
-            }
-        }
-        
-        /// <summary>
-        /// Update the internal state of all the <see cref="WaveBuffer"/> of the <see cref="VoiceInfo"/>.
         /// </summary>
         /// <param name="errorInfos">An array of <see cref="ErrorInfo"/> used to report errors when mapping any of the <see cref="WaveBuffer"/>.</param>
         /// <param name="parameter">The user parameter.</param>
-        /// <param name="voiceStates">The voice states associated to the <see cref="VoiceInfo"/>.</param>
+        /// <param name="voiceUpdateStates">The voice states associated to the <see cref="VoiceState"/>.</param>
         /// <param name="mapper">The mapper to use.</param>
-        /// <param name="behaviourInfo">The behaviour context.</param>
+        /// <param name="behaviourContext">The behaviour context.</param>
-        public void UpdateWaveBuffers2(
+        public void UpdateWaveBuffers(
             out ErrorInfo[] errorInfos,
-            in VoiceInParameter2 parameter,
+            in VoiceInParameter parameter,
-            ReadOnlySpan<Memory<VoiceState>> voiceStates,
+            ReadOnlySpan<Memory<VoiceUpdateState>> voiceUpdateStates,
             PoolMapper mapper,
-            ref BehaviourInfo behaviourInfo)
+            ref BehaviourContext behaviourContext)
         {
             errorInfos = new ErrorInfo[Constants.VoiceWaveBufferCount * 2];
 
@@ -576,61 +441,20 @@ namespace Ryujinx.Audio.Renderer.Server.Voice
 
                 for (int i = 0; i < parameter.ChannelCount; i++)
                 {
-                    voiceStates[i].Span[0].IsWaveBufferValid.Clear();
+                    voiceUpdateStates[i].Span[0].IsWaveBufferValid.Clear();
                 }
             }
 
-            ref VoiceState voiceState = ref voiceStates[0].Span[0];
+            ref VoiceUpdateState voiceUpdateState = ref voiceUpdateStates[0].Span[0];
-            
-            Span<WaveBuffer> waveBuffersSpan = WaveBuffers.AsSpan();
-            Span<WaveBufferInternal> pWaveBuffersSpan = parameter.WaveBuffers.AsSpan();
 
             for (int i = 0; i < Constants.VoiceWaveBufferCount; i++)
             {
-                UpdateWaveBuffer(errorInfos.AsSpan(i * 2, 2), ref waveBuffersSpan[i], ref pWaveBuffersSpan[i], parameter.SampleFormat, voiceState.IsWaveBufferValid[i], mapper, ref behaviourInfo);
+                UpdateWaveBuffer(errorInfos.AsSpan(i * 2, 2), ref WaveBuffers[i], ref parameter.WaveBuffers[i], parameter.SampleFormat, voiceUpdateState.IsWaveBufferValid[i], mapper, ref behaviourContext);
             }
         }
 
         /// <summary>
-        /// Update the internal state of all the <see cref="WaveBuffer"/> of the <see cref="VoiceInfo"/>.
+        /// Update the internal state of one of the <see cref="WaveBuffer"/> of the <see cref="VoiceState"/>.
-        /// </summary>
-        /// <param name="errorInfos">An array of <see cref="ErrorInfo"/> used to report errors when mapping any of the <see cref="WaveBuffer"/>.</param>
-        /// <param name="parameter">The user parameter.</param>
-        /// <param name="voiceStates">The voice states associated to the <see cref="VoiceInfo"/>.</param>
-        /// <param name="mapper">The mapper to use.</param>
-        /// <param name="behaviourInfo">The behaviour context.</param>
-        public void UpdateWaveBuffers1(
-            out ErrorInfo[] errorInfos,
-            in VoiceInParameter1 parameter,
-            ReadOnlySpan<Memory<VoiceState>> voiceStates,
-            PoolMapper mapper,
-            ref BehaviourInfo behaviourInfo)
-        {
-            errorInfos = new ErrorInfo[Constants.VoiceWaveBufferCount * 2];
-
-            if (parameter.IsNew)
-            {
-                InitializeWaveBuffers();
-
-                for (int i = 0; i < parameter.ChannelCount; i++)
-                {
-                    voiceStates[i].Span[0].IsWaveBufferValid.Clear();
-                }
-            }
-
-            ref VoiceState voiceState = ref voiceStates[0].Span[0];
-            
-            Span<WaveBuffer> waveBuffersSpan = WaveBuffers.AsSpan();
-            Span<WaveBufferInternal> pWaveBuffersSpan = parameter.WaveBuffers.AsSpan();
-
-            for (int i = 0; i < Constants.VoiceWaveBufferCount; i++)
-            {
-                UpdateWaveBuffer(errorInfos.AsSpan(i * 2, 2), ref waveBuffersSpan[i], ref pWaveBuffersSpan[i], parameter.SampleFormat, voiceState.IsWaveBufferValid[i], mapper, ref behaviourInfo);
-            }
-        }
-
-        /// <summary>
-        /// Update the internal state of one of the <see cref="WaveBuffer"/> of the <see cref="VoiceInfo"/>.
         /// </summary>
         /// <param name="errorInfos">A <see cref="Span{ErrorInfo}"/> used to report errors when mapping the <see cref="WaveBuffer"/>.</param>
         /// <param name="waveBuffer">The <see cref="WaveBuffer"/> to update.</param>
@@ -638,7 +462,7 @@ namespace Ryujinx.Audio.Renderer.Server.Voice
         /// <param name="sampleFormat">The <see cref="SampleFormat"/> from the user input.</param>
         /// <param name="isValid">If set to true, the server side wavebuffer is considered valid.</param>
         /// <param name="mapper">The mapper to use.</param>
-        /// <param name="behaviourInfo">The behaviour context.</param>
+        /// <param name="behaviourContext">The behaviour context.</param>
         private void UpdateWaveBuffer(
             Span<ErrorInfo> errorInfos,
             ref WaveBuffer waveBuffer,
@@ -646,7 +470,7 @@ namespace Ryujinx.Audio.Renderer.Server.Voice
             SampleFormat sampleFormat,
             bool isValid,
             PoolMapper mapper,
-            ref BehaviourInfo behaviourInfo)
+            ref BehaviourContext behaviourContext)
         {
             if (!isValid && waveBuffer.IsSendToAudioProcessor && waveBuffer.BufferAddressInfo.CpuAddress != 0)
             {
@@ -673,7 +497,7 @@ namespace Ryujinx.Audio.Renderer.Server.Voice
 
                     errorInfos[0] = bufferInfoError;
 
-                    if (sampleFormat == SampleFormat.Adpcm && behaviourInfo.IsAdpcmLoopContextBugFixed() && inputWaveBuffer.ContextAddress != 0)
+                    if (sampleFormat == SampleFormat.Adpcm && behaviourContext.IsAdpcmLoopContextBugFixed() && inputWaveBuffer.ContextAddress != 0)
                     {
                         bool adpcmLoopContextMapped = mapper.TryAttachBuffer(out ErrorInfo adpcmLoopContextInfoError,
                                                                              ref waveBuffer.ContextAddressInfo,
@@ -682,13 +506,13 @@ namespace Ryujinx.Audio.Renderer.Server.Voice
 
                         errorInfos[1] = adpcmLoopContextInfoError;
 
-                        if (!adpcmLoopContextMapped || BufferInfoUnmapped)
+                        if (adpcmLoopContextMapped)
                         {
-                            BufferInfoUnmapped = true;
+                            BufferInfoUnmapped = DataSourceStateUnmapped;
                         }
                         else
                         {
-                            BufferInfoUnmapped = false;
+                            BufferInfoUnmapped = true;
                         }
                     }
                     else
@@ -705,24 +529,22 @@ namespace Ryujinx.Audio.Renderer.Server.Voice
         }
 
         /// <summary>
-        /// Reset the resources associated to this <see cref="VoiceInfo"/>.
+        /// Reset the resources associated to this <see cref="VoiceState"/>.
         /// </summary>
         /// <param name="context">The voice context.</param>
         private void ResetResources(VoiceContext context)
         {
-            Span<int> channelResourceIdsSpan = ChannelResourceIds.AsSpan();
-            
             for (int i = 0; i < ChannelsCount; i++)
             {
-                int channelResourceId = channelResourceIdsSpan[i];
+                int channelResourceId = ChannelResourceIds[i];
 
                 ref VoiceChannelResource voiceChannelResource = ref context.GetChannelResource(channelResourceId);
 
                 Debug.Assert(voiceChannelResource.IsUsed);
 
-                Memory<VoiceState> dspSharedState = context.GetUpdateStateForDsp(channelResourceId);
+                Memory<VoiceUpdateState> dspSharedState = context.GetUpdateStateForDsp(channelResourceId);
 
-                MemoryMarshal.Cast<VoiceState, byte>(dspSharedState.Span).Clear();
+                MemoryMarshal.Cast<VoiceUpdateState, byte>(dspSharedState.Span).Clear();
 
                 voiceChannelResource.UpdateState();
             }
@@ -732,31 +554,24 @@ namespace Ryujinx.Audio.Renderer.Server.Voice
         /// Flush a certain amount of <see cref="WaveBuffer"/>.
         /// </summary>
         /// <param name="waveBufferCount">The amount of wavebuffer to flush.</param>
-        /// <param name="voiceStates">The voice states associated to the <see cref="VoiceInfo"/>.</param>
+        /// <param name="voiceUpdateStates">The voice states associated to the <see cref="VoiceState"/>.</param>
         /// <param name="channelCount">The channel count from user input.</param>
-        private void FlushWaveBuffers(uint waveBufferCount, Memory<VoiceState>[] voiceStates, uint channelCount)
+        private void FlushWaveBuffers(uint waveBufferCount, Memory<VoiceUpdateState>[] voiceUpdateStates, uint channelCount)
         {
             uint waveBufferIndex = WaveBuffersIndex;
 
-            Span<WaveBuffer> waveBuffersSpan = WaveBuffers.AsSpan();
-
             for (int i = 0; i < waveBufferCount; i++)
             {
-                waveBuffersSpan[(int)waveBufferIndex].IsSendToAudioProcessor = true;
+                WaveBuffers[(int)waveBufferIndex].IsSendToAudioProcessor = true;
 
                 for (int j = 0; j < channelCount; j++)
                 {
-                    ref VoiceState voiceState = ref voiceStates[j].Span[0];
+                    ref VoiceUpdateState voiceUpdateState = ref voiceUpdateStates[j].Span[0];
 
-                    if (!waveBuffersSpan[(int)waveBufferIndex].IsSendToAudioProcessor || voiceState.IsWaveBufferValid[(int)waveBufferIndex])
+                    voiceUpdateState.WaveBufferIndex = (voiceUpdateState.WaveBufferIndex + 1) % Constants.VoiceWaveBufferCount;
-                    {
+                    voiceUpdateState.WaveBufferConsumed++;
-                        voiceState.WaveBufferIndex = (voiceState.WaveBufferIndex + 1) % Constants.VoiceWaveBufferCount;
+                    voiceUpdateState.IsWaveBufferValid[(int)waveBufferIndex] = false;
-                        voiceState.WaveBufferConsumed++;
-                        voiceState.IsWaveBufferValid[(int)waveBufferIndex] = false;
                 }
-                }
-                
-                waveBuffersSpan[(int)waveBufferIndex].IsSendToAudioProcessor = true;
 
                 waveBufferIndex = (waveBufferIndex + 1) % Constants.VoiceWaveBufferCount;
             }
@@ -765,48 +580,44 @@ namespace Ryujinx.Audio.Renderer.Server.Voice
         /// <summary>
         /// Update the internal parameters for command generation.
         /// </summary>
-        /// <param name="voiceStates">The voice states associated to the <see cref="VoiceInfo"/>.</param>
+        /// <param name="voiceUpdateStates">The voice states associated to the <see cref="VoiceState"/>.</param>
         /// <returns>Return true if this voice should be played.</returns>
-        public bool UpdateParametersForCommandGeneration(Memory<VoiceState>[] voiceStates)
+        public bool UpdateParametersForCommandGeneration(Memory<VoiceUpdateState>[] voiceUpdateStates)
         {
             if (FlushWaveBufferCount != 0)
             {
-                FlushWaveBuffers(FlushWaveBufferCount, voiceStates, ChannelsCount);
+                FlushWaveBuffers(FlushWaveBufferCount, voiceUpdateStates, ChannelsCount);
 
                 FlushWaveBufferCount = 0;
             }
 
-            Span<WaveBuffer> waveBuffersSpan;
-
             switch (PlayState)
             {
                 case PlayState.Started:
-                    waveBuffersSpan = WaveBuffers.AsSpan();
+                    for (int i = 0; i < WaveBuffers.Length; i++)
-                    
-                    for (int i = 0; i < waveBuffersSpan.Length; i++)
                     {
-                        ref WaveBuffer waveBuffer = ref waveBuffersSpan[i];
+                        ref WaveBuffer wavebuffer = ref WaveBuffers[i];
 
-                        if (!waveBuffer.IsSendToAudioProcessor)
+                        if (!wavebuffer.IsSendToAudioProcessor)
                         {
                             for (int y = 0; y < ChannelsCount; y++)
                             {
-                                Debug.Assert(!voiceStates[y].Span[0].IsWaveBufferValid[i]);
+                                Debug.Assert(!voiceUpdateStates[y].Span[0].IsWaveBufferValid[i]);
 
-                                voiceStates[y].Span[0].IsWaveBufferValid[i] = true;
+                                voiceUpdateStates[y].Span[0].IsWaveBufferValid[i] = true;
                             }
 
-                            waveBuffer.IsSendToAudioProcessor = true;
+                            wavebuffer.IsSendToAudioProcessor = true;
                         }
                     }
 
                     WasPlaying = false;
 
-                    ref VoiceState primaryVoiceState = ref voiceStates[0].Span[0];
+                    ref VoiceUpdateState primaryVoiceUpdateState = ref voiceUpdateStates[0].Span[0];
 
-                    for (int i = 0; i < primaryVoiceState.IsWaveBufferValid.Length; i++)
+                    for (int i = 0; i < primaryVoiceUpdateState.IsWaveBufferValid.Length; i++)
                     {
-                        if (primaryVoiceState.IsWaveBufferValid[i])
+                        if (primaryVoiceUpdateState.IsWaveBufferValid[i])
                         {
                             return true;
                         }
@@ -815,37 +626,35 @@ namespace Ryujinx.Audio.Renderer.Server.Voice
                     return false;
 
                 case PlayState.Stopping:
-                    waveBuffersSpan = WaveBuffers.AsSpan();
+                    for (int i = 0; i < WaveBuffers.Length; i++)
-                    
-                    for (int i = 0; i < waveBuffersSpan.Length; i++)
                     {
-                        ref WaveBuffer waveBuffer = ref waveBuffersSpan[i];
+                        ref WaveBuffer wavebuffer = ref WaveBuffers[i];
 
-                        waveBuffer.IsSendToAudioProcessor = true;
+                        wavebuffer.IsSendToAudioProcessor = true;
 
                         for (int j = 0; j < ChannelsCount; j++)
                         {
-                            ref VoiceState voiceState = ref voiceStates[j].Span[0];
+                            ref VoiceUpdateState voiceUpdateState = ref voiceUpdateStates[j].Span[0];
 
-                            if (voiceState.IsWaveBufferValid[i])
+                            if (voiceUpdateState.IsWaveBufferValid[i])
                             {
-                                voiceState.WaveBufferIndex = (voiceState.WaveBufferIndex + 1) % Constants.VoiceWaveBufferCount;
+                                voiceUpdateState.WaveBufferIndex = (voiceUpdateState.WaveBufferIndex + 1) % Constants.VoiceWaveBufferCount;
-                                voiceState.WaveBufferConsumed++;
+                                voiceUpdateState.WaveBufferConsumed++;
                             }
 
-                            voiceState.IsWaveBufferValid[i] = false;
+                            voiceUpdateState.IsWaveBufferValid[i] = false;
                         }
                     }
 
                     for (int i = 0; i < ChannelsCount; i++)
                     {
-                        ref VoiceState voiceState = ref voiceStates[i].Span[0];
+                        ref VoiceUpdateState voiceUpdateState = ref voiceUpdateStates[i].Span[0];
 
-                        voiceState.Offset = 0;
+                        voiceUpdateState.Offset = 0;
-                        voiceState.PlayedSampleCount = 0;
+                        voiceUpdateState.PlayedSampleCount = 0;
-                        voiceState.Pitch.AsSpan().Clear();
+                        voiceUpdateState.Pitch.AsSpan().Clear();
-                        voiceState.Fraction = 0;
+                        voiceUpdateState.Fraction = 0;
-                        voiceState.LoopContext = new AdpcmLoopContext();
+                        voiceUpdateState.LoopContext = new AdpcmLoopContext();
                     }
 
                     PlayState = PlayState.Stopped;
@@ -891,16 +700,14 @@ namespace Ryujinx.Audio.Renderer.Server.Voice
                 IsNew = false;
             }
 
-            Memory<VoiceState>[] voiceStates = new Memory<VoiceState>[Constants.VoiceChannelCountMax];
+            Memory<VoiceUpdateState>[] voiceUpdateStates = new Memory<VoiceUpdateState>[Constants.VoiceChannelCountMax];
-
-            Span<int> channelResourceIdsSpan = ChannelResourceIds.AsSpan();
 
             for (int i = 0; i < ChannelsCount; i++)
             {
-                voiceStates[i] = context.GetUpdateStateForDsp(channelResourceIdsSpan[i]);
+                voiceUpdateStates[i] = context.GetUpdateStateForDsp(ChannelResourceIds[i]);
             }
 
-            return UpdateParametersForCommandGeneration(voiceStates);
+            return UpdateParametersForCommandGeneration(voiceUpdateStates);
         }
     }
 }

src/Ryujinx.Common/Collections/BitMap.cs

@@ -1,226 +0,0 @@
-namespace Ryujinx.Common.Collections
-{
-    /// <summary>
-    /// Represents a collection that can store 1 bit values.
-    /// </summary>
-    public struct BitMap
-    {
-        /// <summary>
-        /// Size in bits of the integer used internally for the groups of bits.
-        /// </summary>
-        public const int IntSize = 64;
-
-        private const int IntShift = 6;
-        private const int IntMask = IntSize - 1;
-
-        private readonly long[] _masks;
-
-        /// <summary>
-        /// Gets or sets the value of a bit.
-        /// </summary>
-        /// <param name="bit">Bit to access</param>
-        /// <returns>Bit value</returns>
-        public bool this[int bit]
-        {
-            get => IsSet(bit);
-            set
-            {
-                if (value)
-                {
-                    Set(bit);
-                }
-                else
-                {
-                    Clear(bit);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Creates a new bitmap.
-        /// </summary>
-        /// <param name="count">Total number of bits</param>
-        public BitMap(int count)
-        {
-            _masks = new long[(count + IntMask) / IntSize];
-        }
-
-        /// <summary>
-        /// Checks if any bit is set.
-        /// </summary>
-        /// <returns>True if any bit is set, false otherwise</returns>
-        public bool AnySet()
-        {
-            for (int i = 0; i < _masks.Length; i++)
-            {
-                if (_masks[i] != 0)
-                {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Checks if a specific bit is set.
-        /// </summary>
-        /// <param name="bit">Bit to be checked</param>
-        /// <returns>True if set, false otherwise</returns>
-        public bool IsSet(int bit)
-        {
-            int wordIndex = bit >> IntShift;
-            int wordBit = bit & IntMask;
-
-            long wordMask = 1L << wordBit;
-
-            return (_masks[wordIndex] & wordMask) != 0;
-        }
-
-        /// <summary>
-        /// Checks if any bit inside a given range of bits is set.
-        /// </summary>
-        /// <param name="start">Start bit of the range</param>
-        /// <param name="end">End bit of the range (inclusive)</param>
-        /// <returns>True if any bit is set, false otherwise</returns>
-        public bool IsSet(int start, int end)
-        {
-            if (start == end)
-            {
-                return IsSet(start);
-            }
-
-            int startIndex = start >> IntShift;
-            int startBit = start & IntMask;
-            long startMask = -1L << startBit;
-
-            int endIndex = end >> IntShift;
-            int endBit = end & IntMask;
-            long endMask = (long)(ulong.MaxValue >> (IntMask - endBit));
-
-            if (startIndex == endIndex)
-            {
-                return (_masks[startIndex] & startMask & endMask) != 0;
-            }
-
-            if ((_masks[startIndex] & startMask) != 0)
-            {
-                return true;
-            }
-
-            for (int i = startIndex + 1; i < endIndex; i++)
-            {
-                if (_masks[i] != 0)
-                {
-                    return true;
-                }
-            }
-
-            if ((_masks[endIndex] & endMask) != 0)
-            {
-                return true;
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Sets the value of a bit to 1.
-        /// </summary>
-        /// <param name="bit">Bit to be set</param>
-        /// <returns>True if the bit was 0 and then changed to 1, false if it was already 1</returns>
-        public bool Set(int bit)
-        {
-            int wordIndex = bit >> IntShift;
-            int wordBit = bit & IntMask;
-
-            long wordMask = 1L << wordBit;
-
-            if ((_masks[wordIndex] & wordMask) != 0)
-            {
-                return false;
-            }
-
-            _masks[wordIndex] |= wordMask;
-
-            return true;
-        }
-
-        /// <summary>
-        /// Sets a given range of bits to 1.
-        /// </summary>
-        /// <param name="start">Start bit of the range</param>
-        /// <param name="end">End bit of the range (inclusive)</param>
-        public void SetRange(int start, int end)
-        {
-            if (start == end)
-            {
-                Set(start);
-                return;
-            }
-
-            int startIndex = start >> IntShift;
-            int startBit = start & IntMask;
-            long startMask = -1L << startBit;
-
-            int endIndex = end >> IntShift;
-            int endBit = end & IntMask;
-            long endMask = (long)(ulong.MaxValue >> (IntMask - endBit));
-
-            if (startIndex == endIndex)
-            {
-                _masks[startIndex] |= startMask & endMask;
-            }
-            else
-            {
-                _masks[startIndex] |= startMask;
-
-                for (int i = startIndex + 1; i < endIndex; i++)
-                {
-                    _masks[i] |= -1;
-                }
-
-                _masks[endIndex] |= endMask;
-            }
-        }
-
-        /// <summary>
-        /// Sets a given bit to 0.
-        /// </summary>
-        /// <param name="bit">Bit to be cleared</param>
-        public void Clear(int bit)
-        {
-            int wordIndex = bit >> IntShift;
-            int wordBit   = bit & IntMask;
-
-            long wordMask = 1L << wordBit;
-
-            _masks[wordIndex] &= ~wordMask;
-        }
-
-        /// <summary>
-        /// Sets all bits to 0.
-        /// </summary>
-        public void Clear()
-        {
-            for (int i = 0; i < _masks.Length; i++)
-            {
-                _masks[i] = 0;
-            }
-        }
-
-        /// <summary>
-        /// Sets one or more groups of bits to 0.
-        /// See <see cref="IntSize"/> for how many bits are inside each group.
-        /// </summary>
-        /// <param name="start">Start index of the group</param>
-        /// <param name="end">End index of the group (inclusive)</param>
-        public void ClearInt(int start, int end)
-        {
-            for (int i = start; i <= end; i++)
-            {
-                _masks[i] = 0;
-            }
-        }
-    }
-}

src/Ryujinx.Common/Collections/IntrusiveRedBlackTree.cs

@@ -14,13 +14,12 @@ namespace Ryujinx.Common.Collections
         /// Adds a new node into the tree.
         /// </summary>
         /// <param name="node">Node to be added</param>
-        /// <param name="parent">Node to be added under</param>
         /// <exception cref="ArgumentNullException"><paramref name="node"/> is null</exception>
-        public void Add(T node, T parent = null)
+        public void Add(T node)
         {
             ArgumentNullException.ThrowIfNull(node);
 
-            Insert(node, parent);
+            Insert(node);
         }
 
         /// <summary>
@@ -77,11 +76,9 @@ namespace Ryujinx.Common.Collections
         /// Inserts a new node into the tree.
         /// </summary>
         /// <param name="node">Node to be inserted</param>
-        /// <param name="parent">Node to be inserted under</param>
+        private void Insert(T node)
-        private void Insert(T node, T parent = null)
         {
-            T newNode = parent != null ? InsertWithParent(node, parent) : BSTInsert(node);
+            T newNode = BSTInsert(node);
-            
             RestoreBalanceAfterInsertion(newNode);
         }
 
@@ -125,77 +122,10 @@ namespace Ryujinx.Common.Collections
             else if (newNode.CompareTo(parent) < 0)
             {
                 parent.Left = newNode;
-                
-                newNode.Successor = parent;
-                
-                if (parent.Predecessor != null)
-                {
-                    newNode.Predecessor = parent.Predecessor;
-                    newNode.Predecessor.Successor = newNode;
-                }
-                
-                parent.Predecessor = newNode;
             }
             else
             {
                 parent.Right = newNode;
-                
-                newNode.Predecessor = parent;
-                
-                if (parent.Successor != null)
-                {
-                    newNode.Successor = parent.Successor;
-                    newNode.Successor.Predecessor = newNode;
-                }
-                
-                parent.Successor = newNode;
-            }
-            Count++;
-            return newNode;
-        }
-        
-        /// <summary>
-        /// Insertion Mechanism for a Binary Search Tree (BST).
-        /// <br></br>
-        /// Inserts a new node directly under a parent node
-        /// where all children in the left subtree are less than <paramref name="newNode"/>,
-        /// and all children in the right subtree are greater than <paramref name="newNode"/>.
-        /// </summary>
-        /// <param name="newNode">Node to be inserted</param>
-        /// <param name="parent">Node to be inserted under</param>
-        /// <returns>The inserted Node</returns>
-        private T InsertWithParent(T newNode, T parent)
-        {
-            newNode.Parent = parent;
-
-            if (newNode.CompareTo(parent) < 0)
-            {
-                parent.Left = newNode;
-                
-                newNode.Successor = parent;
-                
-                if (parent.Predecessor != null)
-                {
-                    newNode.Predecessor = parent.Predecessor;
-                    parent.Predecessor = newNode;
-                    newNode.Predecessor.Successor = newNode;
-                }
-                
-                parent.Predecessor = newNode;
-            }
-            else
-            {
-                parent.Right = newNode;
-                
-                newNode.Predecessor = parent;
-                
-                if (parent.Successor != null)
-                {
-                    newNode.Successor = parent.Successor;
-                    newNode.Successor.Predecessor = newNode;
-                }
-                
-                parent.Successor = newNode;
             }
 
             Count++;
@@ -229,7 +159,7 @@ namespace Ryujinx.Common.Collections
             }
             else
             {
-                T element = nodeToDelete.Successor;
+                T element = Minimum(RightOf(nodeToDelete));
 
                 child = RightOf(element);
                 parent = ParentOf(element);
@@ -257,9 +187,6 @@ namespace Ryujinx.Common.Collections
                 element.Left = old.Left;
                 element.Right = old.Right;
                 element.Parent = old.Parent;
-                element.Predecessor = old.Predecessor;
-                if (element.Predecessor != null)
-                    element.Predecessor.Successor = element;
 
                 if (ParentOf(old) == null)
                 {
@@ -315,11 +242,6 @@ namespace Ryujinx.Common.Collections
                 RestoreBalanceAfterRemoval(child);
             }
 
-            if (old.Successor != null)
-                old.Successor.Predecessor = old.Predecessor;
-            if (old.Predecessor != null)
-                old.Predecessor.Successor = old.Successor;
-
             return old;
         }
 

src/Ryujinx.Common/Collections/IntrusiveRedBlackTreeNode.cs

@@ -9,7 +9,8 @@ namespace Ryujinx.Common.Collections
         public T Left;
         public T Right;
         public T Parent;
-        public T Predecessor;
+
-        public T Successor;
+        public T Predecessor => IntrusiveRedBlackTreeImpl<T>.PredecessorOf((T)this);
+        public T Successor => IntrusiveRedBlackTreeImpl<T>.SuccessorOf((T)this);
     }
 }

src/Ryujinx.Common/Collections/TreeDictionary.cs

@@ -109,7 +109,7 @@ namespace Ryujinx.Common.Collections
             Node<TKey, TValue> node = GetNode(key);
             if (node != null)
             {
-                Node<TKey, TValue> successor = node.Successor;
+                Node<TKey, TValue> successor = SuccessorOf(node);
 
                 return successor != null ? successor.Key : default;
             }
@@ -127,7 +127,7 @@ namespace Ryujinx.Common.Collections
             Node<TKey, TValue> node = GetNode(key);
             if (node != null)
             {
-                Node<TKey, TValue> predecessor = node.Predecessor;
+                Node<TKey, TValue> predecessor = PredecessorOf(node);
 
                 return predecessor != null ? predecessor.Key : default;
             }
@@ -136,10 +136,11 @@ namespace Ryujinx.Common.Collections
         }
 
         /// <summary>
-        /// Adds all the nodes in the dictionary as key/value pairs into a list.
+        /// Adds all the nodes in the dictionary as key/value pairs into <paramref name="list"/>.
         /// <br></br>
         /// The key/value pairs will be added in Level Order.
         /// </summary>
+        /// <param name="list">List to add the tree pairs into</param>
         public List<KeyValuePair<TKey, TValue>> AsLevelOrderList()
         {
             List<KeyValuePair<TKey, TValue>> list = [];
@@ -169,7 +170,7 @@ namespace Ryujinx.Common.Collections
         }
 
         /// <summary>
-        /// Adds all the nodes in the dictionary into a list.
+        /// Adds all the nodes in the dictionary into <paramref name="list"/>.
         /// </summary>
         /// <returns>A list of all KeyValuePairs sorted by Key Order</returns>
         public List<KeyValuePair<TKey, TValue>> AsList()
@@ -283,7 +284,7 @@ namespace Ryujinx.Common.Collections
             }
 
             Node<TKey, TValue> newNode = new(key, value, parent);
-            if (parent == null)
+            if (newNode.Parent == null)
             {
                 Root = newNode;
             }

src/Ryujinx.Common/Configuration/Hid/Controller/GamepadInputId.cs

@@ -46,11 +46,10 @@ namespace Ryujinx.Common.Configuration.Hid.Controller
         // PS5 touchpad button
         Touchpad,
 
-        // Virtual buttons for single joycon (left)
+        // Virtual buttons for single joycon
         SingleLeftTrigger0,
         SingleRightTrigger0,
 
-        // Virtual buttons for single joycon (right)
         SingleLeftTrigger1,
         SingleRightTrigger1,
 

src/Ryujinx.Common/Logging/LogClass.cs

@@ -13,7 +13,6 @@ namespace Ryujinx.Common.Logging
         Cpu,
         Emulation,
         FFmpeg,
-        GdbStub,
         Font,
         Gpu,
         Hid,

src/Ryujinx.Common/Logging/Logger.cs

@@ -187,17 +187,6 @@ namespace Ryujinx.Common.Logging
             }
         }
 
-        public static void Flush()
-        {
-            foreach (ILogTarget target in _logTargets)
-            {
-                if (target is AsyncLogTargetWrapper asyncTarget)
-                {
-                    asyncTarget.Flush();
-                }
-            }
-        }
-
         public static void Shutdown()
         {
             Updated = null;

src/Ryujinx.Common/Logging/Targets/AsyncLogTargetWrapper.cs

@@ -27,17 +27,6 @@ namespace Ryujinx.Common.Logging.Targets
 
         private readonly int _overflowTimeout;
 
-        private sealed class FlushEventArgs : LogEventArgs
-        {
-            public readonly ManualResetEventSlim SignalEvent;
-
-            public FlushEventArgs(ManualResetEventSlim signalEvent)
-                : base(LogLevel.Notice, TimeSpan.Zero, string.Empty, string.Empty)
-            {
-                SignalEvent = signalEvent;
-            }
-        }
-
         string ILogTarget.Name => _target.Name;
 
         public AsyncLogTargetWrapper(ILogTarget target, int queueLimit = -1, AsyncLogTargetOverflowAction overflowAction = AsyncLogTargetOverflowAction.Block)
@@ -52,15 +41,7 @@ namespace Ryujinx.Common.Logging.Targets
                 {
                     try
                     {
-                        LogEventArgs item = _messageQueue.Take();
+                        _target.Log(this, _messageQueue.Take());
-
-                        if (item is FlushEventArgs flush)
-                        {
-                            flush.SignalEvent.Set();
-                            continue;
-                        }
-
-                        _target.Log(this, item);
                     }
                     catch (InvalidOperationException)
                     {
@@ -87,26 +68,6 @@ namespace Ryujinx.Common.Logging.Targets
             }
         }
 
-        public void Flush()
-        {
-            if (_messageQueue.Count == 0 || _messageQueue.IsAddingCompleted)
-            {
-                return;
-            }
-
-            using var signal = new ManualResetEventSlim(false);
-            try
-            {
-                _messageQueue.Add(new FlushEventArgs(signal));
-            }
-            catch (InvalidOperationException)
-            {
-                return;
-            }
-
-            signal.Wait();
-        }
-
         public void Dispose()
         {
             GC.SuppressFinalize(this);

src/Ryujinx.Common/Memory/IArray.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Ryujinx.Common.Memory
 {
     /// <summary>
@@ -19,10 +17,5 @@ namespace Ryujinx.Common.Memory
         /// Number of elements on the array.
         /// </summary>
         int Length { get; }
-
-        /// <summary>
-        /// Number of elements on the array.
-        /// </summary>
-        public Span<T> AsSpan();
     }
 }

src/Ryujinx.Common/Memory/MemoryOwner.cs

@@ -1,7 +1,6 @@
 #nullable enable
 using System;
 using System.Buffers;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
@@ -11,126 +10,11 @@ namespace Ryujinx.Common.Memory
 {
     /// <summary>
     /// An <see cref="IMemoryOwner{T}"/> implementation with an embedded length and fast <see cref="Span{T}"/>
-    /// accessor, with memory allocated from <see cref="ArrayPooling"/>.
+    /// accessor, with memory allocated from <seealso cref="ArrayPool{T}.Shared"/>.
     /// </summary>
     /// <typeparam name="T">The type of item to store.</typeparam>
     public sealed class MemoryOwner<T> : IMemoryOwner<T>
     {
-        private static class ArrayPooling
-        {
-            public class Holder(T[]? array = null) : IComparable<Holder>, IComparable<int>
-            {
-                public int SkipCount;
-                public readonly T[]? Array = array;
-
-                public int CompareTo(Holder? other)
-                {
-                    return Array!.Length.CompareTo(other!.Array!.Length);
-                }
-                
-                public int CompareTo(int other)
-                {
-                    int self = Array!.Length;
-
-                    if (self < other)
-                    {
-                        SkipCount++;
-                        return -1;
-                    }
-
-                    if (self > other * 4)
-                    {
-                        return 1;
-                    }
-                    
-                    return 0;
-                }
-            }
-            
-            // ReSharper disable once StaticMemberInGenericType
-            private static int _maxCacheCount = 50;
-            
-            private const int MaxSkipCount = 50;
-        
-            static readonly List<Holder> _pool = new();
-            
-            // ReSharper disable once StaticMemberInGenericType
-            static readonly Lock _lock = new();
-            
-            private static int BinarySearch(List<Holder> list, int size)
-            {
-                int min = 0;
-                int max = list.Count-1;
-
-                while (min <= max)
-                {
-                    int mid = (min + max) / 2;
-                    int comparison = list[mid].CompareTo(size);
-                    if (comparison == 0)
-                    {
-                        return mid;
-                    }
-                    if (comparison < 0)
-                    {
-                        min = mid+1;
-                    }
-                    else
-                    {
-                        max = mid-1;
-                    }
-                }
-                return ~min;
-            }
-
-            public static T[] Get(int minimumSize)
-            {
-                lock (_lock)
-                {
-                    int index = BinarySearch(_pool, minimumSize);
-
-                    if (index >= 0)
-                    {
-                        Holder holder = _pool[index];
-                        
-                        _pool.Remove(holder);
-                        return holder.Array!;
-                    }
-
-                    return new T[minimumSize];
-                }
-            }
-
-            public static void Return(T[] array)
-            {
-
-                lock (_lock)
-                {
-                    Holder holder = new(array);
-                    int i = _pool.BinarySearch(holder);
-                    if (i < 0)
-                    {
-                        _pool.Insert(~i, holder);
-                    }
-
-                    if (_pool.Count >= _maxCacheCount)
-                    {
-                        for (int index = 0; index < _pool.Count; index++)
-                        {
-                            Holder h = _pool[index];
-
-                            if (h.SkipCount >= MaxSkipCount)
-                            {
-                                _pool.Remove(h);
-                                index--;
-                            }
-                        }
-                        
-                        _maxCacheCount = _pool.Count * 2;
-                    }
-                }
-            }
-        }
-        
         private readonly int _length;
         private T[]? _array;
 
@@ -141,7 +25,7 @@ namespace Ryujinx.Common.Memory
         private MemoryOwner(int length)
         {
             _length = length;
-            _array = ArrayPooling.Get(length);
+            _array = ArrayPool<T>.Shared.Rent(length);
         }
 
         /// <summary>
@@ -240,7 +124,7 @@ namespace Ryujinx.Common.Memory
 
             if (array is not null)
             {
-                ArrayPooling.Return(array);
+                ArrayPool<T>.Shared.Return(array, RuntimeHelpers.IsReferenceOrContainsReferences<T>());
             }
         }
 

src/Ryujinx.Common/Memory/PartialUnmaps/ThreadLocalMap.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Runtime.InteropServices;
 using System.Threading;
 using static Ryujinx.Common.Memory.PartialUnmaps.PartialUnmapHelpers;
@@ -44,12 +43,9 @@ namespace Ryujinx.Common.Memory.PartialUnmaps
         {
             // Try get a match first.
 
-            Span<int> threadIdsSpan = ThreadIds.AsSpan();
-            Span<T> structsSpan = Structs.AsSpan();
-
             for (int i = 0; i < MapSize; i++)
             {
-                int compare = Interlocked.CompareExchange(ref threadIdsSpan[i], threadId, threadId);
+                int compare = Interlocked.CompareExchange(ref ThreadIds[i], threadId, threadId);
 
                 if (compare == threadId)
                 {
@@ -61,11 +57,11 @@ namespace Ryujinx.Common.Memory.PartialUnmaps
 
             for (int i = 0; i < MapSize; i++)
             {
-                int compare = Interlocked.CompareExchange(ref threadIdsSpan[i], threadId, 0);
+                int compare = Interlocked.CompareExchange(ref ThreadIds[i], threadId, 0);
 
                 if (compare == 0)
                 {
-                    structsSpan[i] = initial;
+                    Structs[i] = initial;
                     return i;
                 }
             }

src/Ryujinx.Common/SharedConstants.cs

@@ -2,18 +2,8 @@ namespace Ryujinx.Common
 {
     public static class SharedConstants
     {
-        public const string DefaultLanPlayHost = "ldn.ryujinx.app";
+        public const string DefaultLanPlayHost = "ryuldn.vudjun.com";
         public const short LanPlayPort = 30456;
-        public const string DefaultLanPlayWebHost = DefaultLanPlayHost;
+        public const string DefaultLanPlayWebHost = "ryuldnweb.vudjun.com";
-
-        public const string AmiiboTagsUrl = "https://raw.githubusercontent.com/Ryubing/Nfc/refs/heads/main/tags.json";
-
-        public const string FaqWikiUrl = "https://git.ryujinx.app/ryubing/ryujinx/-/wikis/FAQ-&-Troubleshooting";
-
-        public const string SetupGuideWikiUrl =
-            "https://git.ryujinx.app/ryubing/ryujinx/-/wikis/Setup-&-Configuration-Guide";
-
-        public const string MultiplayerWikiUrl =
-            "https://git.ryujinx.app/ryubing/ryujinx/-/wikis/Multiplayer-(LDN-Local-Wireless)-Guide";
     }
 }

src/Ryujinx.Common/TitleIDs.cs

@@ -83,8 +83,6 @@ namespace Ryujinx.Common
             "010049900F546002", // Super Mario Sunshine
             "0100a3900c3e2000", // Paper Mario: The Origami King
             "0100ecd018ebe000", // Paper Mario: The Thousand-Year Door
-            "01009cC022b96000", // Super Mario Galaxy
-            "0100fd8022daa000", // Super Mario Galaxy 2
 
                           //Pikmin Franchise
             "0100aa80194b0000", // Pikmin 1
@@ -160,8 +158,6 @@ namespace Ryujinx.Common
             "01009aa000faa000", // Sonic Mania
             "01005ea01c0fc000", // SONIC X SHADOW GENERATIONS
             "01005ea01c0fc001", // ^
-            "01006e001823c000", // Sonic Racing: CrossWorlds
-            "010064b0242be000", // Sonic Racing: CrossWorlds - Demo
 
                           //Xenoblade Franchise
             "0100ff500e34a000", // Xenoblade Chronicles - Definitive Edition
@@ -186,7 +182,6 @@ namespace Ryujinx.Common
             "01001cc01b2d4000", // Goat Simulator 3
             "01003620068ea000", // Hand of Fate 2
             "0100f7e00c70e000", // Hogwarts Legacy
-            "010013c00e930000", // Hollow Knight: Silksong
             "010085500130a000", // Lego City: Undercover
             "010073c01af34000", // LEGO Horizon Adventures
             "0100d71004694000", // Minecraft