add back the SDL2 enum for back compatibility so existing configs are not entirely reset upon loading the version with SDL3

chore: SDL3 (ryubing/ryujinx!207 )
See merge request ryubing/ryujinx!207
2026-04-01 11:41:08 +00:00 · 2025-11-07 15:02:29 -06:00 · 2025-11-07 14:43:48 -06:00 · 2025-11-06 23:40:16 -06:00 · 2025-11-04 20:48:36 -06:00 · 2025-10-30 21:09:24 -05:00
327 changed files with 7911 additions and 5447 deletions
--- a/COMPILING.md
+++ b/COMPILING.md
@@ -10,7 +10,7 @@ Make sure your SDK version is higher or equal to the required version specified

 ### Step 2

-Either use `git clone https://github.com/Ryubing/Ryujinx` on the command line to clone the repository or use Code --> Download zip button to get the files.
+Either use `git clone https://git.ryujinx.app/ryubing/ryujinx.git` on the command line to clone the repository or use Code --> Download zip button to get the files.

 ### Step 3

--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -3,25 +3,26 @@
    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
  </PropertyGroup>
  <ItemGroup>
-    <PackageVersion Include="Avalonia" Version="11.0.13" />
-    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.0.13" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.0.13" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="11.0.13" />
-    <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.0.13" />
-    <PackageVersion Include="Avalonia.Svg" Version="11.0.0.19" />
-    <PackageVersion Include="Avalonia.Svg.Skia" Version="11.0.0.19" />
+    <PackageVersion Include="Avalonia" Version="11.3.6" />
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.6" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.3.6" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.6" />
+    <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.3.6" />
+    <PackageVersion Include="Svg.Controls.Avalonia" Version="11.3.6.2" />
+    <PackageVersion Include="Svg.Controls.Skia.Avalonia" Version="11.3.6.2" />
    <PackageVersion Include="Microsoft.Build.Framework" Version="17.11.4" />
    <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.12.6" />
    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageVersion Include="Projektanker.Icons.Avalonia" Version="9.4.0" />
-    <PackageVersion Include="Projektanker.Icons.Avalonia.FontAwesome" Version="9.4.0"/>
-    <PackageVersion Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="9.4.0"/>
+    <PackageVersion Include="Projektanker.Icons.Avalonia" Version="9.6.2" />
+    <PackageVersion Include="Projektanker.Icons.Avalonia.FontAwesome" Version="9.6.2" />
+    <PackageVersion Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="9.6.2" />
+    <PackageVersion Include="ppy.SDL3-CS" Version="2025.920.0" />
    <PackageVersion Include="CommandLineParser" Version="2.9.1" />
-    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0"/>
+    <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="DynamicData" Version="9.4.1" />
-    <PackageVersion Include="FluentAvaloniaUI" Version="2.0.5" />
+    <PackageVersion Include="FluentAvaloniaUI.NoAnim" Version="2.4.0-build3" />
    <PackageVersion Include="Humanizer" Version="2.14.1" />
    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
@@ -40,11 +41,10 @@
    <PackageVersion Include="Ryujinx.Audio.OpenAL.Dependencies" Version="1.21.0.1" />
    <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies.AllArch" Version="6.1.2-build3" />
    <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.LibHac" Version="0.21.0-alpha.126" />
    <PackageVersion Include="Ryujinx.UpdateClient" Version="1.0.44" />
    <PackageVersion Include="Ryujinx.Systems.Update.Common" Version="1.0.44" />
-    <PackageVersion Include="Gommon" Version="2.7.2.1" />
+    <PackageVersion Include="Gommon" Version="2.8.0.1" />
    <PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />
    <PackageVersion Include="Sep" Version="0.11.1" />
    <PackageVersion Include="shaderc.net" Version="0.1.0" />
@@ -59,4 +59,4 @@
    <PackageVersion Include="System.Management" Version="9.0.2" />
    <PackageVersion Include="UnicornEngine.Unicorn" Version="2.0.2-rc1-fb78016" />
  </ItemGroup>
-</Project>
+</Project>
--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@ If you are planning to contribute or just want to learn more about this project
 - **Audio**

  Audio output is entirely supported, audio input (microphone) isn't supported.
-  We use C# wrappers for [OpenAL](https://openal-soft.org/), and [SDL2](https://www.libsdl.org/) & [libsoundio](http://libsound.io/) as fallbacks.
+  We use C# wrappers for [OpenAL](https://openal-soft.org/), and [SDL3](https://www.libsdl.org/) & [libsoundio](http://libsound.io/) as fallbacks.

 - **CPU**

--- a/Ryujinx.sln
+++ b/Ryujinx.sln
@@ -51,12 +51,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Audio.Backends.Soun
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Input", "src\Ryujinx.Input\Ryujinx.Input.csproj", "{C16F112F-38C3-40BC-9F5F-4791112063D6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Input.SDL2", "src\Ryujinx.Input.SDL2\Ryujinx.Input.SDL2.csproj", "{DFAB6F2D-B9BF-4AFF-B22B-7684A328EBA3}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.SDL2.Common", "src\Ryujinx.SDL2.Common\Ryujinx.SDL2.Common.csproj", "{2D5D3A1D-5730-4648-B0AB-06C53CB910C0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Audio.Backends.SDL2", "src\Ryujinx.Audio.Backends.SDL2\Ryujinx.Audio.Backends.SDL2.csproj", "{D99A395A-8569-4DB0-B336-900647890052}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Nvdec.FFmpeg", "src\Ryujinx.Graphics.Nvdec.FFmpeg\Ryujinx.Graphics.Nvdec.FFmpeg.csproj", "{BEE1C184-C9A4-410B-8DFC-FB74D5C93AEB}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx", "src\Ryujinx\Ryujinx.csproj", "{7C1B2721-13DA-4B62-B046-C626605ECCE6}"
@@ -89,171 +83,488 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		nuget.config = nuget.config
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.SDL3.Common", "src\Ryujinx.SDL3.Common\Ryujinx.SDL3.Common.csproj", "{F6F9826A-BC58-4D78-A700-F358A66B2B06}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.Input.SDL3", "src\Ryujinx.Input.SDL3\Ryujinx.Input.SDL3.csproj", "{D728444C-3D1F-4A0E-B4C9-5C9375D47EA3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.Audio.Backends.SDL3", "src\Ryujinx.Audio.Backends.SDL3\Ryujinx.Audio.Backends.SDL3.csproj", "{988E6191-82E1-4E13-9DDB-CB9FA2FDAF29}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{EBB55AEA-C7D7-4DEB-BF96-FA1789E225E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EBB55AEA-C7D7-4DEB-BF96-FA1789E225E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EBB55AEA-C7D7-4DEB-BF96-FA1789E225E9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EBB55AEA-C7D7-4DEB-BF96-FA1789E225E9}.Debug|x64.Build.0 = Debug|Any CPU
+		{EBB55AEA-C7D7-4DEB-BF96-FA1789E225E9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EBB55AEA-C7D7-4DEB-BF96-FA1789E225E9}.Debug|x86.Build.0 = Debug|Any CPU
 		{EBB55AEA-C7D7-4DEB-BF96-FA1789E225E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EBB55AEA-C7D7-4DEB-BF96-FA1789E225E9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EBB55AEA-C7D7-4DEB-BF96-FA1789E225E9}.Release|x64.ActiveCfg = Release|Any CPU
+		{EBB55AEA-C7D7-4DEB-BF96-FA1789E225E9}.Release|x64.Build.0 = Release|Any CPU
+		{EBB55AEA-C7D7-4DEB-BF96-FA1789E225E9}.Release|x86.ActiveCfg = Release|Any CPU
+		{EBB55AEA-C7D7-4DEB-BF96-FA1789E225E9}.Release|x86.Build.0 = Release|Any CPU
 		{D8F72938-78EF-4E8C-BAFE-531C9C3C8F15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D8F72938-78EF-4E8C-BAFE-531C9C3C8F15}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D8F72938-78EF-4E8C-BAFE-531C9C3C8F15}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D8F72938-78EF-4E8C-BAFE-531C9C3C8F15}.Debug|x64.Build.0 = Debug|Any CPU
+		{D8F72938-78EF-4E8C-BAFE-531C9C3C8F15}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D8F72938-78EF-4E8C-BAFE-531C9C3C8F15}.Debug|x86.Build.0 = Debug|Any CPU
 		{D8F72938-78EF-4E8C-BAFE-531C9C3C8F15}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D8F72938-78EF-4E8C-BAFE-531C9C3C8F15}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D8F72938-78EF-4E8C-BAFE-531C9C3C8F15}.Release|x64.ActiveCfg = Release|Any CPU
+		{D8F72938-78EF-4E8C-BAFE-531C9C3C8F15}.Release|x64.Build.0 = Release|Any CPU
+		{D8F72938-78EF-4E8C-BAFE-531C9C3C8F15}.Release|x86.ActiveCfg = Release|Any CPU
+		{D8F72938-78EF-4E8C-BAFE-531C9C3C8F15}.Release|x86.Build.0 = Release|Any CPU
 		{CB92CFF9-1D62-4D4F-9E88-8130EF61E351}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CB92CFF9-1D62-4D4F-9E88-8130EF61E351}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB92CFF9-1D62-4D4F-9E88-8130EF61E351}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CB92CFF9-1D62-4D4F-9E88-8130EF61E351}.Debug|x64.Build.0 = Debug|Any CPU
+		{CB92CFF9-1D62-4D4F-9E88-8130EF61E351}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CB92CFF9-1D62-4D4F-9E88-8130EF61E351}.Debug|x86.Build.0 = Debug|Any CPU
 		{CB92CFF9-1D62-4D4F-9E88-8130EF61E351}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CB92CFF9-1D62-4D4F-9E88-8130EF61E351}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CB92CFF9-1D62-4D4F-9E88-8130EF61E351}.Release|x64.ActiveCfg = Release|Any CPU
+		{CB92CFF9-1D62-4D4F-9E88-8130EF61E351}.Release|x64.Build.0 = Release|Any CPU
+		{CB92CFF9-1D62-4D4F-9E88-8130EF61E351}.Release|x86.ActiveCfg = Release|Any CPU
+		{CB92CFF9-1D62-4D4F-9E88-8130EF61E351}.Release|x86.Build.0 = Release|Any CPU
 		{3AB294D0-2230-468F-9EB3-BDFCAEAE99A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3AB294D0-2230-468F-9EB3-BDFCAEAE99A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3AB294D0-2230-468F-9EB3-BDFCAEAE99A5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3AB294D0-2230-468F-9EB3-BDFCAEAE99A5}.Debug|x64.Build.0 = Debug|Any CPU
+		{3AB294D0-2230-468F-9EB3-BDFCAEAE99A5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3AB294D0-2230-468F-9EB3-BDFCAEAE99A5}.Debug|x86.Build.0 = Debug|Any CPU
 		{3AB294D0-2230-468F-9EB3-BDFCAEAE99A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3AB294D0-2230-468F-9EB3-BDFCAEAE99A5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3AB294D0-2230-468F-9EB3-BDFCAEAE99A5}.Release|x64.ActiveCfg = Release|Any CPU
+		{3AB294D0-2230-468F-9EB3-BDFCAEAE99A5}.Release|x64.Build.0 = Release|Any CPU
+		{3AB294D0-2230-468F-9EB3-BDFCAEAE99A5}.Release|x86.ActiveCfg = Release|Any CPU
+		{3AB294D0-2230-468F-9EB3-BDFCAEAE99A5}.Release|x86.Build.0 = Release|Any CPU
 		{5FD4E4F6-8928-4B3C-BE07-28A675C17226}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5FD4E4F6-8928-4B3C-BE07-28A675C17226}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5FD4E4F6-8928-4B3C-BE07-28A675C17226}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5FD4E4F6-8928-4B3C-BE07-28A675C17226}.Debug|x64.Build.0 = Debug|Any CPU
+		{5FD4E4F6-8928-4B3C-BE07-28A675C17226}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5FD4E4F6-8928-4B3C-BE07-28A675C17226}.Debug|x86.Build.0 = Debug|Any CPU
 		{5FD4E4F6-8928-4B3C-BE07-28A675C17226}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5FD4E4F6-8928-4B3C-BE07-28A675C17226}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5FD4E4F6-8928-4B3C-BE07-28A675C17226}.Release|x64.ActiveCfg = Release|Any CPU
+		{5FD4E4F6-8928-4B3C-BE07-28A675C17226}.Release|x64.Build.0 = Release|Any CPU
+		{5FD4E4F6-8928-4B3C-BE07-28A675C17226}.Release|x86.ActiveCfg = Release|Any CPU
+		{5FD4E4F6-8928-4B3C-BE07-28A675C17226}.Release|x86.Build.0 = Release|Any CPU
 		{ABF09A5E-2D8B-4B6F-A51D-5CE414DDB15A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{ABF09A5E-2D8B-4B6F-A51D-5CE414DDB15A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ABF09A5E-2D8B-4B6F-A51D-5CE414DDB15A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{ABF09A5E-2D8B-4B6F-A51D-5CE414DDB15A}.Debug|x64.Build.0 = Debug|Any CPU
+		{ABF09A5E-2D8B-4B6F-A51D-5CE414DDB15A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{ABF09A5E-2D8B-4B6F-A51D-5CE414DDB15A}.Debug|x86.Build.0 = Debug|Any CPU
 		{ABF09A5E-2D8B-4B6F-A51D-5CE414DDB15A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ABF09A5E-2D8B-4B6F-A51D-5CE414DDB15A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ABF09A5E-2D8B-4B6F-A51D-5CE414DDB15A}.Release|x64.ActiveCfg = Release|Any CPU
+		{ABF09A5E-2D8B-4B6F-A51D-5CE414DDB15A}.Release|x64.Build.0 = Release|Any CPU
+		{ABF09A5E-2D8B-4B6F-A51D-5CE414DDB15A}.Release|x86.ActiveCfg = Release|Any CPU
+		{ABF09A5E-2D8B-4B6F-A51D-5CE414DDB15A}.Release|x86.Build.0 = Release|Any CPU
 		{ADA7EA87-0D63-4D97-9433-922A2124401F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{ADA7EA87-0D63-4D97-9433-922A2124401F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ADA7EA87-0D63-4D97-9433-922A2124401F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{ADA7EA87-0D63-4D97-9433-922A2124401F}.Debug|x64.Build.0 = Debug|Any CPU
+		{ADA7EA87-0D63-4D97-9433-922A2124401F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{ADA7EA87-0D63-4D97-9433-922A2124401F}.Debug|x86.Build.0 = Debug|Any CPU
 		{ADA7EA87-0D63-4D97-9433-922A2124401F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ADA7EA87-0D63-4D97-9433-922A2124401F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ADA7EA87-0D63-4D97-9433-922A2124401F}.Release|x64.ActiveCfg = Release|Any CPU
+		{ADA7EA87-0D63-4D97-9433-922A2124401F}.Release|x64.Build.0 = Release|Any CPU
+		{ADA7EA87-0D63-4D97-9433-922A2124401F}.Release|x86.ActiveCfg = Release|Any CPU
+		{ADA7EA87-0D63-4D97-9433-922A2124401F}.Release|x86.Build.0 = Release|Any CPU
 		{A602AE97-91A5-4608-8DF1-EBF4ED7A0B9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A602AE97-91A5-4608-8DF1-EBF4ED7A0B9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A602AE97-91A5-4608-8DF1-EBF4ED7A0B9E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A602AE97-91A5-4608-8DF1-EBF4ED7A0B9E}.Debug|x64.Build.0 = Debug|Any CPU
+		{A602AE97-91A5-4608-8DF1-EBF4ED7A0B9E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A602AE97-91A5-4608-8DF1-EBF4ED7A0B9E}.Debug|x86.Build.0 = Debug|Any CPU
 		{A602AE97-91A5-4608-8DF1-EBF4ED7A0B9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A602AE97-91A5-4608-8DF1-EBF4ED7A0B9E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A602AE97-91A5-4608-8DF1-EBF4ED7A0B9E}.Release|x64.ActiveCfg = Release|Any CPU
+		{A602AE97-91A5-4608-8DF1-EBF4ED7A0B9E}.Release|x64.Build.0 = Release|Any CPU
+		{A602AE97-91A5-4608-8DF1-EBF4ED7A0B9E}.Release|x86.ActiveCfg = Release|Any CPU
+		{A602AE97-91A5-4608-8DF1-EBF4ED7A0B9E}.Release|x86.Build.0 = Release|Any CPU
 		{9558FB96-075D-4219-8FFF-401979DC0B69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9558FB96-075D-4219-8FFF-401979DC0B69}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9558FB96-075D-4219-8FFF-401979DC0B69}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9558FB96-075D-4219-8FFF-401979DC0B69}.Debug|x64.Build.0 = Debug|Any CPU
+		{9558FB96-075D-4219-8FFF-401979DC0B69}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9558FB96-075D-4219-8FFF-401979DC0B69}.Debug|x86.Build.0 = Debug|Any CPU
 		{9558FB96-075D-4219-8FFF-401979DC0B69}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9558FB96-075D-4219-8FFF-401979DC0B69}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9558FB96-075D-4219-8FFF-401979DC0B69}.Release|x64.ActiveCfg = Release|Any CPU
+		{9558FB96-075D-4219-8FFF-401979DC0B69}.Release|x64.Build.0 = Release|Any CPU
+		{9558FB96-075D-4219-8FFF-401979DC0B69}.Release|x86.ActiveCfg = Release|Any CPU
+		{9558FB96-075D-4219-8FFF-401979DC0B69}.Release|x86.Build.0 = Release|Any CPU
 		{E1B1AD28-289D-47B7-A106-326972240207}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E1B1AD28-289D-47B7-A106-326972240207}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E1B1AD28-289D-47B7-A106-326972240207}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E1B1AD28-289D-47B7-A106-326972240207}.Debug|x64.Build.0 = Debug|Any CPU
+		{E1B1AD28-289D-47B7-A106-326972240207}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E1B1AD28-289D-47B7-A106-326972240207}.Debug|x86.Build.0 = Debug|Any CPU
 		{E1B1AD28-289D-47B7-A106-326972240207}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E1B1AD28-289D-47B7-A106-326972240207}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E1B1AD28-289D-47B7-A106-326972240207}.Release|x64.ActiveCfg = Release|Any CPU
+		{E1B1AD28-289D-47B7-A106-326972240207}.Release|x64.Build.0 = Release|Any CPU
+		{E1B1AD28-289D-47B7-A106-326972240207}.Release|x86.ActiveCfg = Release|Any CPU
+		{E1B1AD28-289D-47B7-A106-326972240207}.Release|x86.Build.0 = Release|Any CPU
 		{03B955CD-AD84-4B93-AAA7-BF17923BBAA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{03B955CD-AD84-4B93-AAA7-BF17923BBAA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{03B955CD-AD84-4B93-AAA7-BF17923BBAA5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{03B955CD-AD84-4B93-AAA7-BF17923BBAA5}.Debug|x64.Build.0 = Debug|Any CPU
+		{03B955CD-AD84-4B93-AAA7-BF17923BBAA5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{03B955CD-AD84-4B93-AAA7-BF17923BBAA5}.Debug|x86.Build.0 = Debug|Any CPU
 		{03B955CD-AD84-4B93-AAA7-BF17923BBAA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{03B955CD-AD84-4B93-AAA7-BF17923BBAA5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{03B955CD-AD84-4B93-AAA7-BF17923BBAA5}.Release|x64.ActiveCfg = Release|Any CPU
+		{03B955CD-AD84-4B93-AAA7-BF17923BBAA5}.Release|x64.Build.0 = Release|Any CPU
+		{03B955CD-AD84-4B93-AAA7-BF17923BBAA5}.Release|x86.ActiveCfg = Release|Any CPU
+		{03B955CD-AD84-4B93-AAA7-BF17923BBAA5}.Release|x86.Build.0 = Release|Any CPU
 		{85A0FA56-DC01-4A42-8808-70DAC76BD66D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{85A0FA56-DC01-4A42-8808-70DAC76BD66D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{85A0FA56-DC01-4A42-8808-70DAC76BD66D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{85A0FA56-DC01-4A42-8808-70DAC76BD66D}.Debug|x64.Build.0 = Debug|Any CPU
+		{85A0FA56-DC01-4A42-8808-70DAC76BD66D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{85A0FA56-DC01-4A42-8808-70DAC76BD66D}.Debug|x86.Build.0 = Debug|Any CPU
 		{85A0FA56-DC01-4A42-8808-70DAC76BD66D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{85A0FA56-DC01-4A42-8808-70DAC76BD66D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{85A0FA56-DC01-4A42-8808-70DAC76BD66D}.Release|x64.ActiveCfg = Release|Any CPU
+		{85A0FA56-DC01-4A42-8808-70DAC76BD66D}.Release|x64.Build.0 = Release|Any CPU
+		{85A0FA56-DC01-4A42-8808-70DAC76BD66D}.Release|x86.ActiveCfg = Release|Any CPU
+		{85A0FA56-DC01-4A42-8808-70DAC76BD66D}.Release|x86.Build.0 = Release|Any CPU
 		{806ACF6D-90B0-45D0-A1AC-5F220F3B3985}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{806ACF6D-90B0-45D0-A1AC-5F220F3B3985}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{806ACF6D-90B0-45D0-A1AC-5F220F3B3985}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{806ACF6D-90B0-45D0-A1AC-5F220F3B3985}.Debug|x64.Build.0 = Debug|Any CPU
+		{806ACF6D-90B0-45D0-A1AC-5F220F3B3985}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{806ACF6D-90B0-45D0-A1AC-5F220F3B3985}.Debug|x86.Build.0 = Debug|Any CPU
 		{806ACF6D-90B0-45D0-A1AC-5F220F3B3985}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{806ACF6D-90B0-45D0-A1AC-5F220F3B3985}.Release|Any CPU.Build.0 = Release|Any CPU
+		{806ACF6D-90B0-45D0-A1AC-5F220F3B3985}.Release|x64.ActiveCfg = Release|Any CPU
+		{806ACF6D-90B0-45D0-A1AC-5F220F3B3985}.Release|x64.Build.0 = Release|Any CPU
+		{806ACF6D-90B0-45D0-A1AC-5F220F3B3985}.Release|x86.ActiveCfg = Release|Any CPU
+		{806ACF6D-90B0-45D0-A1AC-5F220F3B3985}.Release|x86.Build.0 = Release|Any CPU
 		{A5E6C691-9E22-4263-8F40-42F002CE66BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A5E6C691-9E22-4263-8F40-42F002CE66BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A5E6C691-9E22-4263-8F40-42F002CE66BE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A5E6C691-9E22-4263-8F40-42F002CE66BE}.Debug|x64.Build.0 = Debug|Any CPU
+		{A5E6C691-9E22-4263-8F40-42F002CE66BE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A5E6C691-9E22-4263-8F40-42F002CE66BE}.Debug|x86.Build.0 = Debug|Any CPU
 		{A5E6C691-9E22-4263-8F40-42F002CE66BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A5E6C691-9E22-4263-8F40-42F002CE66BE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A5E6C691-9E22-4263-8F40-42F002CE66BE}.Release|x64.ActiveCfg = Release|Any CPU
+		{A5E6C691-9E22-4263-8F40-42F002CE66BE}.Release|x64.Build.0 = Release|Any CPU
+		{A5E6C691-9E22-4263-8F40-42F002CE66BE}.Release|x86.ActiveCfg = Release|Any CPU
+		{A5E6C691-9E22-4263-8F40-42F002CE66BE}.Release|x86.Build.0 = Release|Any CPU
 		{D1CC5322-7325-4F6B-9625-194B30BE1296}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D1CC5322-7325-4F6B-9625-194B30BE1296}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D1CC5322-7325-4F6B-9625-194B30BE1296}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D1CC5322-7325-4F6B-9625-194B30BE1296}.Debug|x64.Build.0 = Debug|Any CPU
+		{D1CC5322-7325-4F6B-9625-194B30BE1296}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D1CC5322-7325-4F6B-9625-194B30BE1296}.Debug|x86.Build.0 = Debug|Any CPU
 		{D1CC5322-7325-4F6B-9625-194B30BE1296}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D1CC5322-7325-4F6B-9625-194B30BE1296}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D1CC5322-7325-4F6B-9625-194B30BE1296}.Release|x64.ActiveCfg = Release|Any CPU
+		{D1CC5322-7325-4F6B-9625-194B30BE1296}.Release|x64.Build.0 = Release|Any CPU
+		{D1CC5322-7325-4F6B-9625-194B30BE1296}.Release|x86.ActiveCfg = Release|Any CPU
+		{D1CC5322-7325-4F6B-9625-194B30BE1296}.Release|x86.Build.0 = Release|Any CPU
 		{3DF35E3D-D844-4399-A9A1-A9E923264C17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3DF35E3D-D844-4399-A9A1-A9E923264C17}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3DF35E3D-D844-4399-A9A1-A9E923264C17}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3DF35E3D-D844-4399-A9A1-A9E923264C17}.Debug|x64.Build.0 = Debug|Any CPU
+		{3DF35E3D-D844-4399-A9A1-A9E923264C17}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3DF35E3D-D844-4399-A9A1-A9E923264C17}.Debug|x86.Build.0 = Debug|Any CPU
 		{3DF35E3D-D844-4399-A9A1-A9E923264C17}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3DF35E3D-D844-4399-A9A1-A9E923264C17}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3DF35E3D-D844-4399-A9A1-A9E923264C17}.Release|x64.ActiveCfg = Release|Any CPU
+		{3DF35E3D-D844-4399-A9A1-A9E923264C17}.Release|x64.Build.0 = Release|Any CPU
+		{3DF35E3D-D844-4399-A9A1-A9E923264C17}.Release|x86.ActiveCfg = Release|Any CPU
+		{3DF35E3D-D844-4399-A9A1-A9E923264C17}.Release|x86.Build.0 = Release|Any CPU
 		{C3002C3C-7B09-4FE7-894A-372EDA22FC6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C3002C3C-7B09-4FE7-894A-372EDA22FC6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C3002C3C-7B09-4FE7-894A-372EDA22FC6E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C3002C3C-7B09-4FE7-894A-372EDA22FC6E}.Debug|x64.Build.0 = Debug|Any CPU
+		{C3002C3C-7B09-4FE7-894A-372EDA22FC6E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C3002C3C-7B09-4FE7-894A-372EDA22FC6E}.Debug|x86.Build.0 = Debug|Any CPU
 		{C3002C3C-7B09-4FE7-894A-372EDA22FC6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C3002C3C-7B09-4FE7-894A-372EDA22FC6E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C3002C3C-7B09-4FE7-894A-372EDA22FC6E}.Release|x64.ActiveCfg = Release|Any CPU
+		{C3002C3C-7B09-4FE7-894A-372EDA22FC6E}.Release|x64.Build.0 = Release|Any CPU
+		{C3002C3C-7B09-4FE7-894A-372EDA22FC6E}.Release|x86.ActiveCfg = Release|Any CPU
+		{C3002C3C-7B09-4FE7-894A-372EDA22FC6E}.Release|x86.Build.0 = Release|Any CPU
 		{C35F1536-7DE5-4F9D-9604-B5B4E1561947}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C35F1536-7DE5-4F9D-9604-B5B4E1561947}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C35F1536-7DE5-4F9D-9604-B5B4E1561947}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C35F1536-7DE5-4F9D-9604-B5B4E1561947}.Debug|x64.Build.0 = Debug|Any CPU
+		{C35F1536-7DE5-4F9D-9604-B5B4E1561947}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C35F1536-7DE5-4F9D-9604-B5B4E1561947}.Debug|x86.Build.0 = Debug|Any CPU
 		{C35F1536-7DE5-4F9D-9604-B5B4E1561947}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C35F1536-7DE5-4F9D-9604-B5B4E1561947}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C35F1536-7DE5-4F9D-9604-B5B4E1561947}.Release|x64.ActiveCfg = Release|Any CPU
+		{C35F1536-7DE5-4F9D-9604-B5B4E1561947}.Release|x64.Build.0 = Release|Any CPU
+		{C35F1536-7DE5-4F9D-9604-B5B4E1561947}.Release|x86.ActiveCfg = Release|Any CPU
+		{C35F1536-7DE5-4F9D-9604-B5B4E1561947}.Release|x86.Build.0 = Release|Any CPU
 		{B9AECA11-E248-4886-A10B-81B631CAAF29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B9AECA11-E248-4886-A10B-81B631CAAF29}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B9AECA11-E248-4886-A10B-81B631CAAF29}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B9AECA11-E248-4886-A10B-81B631CAAF29}.Debug|x64.Build.0 = Debug|Any CPU
+		{B9AECA11-E248-4886-A10B-81B631CAAF29}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B9AECA11-E248-4886-A10B-81B631CAAF29}.Debug|x86.Build.0 = Debug|Any CPU
 		{B9AECA11-E248-4886-A10B-81B631CAAF29}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B9AECA11-E248-4886-A10B-81B631CAAF29}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B9AECA11-E248-4886-A10B-81B631CAAF29}.Release|x64.ActiveCfg = Release|Any CPU
+		{B9AECA11-E248-4886-A10B-81B631CAAF29}.Release|x64.Build.0 = Release|Any CPU
+		{B9AECA11-E248-4886-A10B-81B631CAAF29}.Release|x86.ActiveCfg = Release|Any CPU
+		{B9AECA11-E248-4886-A10B-81B631CAAF29}.Release|x86.Build.0 = Release|Any CPU
 		{81BB2C11-9408-4EA3-822E-42987AF54429}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{81BB2C11-9408-4EA3-822E-42987AF54429}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{81BB2C11-9408-4EA3-822E-42987AF54429}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{81BB2C11-9408-4EA3-822E-42987AF54429}.Debug|x64.Build.0 = Debug|Any CPU
+		{81BB2C11-9408-4EA3-822E-42987AF54429}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{81BB2C11-9408-4EA3-822E-42987AF54429}.Debug|x86.Build.0 = Debug|Any CPU
 		{81BB2C11-9408-4EA3-822E-42987AF54429}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{81BB2C11-9408-4EA3-822E-42987AF54429}.Release|Any CPU.Build.0 = Release|Any CPU
+		{81BB2C11-9408-4EA3-822E-42987AF54429}.Release|x64.ActiveCfg = Release|Any CPU
+		{81BB2C11-9408-4EA3-822E-42987AF54429}.Release|x64.Build.0 = Release|Any CPU
+		{81BB2C11-9408-4EA3-822E-42987AF54429}.Release|x86.ActiveCfg = Release|Any CPU
+		{81BB2C11-9408-4EA3-822E-42987AF54429}.Release|x86.Build.0 = Release|Any CPU
 		{FD4A2C14-8E3D-4957-ABBE-3C38897B3E2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FD4A2C14-8E3D-4957-ABBE-3C38897B3E2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD4A2C14-8E3D-4957-ABBE-3C38897B3E2D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FD4A2C14-8E3D-4957-ABBE-3C38897B3E2D}.Debug|x64.Build.0 = Debug|Any CPU
+		{FD4A2C14-8E3D-4957-ABBE-3C38897B3E2D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FD4A2C14-8E3D-4957-ABBE-3C38897B3E2D}.Debug|x86.Build.0 = Debug|Any CPU
 		{FD4A2C14-8E3D-4957-ABBE-3C38897B3E2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FD4A2C14-8E3D-4957-ABBE-3C38897B3E2D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FD4A2C14-8E3D-4957-ABBE-3C38897B3E2D}.Release|x64.ActiveCfg = Release|Any CPU
+		{FD4A2C14-8E3D-4957-ABBE-3C38897B3E2D}.Release|x64.Build.0 = Release|Any CPU
+		{FD4A2C14-8E3D-4957-ABBE-3C38897B3E2D}.Release|x86.ActiveCfg = Release|Any CPU
+		{FD4A2C14-8E3D-4957-ABBE-3C38897B3E2D}.Release|x86.Build.0 = Release|Any CPU
 		{0BE11899-DF2D-4BDE-B9EE-2489E8D35E7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0BE11899-DF2D-4BDE-B9EE-2489E8D35E7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0BE11899-DF2D-4BDE-B9EE-2489E8D35E7D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0BE11899-DF2D-4BDE-B9EE-2489E8D35E7D}.Debug|x64.Build.0 = Debug|Any CPU
+		{0BE11899-DF2D-4BDE-B9EE-2489E8D35E7D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0BE11899-DF2D-4BDE-B9EE-2489E8D35E7D}.Debug|x86.Build.0 = Debug|Any CPU
 		{0BE11899-DF2D-4BDE-B9EE-2489E8D35E7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0BE11899-DF2D-4BDE-B9EE-2489E8D35E7D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0BE11899-DF2D-4BDE-B9EE-2489E8D35E7D}.Release|x64.ActiveCfg = Release|Any CPU
+		{0BE11899-DF2D-4BDE-B9EE-2489E8D35E7D}.Release|x64.Build.0 = Release|Any CPU
+		{0BE11899-DF2D-4BDE-B9EE-2489E8D35E7D}.Release|x86.ActiveCfg = Release|Any CPU
+		{0BE11899-DF2D-4BDE-B9EE-2489E8D35E7D}.Release|x86.Build.0 = Release|Any CPU
 		{716364DE-B988-41A6-BAB4-327964266ECC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{716364DE-B988-41A6-BAB4-327964266ECC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{716364DE-B988-41A6-BAB4-327964266ECC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{716364DE-B988-41A6-BAB4-327964266ECC}.Debug|x64.Build.0 = Debug|Any CPU
+		{716364DE-B988-41A6-BAB4-327964266ECC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{716364DE-B988-41A6-BAB4-327964266ECC}.Debug|x86.Build.0 = Debug|Any CPU
 		{716364DE-B988-41A6-BAB4-327964266ECC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{716364DE-B988-41A6-BAB4-327964266ECC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{716364DE-B988-41A6-BAB4-327964266ECC}.Release|x64.ActiveCfg = Release|Any CPU
+		{716364DE-B988-41A6-BAB4-327964266ECC}.Release|x64.Build.0 = Release|Any CPU
+		{716364DE-B988-41A6-BAB4-327964266ECC}.Release|x86.ActiveCfg = Release|Any CPU
+		{716364DE-B988-41A6-BAB4-327964266ECC}.Release|x86.Build.0 = Release|Any CPU
 		{C16F112F-38C3-40BC-9F5F-4791112063D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C16F112F-38C3-40BC-9F5F-4791112063D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C16F112F-38C3-40BC-9F5F-4791112063D6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C16F112F-38C3-40BC-9F5F-4791112063D6}.Debug|x64.Build.0 = Debug|Any CPU
+		{C16F112F-38C3-40BC-9F5F-4791112063D6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C16F112F-38C3-40BC-9F5F-4791112063D6}.Debug|x86.Build.0 = Debug|Any CPU
 		{C16F112F-38C3-40BC-9F5F-4791112063D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C16F112F-38C3-40BC-9F5F-4791112063D6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DFAB6F2D-B9BF-4AFF-B22B-7684A328EBA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DFAB6F2D-B9BF-4AFF-B22B-7684A328EBA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DFAB6F2D-B9BF-4AFF-B22B-7684A328EBA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DFAB6F2D-B9BF-4AFF-B22B-7684A328EBA3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2D5D3A1D-5730-4648-B0AB-06C53CB910C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2D5D3A1D-5730-4648-B0AB-06C53CB910C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2D5D3A1D-5730-4648-B0AB-06C53CB910C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2D5D3A1D-5730-4648-B0AB-06C53CB910C0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D99A395A-8569-4DB0-B336-900647890052}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D99A395A-8569-4DB0-B336-900647890052}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D99A395A-8569-4DB0-B336-900647890052}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D99A395A-8569-4DB0-B336-900647890052}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C16F112F-38C3-40BC-9F5F-4791112063D6}.Release|x64.ActiveCfg = Release|Any CPU
+		{C16F112F-38C3-40BC-9F5F-4791112063D6}.Release|x64.Build.0 = Release|Any CPU
+		{C16F112F-38C3-40BC-9F5F-4791112063D6}.Release|x86.ActiveCfg = Release|Any CPU
+		{C16F112F-38C3-40BC-9F5F-4791112063D6}.Release|x86.Build.0 = Release|Any CPU
 		{BEE1C184-C9A4-410B-8DFC-FB74D5C93AEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BEE1C184-C9A4-410B-8DFC-FB74D5C93AEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BEE1C184-C9A4-410B-8DFC-FB74D5C93AEB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BEE1C184-C9A4-410B-8DFC-FB74D5C93AEB}.Debug|x64.Build.0 = Debug|Any CPU
+		{BEE1C184-C9A4-410B-8DFC-FB74D5C93AEB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BEE1C184-C9A4-410B-8DFC-FB74D5C93AEB}.Debug|x86.Build.0 = Debug|Any CPU
 		{BEE1C184-C9A4-410B-8DFC-FB74D5C93AEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BEE1C184-C9A4-410B-8DFC-FB74D5C93AEB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BEE1C184-C9A4-410B-8DFC-FB74D5C93AEB}.Release|x64.ActiveCfg = Release|Any CPU
+		{BEE1C184-C9A4-410B-8DFC-FB74D5C93AEB}.Release|x64.Build.0 = Release|Any CPU
+		{BEE1C184-C9A4-410B-8DFC-FB74D5C93AEB}.Release|x86.ActiveCfg = Release|Any CPU
+		{BEE1C184-C9A4-410B-8DFC-FB74D5C93AEB}.Release|x86.Build.0 = Release|Any CPU
 		{7C1B2721-13DA-4B62-B046-C626605ECCE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7C1B2721-13DA-4B62-B046-C626605ECCE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7C1B2721-13DA-4B62-B046-C626605ECCE6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7C1B2721-13DA-4B62-B046-C626605ECCE6}.Debug|x64.Build.0 = Debug|Any CPU
+		{7C1B2721-13DA-4B62-B046-C626605ECCE6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7C1B2721-13DA-4B62-B046-C626605ECCE6}.Debug|x86.Build.0 = Debug|Any CPU
 		{7C1B2721-13DA-4B62-B046-C626605ECCE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7C1B2721-13DA-4B62-B046-C626605ECCE6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BA161CA0-CD65-4E6E-B644-51C8D1E542DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BA161CA0-CD65-4E6E-B644-51C8D1E542DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BA161CA0-CD65-4E6E-B644-51C8D1E542DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BA161CA0-CD65-4E6E-B644-51C8D1E542DC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7C1B2721-13DA-4B62-B046-C626605ECCE6}.Release|x64.ActiveCfg = Release|Any CPU
+		{7C1B2721-13DA-4B62-B046-C626605ECCE6}.Release|x64.Build.0 = Release|Any CPU
+		{7C1B2721-13DA-4B62-B046-C626605ECCE6}.Release|x86.ActiveCfg = Release|Any CPU
+		{7C1B2721-13DA-4B62-B046-C626605ECCE6}.Release|x86.Build.0 = Release|Any CPU
 		{6AE2A5E8-4C5A-48B9-997B-E1455C0355C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6AE2A5E8-4C5A-48B9-997B-E1455C0355C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6AE2A5E8-4C5A-48B9-997B-E1455C0355C6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6AE2A5E8-4C5A-48B9-997B-E1455C0355C6}.Debug|x64.Build.0 = Debug|Any CPU
+		{6AE2A5E8-4C5A-48B9-997B-E1455C0355C6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6AE2A5E8-4C5A-48B9-997B-E1455C0355C6}.Debug|x86.Build.0 = Debug|Any CPU
 		{6AE2A5E8-4C5A-48B9-997B-E1455C0355C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6AE2A5E8-4C5A-48B9-997B-E1455C0355C6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6AE2A5E8-4C5A-48B9-997B-E1455C0355C6}.Release|x64.ActiveCfg = Release|Any CPU
+		{6AE2A5E8-4C5A-48B9-997B-E1455C0355C6}.Release|x64.Build.0 = Release|Any CPU
+		{6AE2A5E8-4C5A-48B9-997B-E1455C0355C6}.Release|x86.ActiveCfg = Release|Any CPU
+		{6AE2A5E8-4C5A-48B9-997B-E1455C0355C6}.Release|x86.Build.0 = Release|Any CPU
 		{D4D09B08-D580-4D69-B886-C35D2853F6C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D4D09B08-D580-4D69-B886-C35D2853F6C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D4D09B08-D580-4D69-B886-C35D2853F6C8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D4D09B08-D580-4D69-B886-C35D2853F6C8}.Debug|x64.Build.0 = Debug|Any CPU
+		{D4D09B08-D580-4D69-B886-C35D2853F6C8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D4D09B08-D580-4D69-B886-C35D2853F6C8}.Debug|x86.Build.0 = Debug|Any CPU
 		{D4D09B08-D580-4D69-B886-C35D2853F6C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D4D09B08-D580-4D69-B886-C35D2853F6C8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D4D09B08-D580-4D69-B886-C35D2853F6C8}.Release|x64.ActiveCfg = Release|Any CPU
+		{D4D09B08-D580-4D69-B886-C35D2853F6C8}.Release|x64.Build.0 = Release|Any CPU
+		{D4D09B08-D580-4D69-B886-C35D2853F6C8}.Release|x86.ActiveCfg = Release|Any CPU
+		{D4D09B08-D580-4D69-B886-C35D2853F6C8}.Release|x86.Build.0 = Release|Any CPU
 		{2BCB3D7A-38C0-4FE7-8FDA-374C6AD56D0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2BCB3D7A-38C0-4FE7-8FDA-374C6AD56D0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2BCB3D7A-38C0-4FE7-8FDA-374C6AD56D0E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2BCB3D7A-38C0-4FE7-8FDA-374C6AD56D0E}.Debug|x64.Build.0 = Debug|Any CPU
+		{2BCB3D7A-38C0-4FE7-8FDA-374C6AD56D0E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2BCB3D7A-38C0-4FE7-8FDA-374C6AD56D0E}.Debug|x86.Build.0 = Debug|Any CPU
 		{2BCB3D7A-38C0-4FE7-8FDA-374C6AD56D0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2BCB3D7A-38C0-4FE7-8FDA-374C6AD56D0E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2BCB3D7A-38C0-4FE7-8FDA-374C6AD56D0E}.Release|x64.ActiveCfg = Release|Any CPU
+		{2BCB3D7A-38C0-4FE7-8FDA-374C6AD56D0E}.Release|x64.Build.0 = Release|Any CPU
+		{2BCB3D7A-38C0-4FE7-8FDA-374C6AD56D0E}.Release|x86.ActiveCfg = Release|Any CPU
+		{2BCB3D7A-38C0-4FE7-8FDA-374C6AD56D0E}.Release|x86.Build.0 = Release|Any CPU
 		{77D01AD9-2C98-478E-AE1D-8F7100738FB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{77D01AD9-2C98-478E-AE1D-8F7100738FB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{77D01AD9-2C98-478E-AE1D-8F7100738FB4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{77D01AD9-2C98-478E-AE1D-8F7100738FB4}.Debug|x64.Build.0 = Debug|Any CPU
+		{77D01AD9-2C98-478E-AE1D-8F7100738FB4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{77D01AD9-2C98-478E-AE1D-8F7100738FB4}.Debug|x86.Build.0 = Debug|Any CPU
 		{77D01AD9-2C98-478E-AE1D-8F7100738FB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{77D01AD9-2C98-478E-AE1D-8F7100738FB4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{77D01AD9-2C98-478E-AE1D-8F7100738FB4}.Release|x64.ActiveCfg = Release|Any CPU
+		{77D01AD9-2C98-478E-AE1D-8F7100738FB4}.Release|x64.Build.0 = Release|Any CPU
+		{77D01AD9-2C98-478E-AE1D-8F7100738FB4}.Release|x86.ActiveCfg = Release|Any CPU
+		{77D01AD9-2C98-478E-AE1D-8F7100738FB4}.Release|x86.Build.0 = Release|Any CPU
 		{77F96ECE-4952-42DB-A528-DED25572A573}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{77F96ECE-4952-42DB-A528-DED25572A573}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{77F96ECE-4952-42DB-A528-DED25572A573}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{77F96ECE-4952-42DB-A528-DED25572A573}.Debug|x64.Build.0 = Debug|Any CPU
+		{77F96ECE-4952-42DB-A528-DED25572A573}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{77F96ECE-4952-42DB-A528-DED25572A573}.Debug|x86.Build.0 = Debug|Any CPU
 		{77F96ECE-4952-42DB-A528-DED25572A573}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{77F96ECE-4952-42DB-A528-DED25572A573}.Release|Any CPU.Build.0 = Release|Any CPU
+		{77F96ECE-4952-42DB-A528-DED25572A573}.Release|x64.ActiveCfg = Release|Any CPU
+		{77F96ECE-4952-42DB-A528-DED25572A573}.Release|x64.Build.0 = Release|Any CPU
+		{77F96ECE-4952-42DB-A528-DED25572A573}.Release|x86.ActiveCfg = Release|Any CPU
+		{77F96ECE-4952-42DB-A528-DED25572A573}.Release|x86.Build.0 = Release|Any CPU
 		{AF34127A-3A92-43E5-8496-14960A50B1F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AF34127A-3A92-43E5-8496-14960A50B1F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AF34127A-3A92-43E5-8496-14960A50B1F1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AF34127A-3A92-43E5-8496-14960A50B1F1}.Debug|x64.Build.0 = Debug|Any CPU
+		{AF34127A-3A92-43E5-8496-14960A50B1F1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AF34127A-3A92-43E5-8496-14960A50B1F1}.Debug|x86.Build.0 = Debug|Any CPU
 		{AF34127A-3A92-43E5-8496-14960A50B1F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AF34127A-3A92-43E5-8496-14960A50B1F1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AF34127A-3A92-43E5-8496-14960A50B1F1}.Release|x64.ActiveCfg = Release|Any CPU
+		{AF34127A-3A92-43E5-8496-14960A50B1F1}.Release|x64.Build.0 = Release|Any CPU
+		{AF34127A-3A92-43E5-8496-14960A50B1F1}.Release|x86.ActiveCfg = Release|Any CPU
+		{AF34127A-3A92-43E5-8496-14960A50B1F1}.Release|x86.Build.0 = Release|Any CPU
 		{7F55A45D-4E1D-4A36-ADD3-87F29A285AA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7F55A45D-4E1D-4A36-ADD3-87F29A285AA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7F55A45D-4E1D-4A36-ADD3-87F29A285AA2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7F55A45D-4E1D-4A36-ADD3-87F29A285AA2}.Debug|x64.Build.0 = Debug|Any CPU
+		{7F55A45D-4E1D-4A36-ADD3-87F29A285AA2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7F55A45D-4E1D-4A36-ADD3-87F29A285AA2}.Debug|x86.Build.0 = Debug|Any CPU
 		{7F55A45D-4E1D-4A36-ADD3-87F29A285AA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7F55A45D-4E1D-4A36-ADD3-87F29A285AA2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7F55A45D-4E1D-4A36-ADD3-87F29A285AA2}.Release|x64.ActiveCfg = Release|Any CPU
+		{7F55A45D-4E1D-4A36-ADD3-87F29A285AA2}.Release|x64.Build.0 = Release|Any CPU
+		{7F55A45D-4E1D-4A36-ADD3-87F29A285AA2}.Release|x86.ActiveCfg = Release|Any CPU
+		{7F55A45D-4E1D-4A36-ADD3-87F29A285AA2}.Release|x86.Build.0 = Release|Any CPU
 		{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}.Debug|x64.Build.0 = Debug|Any CPU
+		{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}.Debug|x86.Build.0 = Debug|Any CPU
 		{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}.Release|x64.ActiveCfg = Release|Any CPU
+		{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}.Release|x64.Build.0 = Release|Any CPU
+		{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}.Release|x86.ActiveCfg = Release|Any CPU
+		{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}.Release|x86.Build.0 = Release|Any CPU
 		{4A89A234-4F19-497D-A576-DDE8CDFC5B22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4A89A234-4F19-497D-A576-DDE8CDFC5B22}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4A89A234-4F19-497D-A576-DDE8CDFC5B22}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4A89A234-4F19-497D-A576-DDE8CDFC5B22}.Debug|x64.Build.0 = Debug|Any CPU
+		{4A89A234-4F19-497D-A576-DDE8CDFC5B22}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4A89A234-4F19-497D-A576-DDE8CDFC5B22}.Debug|x86.Build.0 = Debug|Any CPU
 		{4A89A234-4F19-497D-A576-DDE8CDFC5B22}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4A89A234-4F19-497D-A576-DDE8CDFC5B22}.Release|x64.ActiveCfg = Release|Any CPU
+		{4A89A234-4F19-497D-A576-DDE8CDFC5B22}.Release|x64.Build.0 = Release|Any CPU
+		{4A89A234-4F19-497D-A576-DDE8CDFC5B22}.Release|x86.ActiveCfg = Release|Any CPU
+		{4A89A234-4F19-497D-A576-DDE8CDFC5B22}.Release|x86.Build.0 = Release|Any CPU
+		{F6F9826A-BC58-4D78-A700-F358A66B2B06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F6F9826A-BC58-4D78-A700-F358A66B2B06}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F6F9826A-BC58-4D78-A700-F358A66B2B06}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F6F9826A-BC58-4D78-A700-F358A66B2B06}.Debug|x64.Build.0 = Debug|Any CPU
+		{F6F9826A-BC58-4D78-A700-F358A66B2B06}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F6F9826A-BC58-4D78-A700-F358A66B2B06}.Debug|x86.Build.0 = Debug|Any CPU
+		{F6F9826A-BC58-4D78-A700-F358A66B2B06}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F6F9826A-BC58-4D78-A700-F358A66B2B06}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F6F9826A-BC58-4D78-A700-F358A66B2B06}.Release|x64.ActiveCfg = Release|Any CPU
+		{F6F9826A-BC58-4D78-A700-F358A66B2B06}.Release|x64.Build.0 = Release|Any CPU
+		{F6F9826A-BC58-4D78-A700-F358A66B2B06}.Release|x86.ActiveCfg = Release|Any CPU
+		{F6F9826A-BC58-4D78-A700-F358A66B2B06}.Release|x86.Build.0 = Release|Any CPU
+		{D728444C-3D1F-4A0E-B4C9-5C9375D47EA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D728444C-3D1F-4A0E-B4C9-5C9375D47EA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D728444C-3D1F-4A0E-B4C9-5C9375D47EA3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D728444C-3D1F-4A0E-B4C9-5C9375D47EA3}.Debug|x64.Build.0 = Debug|Any CPU
+		{D728444C-3D1F-4A0E-B4C9-5C9375D47EA3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D728444C-3D1F-4A0E-B4C9-5C9375D47EA3}.Debug|x86.Build.0 = Debug|Any CPU
+		{D728444C-3D1F-4A0E-B4C9-5C9375D47EA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D728444C-3D1F-4A0E-B4C9-5C9375D47EA3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D728444C-3D1F-4A0E-B4C9-5C9375D47EA3}.Release|x64.ActiveCfg = Release|Any CPU
+		{D728444C-3D1F-4A0E-B4C9-5C9375D47EA3}.Release|x64.Build.0 = Release|Any CPU
+		{D728444C-3D1F-4A0E-B4C9-5C9375D47EA3}.Release|x86.ActiveCfg = Release|Any CPU
+		{D728444C-3D1F-4A0E-B4C9-5C9375D47EA3}.Release|x86.Build.0 = Release|Any CPU
+		{988E6191-82E1-4E13-9DDB-CB9FA2FDAF29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{988E6191-82E1-4E13-9DDB-CB9FA2FDAF29}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{988E6191-82E1-4E13-9DDB-CB9FA2FDAF29}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{988E6191-82E1-4E13-9DDB-CB9FA2FDAF29}.Debug|x64.Build.0 = Debug|Any CPU
+		{988E6191-82E1-4E13-9DDB-CB9FA2FDAF29}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{988E6191-82E1-4E13-9DDB-CB9FA2FDAF29}.Debug|x86.Build.0 = Debug|Any CPU
+		{988E6191-82E1-4E13-9DDB-CB9FA2FDAF29}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{988E6191-82E1-4E13-9DDB-CB9FA2FDAF29}.Release|Any CPU.Build.0 = Release|Any CPU
+		{988E6191-82E1-4E13-9DDB-CB9FA2FDAF29}.Release|x64.ActiveCfg = Release|Any CPU
+		{988E6191-82E1-4E13-9DDB-CB9FA2FDAF29}.Release|x64.Build.0 = Release|Any CPU
+		{988E6191-82E1-4E13-9DDB-CB9FA2FDAF29}.Release|x86.ActiveCfg = Release|Any CPU
+		{988E6191-82E1-4E13-9DDB-CB9FA2FDAF29}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{F6F9826A-BC58-4D78-A700-F358A66B2B06} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
+		{D728444C-3D1F-4A0E-B4C9-5C9375D47EA3} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
+		{988E6191-82E1-4E13-9DDB-CB9FA2FDAF29} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {110169B3-3328-4730-8AB0-BA05BEF75C1A}
 	EndGlobalSection
--- a/assets/locales.json
+++ b/assets/locales.json
--- a/distribution/linux/Ryujinx.sh
+++ b/distribution/linux/Ryujinx.sh
@@ -2,8 +2,8 @@

 SCRIPT_DIR=$(dirname "$(realpath "$0")")

-if [ -f "$SCRIPT_DIR/Ryujinx.Headless.SDL2" ]; then
-    RYUJINX_BIN="Ryujinx.Headless.SDL2"
+if [ -f "$SCRIPT_DIR/Ryujinx.Headless.SDL3" ]; then
+    RYUJINX_BIN="Ryujinx.Headless.SDL3"
 fi

 if [ -f "$SCRIPT_DIR/Ryujinx" ]; then
--- a/distribution/macos/Info.plist
+++ b/distribution/macos/Info.plist
@@ -34,7 +34,7 @@
    <key>CFBundleInfoDictionaryVersion</key>
    <string>6.0</string>
    <key>CFBundleLongVersionString</key>
-    <string>%%RYUJINX_BUILD_VERSION%%-%%RYUJINX_BUILD_GIT_HASH%%"</string>
+    <string>%%RYUJINX_BUILD_VERSION%%-%%RYUJINX_BUILD_GIT_HASH%%</string>
    <key>CFBundleName</key>
    <string>Ryujinx</string>
    <key>CFBundlePackageType</key>
@@ -44,13 +44,13 @@
    <key>CFBundleSignature</key>
    <string>????</string>
    <key>CFBundleVersion</key>
-    <string>1.2.0</string>
+    <string>%%RYUJINX_BUILD_VERSION%%</string>
    <key>NSHighResolutionCapable</key>
    <true/>
    <key>CSResourcesFileMapped</key>
    <true/>
    <key>NSHumanReadableCopyright</key>
-    <string>Copyright © 2018 - 2023 Ryujinx Team and Contributors.</string>
+    <string>Copyright © 2018 - 2024 Ryujinx Team and Contributors. Copyright © 2024 - 2025 Ryubing and Contributors.</string>
    <key>LSApplicationCategoryType</key>
    <string>public.app-category.games</string>
    <key>LSMinimumSystemVersion</key>
--- a/distribution/macos/create_macos_build_headless.sh
+++ b/distribution/macos/create_macos_build_headless.sh
@@ -43,7 +43,7 @@ fi
 ARM64_OUTPUT="$TEMP_DIRECTORY/publish_arm64"
 X64_OUTPUT="$TEMP_DIRECTORY/publish_x64"
 UNIVERSAL_OUTPUT="$OUTPUT_DIRECTORY/publish"
-EXECUTABLE_SUB_PATH=Ryujinx.Headless.SDL2
+EXECUTABLE_SUB_PATH=Ryujinx.Headless.SDL3

 rm -rf "$TEMP_DIRECTORY"
 mkdir -p "$TEMP_DIRECTORY"
@@ -51,9 +51,9 @@ mkdir -p "$TEMP_DIRECTORY"
 DOTNET_COMMON_ARGS=(-p:DebugType=embedded -p:Version="$VERSION" -p:SourceRevisionId="$SOURCE_REVISION_ID" --self-contained true $EXTRA_ARGS)

 dotnet restore
-dotnet build -c "$CONFIGURATION" src/Ryujinx.Headless.SDL2
-dotnet publish -c "$CONFIGURATION" -r osx-arm64 -o "$TEMP_DIRECTORY/publish_arm64" "${DOTNET_COMMON_ARGS[@]}" src/Ryujinx.Headless.SDL2
-dotnet publish -c "$CONFIGURATION" -r osx-x64 -o "$TEMP_DIRECTORY/publish_x64" "${DOTNET_COMMON_ARGS[@]}" src/Ryujinx.Headless.SDL2
+dotnet build -c "$CONFIGURATION" src/Ryujinx.Headless.SDL3
+dotnet publish -c "$CONFIGURATION" -r osx-arm64 -o "$TEMP_DIRECTORY/publish_arm64" "${DOTNET_COMMON_ARGS[@]}" src/Ryujinx.Headless.SDL3
+dotnet publish -c "$CONFIGURATION" -r osx-x64 -o "$TEMP_DIRECTORY/publish_x64" "${DOTNET_COMMON_ARGS[@]}" src/Ryujinx.Headless.SDL3

 # Get rid of the support library for ARMeilleure for x64 (that's only for arm64)
 rm -rf "$TEMP_DIRECTORY/publish_x64/libarmeilleure-jitsupport.dylib"
@@ -115,8 +115,8 @@ fi

 echo "Creating archive"
 pushd "$OUTPUT_DIRECTORY"
-tar --exclude "publish/Ryujinx.Headless.SDL2" -cvf "$RELEASE_TAR_FILE_NAME" publish 1> /dev/null
-python3 "$BASE_DIR/distribution/misc/add_tar_exec.py" "$RELEASE_TAR_FILE_NAME" "publish/Ryujinx.Headless.SDL2" "publish/Ryujinx.Headless.SDL2"
+tar --exclude "publish/Ryujinx.Headless.SDL3" -cvf "$RELEASE_TAR_FILE_NAME" publish 1> /dev/null
+python3 "$BASE_DIR/distribution/misc/add_tar_exec.py" "$RELEASE_TAR_FILE_NAME" "publish/Ryujinx.Headless.SDL3" "publish/Ryujinx.Headless.SDL3"
 gzip -9 < "$RELEASE_TAR_FILE_NAME" > "$RELEASE_TAR_FILE_NAME.gz"
 rm "$RELEASE_TAR_FILE_NAME"
 popd
--- a/docs/README.md
+++ b/docs/README.md
@@ -8,7 +8,7 @@ Intro to Ryujinx
 Ryujinx is an open-source Nintendo Switch emulator, created by gdkchan, written in C#. 
 * The CPU emulator, ARMeilleure, emulates an ARMv8 CPU and currently has support for most 64-bit ARMv8 and some of the ARMv7 (and older) instructions.
 * The GPU emulator emulates the Switch's Maxwell GPU using either the OpenGL (version 4.5 minimum), Vulkan, or Metal (via MoltenVK) APIs through a custom build of OpenTK or Silk.NET respectively.
-* Audio output is entirely supported via C# wrappers for SDL2, with OpenAL & libsoundio as fallbacks.
+* Audio output is entirely supported via C# wrappers for SDL3, with OpenAL & libsoundio as fallbacks.

 Getting Started
 ===============
--- a/docs/compatibility.csv
+++ b/docs/compatibility.csv
@@ -2280,6 +2280,7 @@
 01008F6008C5E000,"Pokémon™ Violet",gpu;nvdec;ldn-works;amd-vendor-bug;mac-bug,ingame,2024-07-30 02:51:48
 0100187003A36000,"Pokémon™: Let’s Go, Eevee!",crash;nvdec;online-broken;ldn-broken,ingame,2024-06-01 15:03:04
 010003F003A34000,"Pokémon™: Let’s Go, Pikachu!",crash;nvdec;online-broken;ldn-broken,ingame,2024-03-15 07:55:41
+0100F43008C44000,"Pokémon Legends: Z-A",gpu;crash;ldn-broken,ingame,2025-10-16 19:13:00
 0100B3F000BE2000,"Pokkén Tournament™ DX",nvdec;ldn-works;opengl-backend-bug;LAN;amd-vendor-bug;intel-vendor-bug,playable,2024-07-18 23:11:08
 010030D005AE6000,"Pokkén Tournament™ DX Demo",demo;opengl-backend-bug,playable,2022-08-10 12:03:19
 0100A3500B4EC000,"Polandball: Can Into Space",,playable,2020-06-25 15:13:26
--- a/src/ARMeilleure/CodeGen/X86/Assembler.cs
+++ b/src/ARMeilleure/CodeGen/X86/Assembler.cs
@@ -1107,17 +1107,17 @@ namespace ARMeilleure.CodeGen.X86
            }
            else
            {
-                if (flags.HasFlag(InstructionFlags.Prefix66))
+                if ((flags & InstructionFlags.Prefix66) != 0)
                {
                    WriteByte(0x66);
                }

-                if (flags.HasFlag(InstructionFlags.PrefixF2))
+                if ((flags & InstructionFlags.PrefixF2) != 0f)
                {
                    WriteByte(0xf2);
                }

-                if (flags.HasFlag(InstructionFlags.PrefixF3))
+                if ((flags & InstructionFlags.PrefixF3) != 0f)
                {
                    WriteByte(0xf3);
                }
--- a/src/ARMeilleure/CodeGen/X86/AssemblerTable.cs
+++ b/src/ARMeilleure/CodeGen/X86/AssemblerTable.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics.CodeAnalysis;

 namespace ARMeilleure.CodeGen.X86
 {
--- a/src/ARMeilleure/CodeGen/X86/CodeGenContext.cs
+++ b/src/ARMeilleure/CodeGen/X86/CodeGenContext.cs
@@ -2,7 +2,6 @@ using ARMeilleure.CodeGen.RegisterAllocators;
 using ARMeilleure.IntermediateRepresentation;
 using Microsoft.IO;
 using Ryujinx.Common.Memory;
-using System.IO;
 using System.Numerics;

 namespace ARMeilleure.CodeGen.X86
--- a/src/ARMeilleure/CodeGen/X86/X86Register.cs
+++ b/src/ARMeilleure/CodeGen/X86/X86Register.cs
@@ -1,5 +1,3 @@
-using System.Diagnostics.CodeAnalysis;
-
 namespace ARMeilleure.CodeGen.X86
 {
    enum X86Register
--- a/src/ARMeilleure/Instructions/InstEmitMul.cs
+++ b/src/ARMeilleure/Instructions/InstEmitMul.cs
@@ -2,7 +2,6 @@ using ARMeilleure.Decoders;
 using ARMeilleure.IntermediateRepresentation;
 using ARMeilleure.Translation;
 using System;
-using System.Diagnostics.CodeAnalysis;
 using static ARMeilleure.Instructions.InstEmitHelper;

 namespace ARMeilleure.Instructions
--- a/src/ARMeilleure/Instructions/NativeInterface.cs
+++ b/src/ARMeilleure/Instructions/NativeInterface.cs
@@ -201,11 +201,7 @@ namespace ARMeilleure.Instructions

            ExecutionContext context = GetContext();

-            // If debugging, we'll handle interrupts outside
-            if (!Optimizations.EnableDebugging)
-            {
-                context.CheckInterrupt();
-            }
+            context.CheckInterrupt();

            Statistics.ResumeTimer();

--- a/src/ARMeilleure/IntermediateRepresentation/Intrinsic.cs
+++ b/src/ARMeilleure/IntermediateRepresentation/Intrinsic.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics.CodeAnalysis;

 namespace ARMeilleure.IntermediateRepresentation
 {
--- a/src/Ryujinx.Audio.Backends.SDL3/Ryujinx.Audio.Backends.SDL3.csproj
+++ b/src/Ryujinx.Audio.Backends.SDL3/Ryujinx.Audio.Backends.SDL3.csproj
@@ -7,7 +7,7 @@

  <ItemGroup>
    <ProjectReference Include="..\Ryujinx.Audio\Ryujinx.Audio.csproj" />
-    <ProjectReference Include="..\Ryujinx.SDL2.Common\Ryujinx.SDL2.Common.csproj" />
+    <ProjectReference Include="..\Ryujinx.SDL3.Common\Ryujinx.SDL3.Common.csproj" />
  </ItemGroup>

 </Project>
--- a/src/Ryujinx.Audio.Backends.SDL3/SDL3AudioBuffer.cs
+++ b/src/Ryujinx.Audio.Backends.SDL3/SDL3AudioBuffer.cs
@@ -1,12 +1,12 @@
-namespace Ryujinx.Audio.Backends.SDL2
+namespace Ryujinx.Audio.Backends.SDL3
 {
-    class SDL2AudioBuffer
+    class SDL3AudioBuffer
    {
        public readonly ulong DriverIdentifier;
        public readonly ulong SampleCount;
        public ulong SamplePlayed;

-        public SDL2AudioBuffer(ulong driverIdentifier, ulong sampleCount)
+        public SDL3AudioBuffer(ulong driverIdentifier, ulong sampleCount)
        {
            DriverIdentifier = driverIdentifier;
            SampleCount = sampleCount;
--- a/src/Ryujinx.Audio.Backends.SDL3/SDL3HardwareDeviceDriver.cs
+++ b/src/Ryujinx.Audio.Backends.SDL3/SDL3HardwareDeviceDriver.cs
@@ -2,42 +2,41 @@ using Ryujinx.Audio.Common;
 using Ryujinx.Audio.Integration;
 using Ryujinx.Common.Logging;
 using Ryujinx.Memory;
-using Ryujinx.SDL2.Common;
+using Ryujinx.SDL3.Common;
 using System;
 using System.Collections.Concurrent;
-using System.Runtime.InteropServices;
 using System.Threading;
 using static Ryujinx.Audio.Integration.IHardwareDeviceDriver;
-using static SDL2.SDL;
+using SDL;
+using static SDL.SDL3;
+using System.Runtime.InteropServices;

-namespace Ryujinx.Audio.Backends.SDL2
+
+namespace Ryujinx.Audio.Backends.SDL3
 {
-    public class SDL2HardwareDeviceDriver : IHardwareDeviceDriver
+
+    using unsafe SDL_AudioStreamCallbackPointer = delegate* unmanaged[Cdecl]<nint, SDL_AudioStream*, int, int, void>;
+
+    public class SDL3HardwareDeviceDriver : IHardwareDeviceDriver
    {
        private readonly ManualResetEvent _updateRequiredEvent;
        private readonly ManualResetEvent _pauseEvent;
-        private readonly ConcurrentDictionary<SDL2HardwareDeviceSession, byte> _sessions;
+        private readonly ConcurrentDictionary<SDL3HardwareDeviceSession, byte> _sessions;

        private readonly bool _supportSurroundConfiguration;

        public float Volume { get; set; }

-        // TODO: Add this to SDL2-CS
-        // NOTE: We use a DllImport here because of marshaling issue for spec.
-        [DllImport("SDL2")]
-        private static extern int SDL_GetDefaultAudioInfo(nint name, out SDL_AudioSpec spec, int isCapture);
-
-        public SDL2HardwareDeviceDriver()
+        public unsafe SDL3HardwareDeviceDriver()
        {
            _updateRequiredEvent = new ManualResetEvent(false);
            _pauseEvent = new ManualResetEvent(true);
-            _sessions = new ConcurrentDictionary<SDL2HardwareDeviceSession, byte>();
+            _sessions = new ConcurrentDictionary<SDL3HardwareDeviceSession, byte>();

-            SDL2Driver.Instance.Initialize();
+            SDL3Driver.Instance.Initialize();

-            int res = SDL_GetDefaultAudioInfo(nint.Zero, out SDL_AudioSpec spec, 0);
-
-            if (res != 0)
+            SDL_AudioSpec spec;
+            if (!SDL_GetAudioDeviceFormat(SDL_AUDIO_DEVICE_DEFAULT_PLAYBACK, &spec, null))
            {
                Logger.Error?.Print(LogClass.Application,
                    $"SDL_GetDefaultAudioInfo failed with error \"{SDL_GetError()}\"");
@@ -54,16 +53,16 @@ namespace Ryujinx.Audio.Backends.SDL2

        public static bool IsSupported => IsSupportedInternal();

-        private static bool IsSupportedInternal()
+        private unsafe static bool IsSupportedInternal()
        {
-            uint device = OpenStream(SampleFormat.PcmInt16, Constants.TargetSampleRate, Constants.ChannelCountMax, Constants.TargetSampleCount, null);
+            SDL_AudioStream* device = OpenStream(SampleFormat.PcmInt16, Constants.TargetSampleRate, Constants.ChannelCountMax, Constants.TargetSampleCount, null);

-            if (device != 0)
+            if (device != null)
            {
-                SDL_CloseAudioDevice(device);
+                SDL_DestroyAudioStream(device);
            }

-            return device != 0;
+            return device != null;
        }

        public ManualResetEvent GetUpdateRequiredEvent()
@@ -90,67 +89,69 @@ namespace Ryujinx.Audio.Backends.SDL2

            if (direction != Direction.Output)
            {
-                throw new NotImplementedException("Input direction is currently not implemented on SDL2 backend!");
+                throw new NotImplementedException("Input direction is currently not implemented on SDL3 backend!");
            }

-            SDL2HardwareDeviceSession session = new(this, memoryManager, sampleFormat, sampleRate, channelCount);
+            SDL3HardwareDeviceSession session = new(this, memoryManager, sampleFormat, sampleRate, channelCount);

            _sessions.TryAdd(session, 0);

            return session;
        }

-        internal bool Unregister(SDL2HardwareDeviceSession session)
+        internal bool Unregister(SDL3HardwareDeviceSession session)
        {
            return _sessions.TryRemove(session, out _);
        }

-        private static SDL_AudioSpec GetSDL2Spec(SampleFormat requestedSampleFormat, uint requestedSampleRate, uint requestedChannelCount, uint sampleCount)
+        private static SDL_AudioSpec GetSDL3Spec(SampleFormat requestedSampleFormat, uint requestedSampleRate, uint requestedChannelCount)
        {
            return new SDL_AudioSpec
            {
                channels = (byte)requestedChannelCount,
-                format = GetSDL2Format(requestedSampleFormat),
+                format = GetSDL3Format(requestedSampleFormat),
                freq = (int)requestedSampleRate,
-                samples = (ushort)sampleCount,
            };
        }

-        internal static ushort GetSDL2Format(SampleFormat format)
+        internal static SDL_AudioFormat GetSDL3Format(SampleFormat format)
        {
            return format switch
            {
-                SampleFormat.PcmInt8 => AUDIO_S8,
-                SampleFormat.PcmInt16 => AUDIO_S16,
-                SampleFormat.PcmInt32 => AUDIO_S32,
-                SampleFormat.PcmFloat => AUDIO_F32,
+                SampleFormat.PcmInt8 => SDL_AudioFormat.SDL_AUDIO_S8,
+                SampleFormat.PcmInt16 => SDL_AudioFormat.SDL_AUDIO_S16LE,
+                SampleFormat.PcmInt32 => SDL_AudioFormat.SDL_AUDIO_S32LE,
+                SampleFormat.PcmFloat => SDL_AudioFormat.SDL_AUDIO_F32LE,
                _ => throw new ArgumentException($"Unsupported sample format {format}"),
            };
        }

-        internal static uint OpenStream(SampleFormat requestedSampleFormat, uint requestedSampleRate, uint requestedChannelCount, uint sampleCount, SDL_AudioCallback callback)
+        internal unsafe static SDL_AudioStream* OpenStream(SampleFormat requestedSampleFormat, uint requestedSampleRate, uint requestedChannelCount, uint sampleCount, SDL3HardwareDeviceSession.SDL_AudioStreamCallback callback)
        {
-            SDL_AudioSpec desired = GetSDL2Spec(requestedSampleFormat, requestedSampleRate, requestedChannelCount, sampleCount);
+            SDL_AudioSpec desired = GetSDL3Spec(requestedSampleFormat, requestedSampleRate, requestedChannelCount);
+            SDL_AudioSpec got = desired;
+            var pCallback = callback != null ? (SDL_AudioStreamCallbackPointer)Marshal.GetFunctionPointerForDelegate(callback) : null;

-            desired.callback = callback;
+            // From SDL 3 and on, SDL requires us to set this as a hint
+            SDL_SetHint(SDL_HINT_AUDIO_DEVICE_SAMPLE_FRAMES, $"{sampleCount}");
+            SDL_AudioStream* device = SDL_OpenAudioDeviceStream(SDL_AUDIO_DEVICE_DEFAULT_PLAYBACK, &got, pCallback, 0);
+            Console.WriteLine(got.freq);

-            uint device = SDL_OpenAudioDevice(nint.Zero, 0, ref desired, out SDL_AudioSpec got, 0);
-
-            if (device == 0)
+            if (device == null)
            {
-                Logger.Error?.Print(LogClass.Application, $"SDL2 open audio device initialization failed with error \"{SDL_GetError()}\"");
+                Logger.Error?.Print(LogClass.Application, $"SDL3 open audio device initialization failed with error \"{SDL_GetError()}\"");

-                return 0;
+                return null;
            }

            bool isValid = got.format == desired.format && got.freq == desired.freq && got.channels == desired.channels;

            if (!isValid)
            {
-                Logger.Error?.Print(LogClass.Application, "SDL2 open audio device is not valid");
-                SDL_CloseAudioDevice(device);
+                Logger.Error?.Print(LogClass.Application, "SDL3 open audio device is not valid");
+                SDL_DestroyAudioStream(device);

-                return 0;
+                return null;
            }

            return device;
@@ -166,12 +167,12 @@ namespace Ryujinx.Audio.Backends.SDL2
        {
            if (disposing)
            {
-                foreach (SDL2HardwareDeviceSession session in _sessions.Keys)
+                foreach (SDL3HardwareDeviceSession session in _sessions.Keys)
                {
                    session.Dispose();
                }

-                SDL2Driver.Instance.Dispose();
+                SDL3Driver.Instance.Dispose();

                _pauseEvent.Dispose();
            }
--- a/src/Ryujinx.Audio.Backends.SDL3/SDL3HardwareDeviceSession.cs
+++ b/src/Ryujinx.Audio.Backends.SDL3/SDL3HardwareDeviceSession.cs
@@ -6,36 +6,43 @@ using Ryujinx.Memory;
 using System;
 using System.Collections.Concurrent;
 using System.Threading;
+using SDL;
+using static SDL.SDL3;
+using System.Runtime.InteropServices;

-using static SDL2.SDL;
-
-namespace Ryujinx.Audio.Backends.SDL2
+namespace Ryujinx.Audio.Backends.SDL3
 {
-    class SDL2HardwareDeviceSession : HardwareDeviceSessionOutputBase
+
+
+
+    unsafe class SDL3HardwareDeviceSession : HardwareDeviceSessionOutputBase
    {
-        private readonly SDL2HardwareDeviceDriver _driver;
-        private readonly ConcurrentQueue<SDL2AudioBuffer> _queuedBuffers;
+        private readonly SDL3HardwareDeviceDriver _driver;
+        private readonly ConcurrentQueue<SDL3AudioBuffer> _queuedBuffers;
        private readonly DynamicRingBuffer _ringBuffer;
        private ulong _playedSampleCount;
        private readonly ManualResetEvent _updateRequiredEvent;
-        private uint _outputStream;
+        private SDL_AudioStream* _outputStream;
        private bool _hasSetupError;
-        private readonly SDL_AudioCallback _callbackDelegate;
+        private readonly SDL_AudioStreamCallback _callbackDelegate;
        private readonly int _bytesPerFrame;
        private uint _sampleCount;
        private bool _started;
        private float _volume;
-        private readonly ushort _nativeSampleFormat;
+        private readonly SDL_AudioFormat _nativeSampleFormat;

-        public SDL2HardwareDeviceSession(SDL2HardwareDeviceDriver driver, IVirtualMemoryManager memoryManager, SampleFormat requestedSampleFormat, uint requestedSampleRate, uint requestedChannelCount) : base(memoryManager, requestedSampleFormat, requestedSampleRate, requestedChannelCount)
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        internal delegate void SDL_AudioStreamCallback(nint session, SDL_AudioStream* stream, int stream_count, int device_count);
+
+        public SDL3HardwareDeviceSession(SDL3HardwareDeviceDriver driver, IVirtualMemoryManager memoryManager, SampleFormat requestedSampleFormat, uint requestedSampleRate, uint requestedChannelCount) : base(memoryManager, requestedSampleFormat, requestedSampleRate, requestedChannelCount)
        {
            _driver = driver;
            _updateRequiredEvent = _driver.GetUpdateRequiredEvent();
-            _queuedBuffers = new ConcurrentQueue<SDL2AudioBuffer>();
+            _queuedBuffers = new ConcurrentQueue<SDL3AudioBuffer>();
            _ringBuffer = new DynamicRingBuffer();
            _callbackDelegate = Update;
            _bytesPerFrame = BackendHelper.GetSampleSize(RequestedSampleFormat) * (int)RequestedChannelCount;
-            _nativeSampleFormat = SDL2HardwareDeviceDriver.GetSDL2Format(RequestedSampleFormat);
+            _nativeSampleFormat = SDL3HardwareDeviceDriver.GetSDL3Format(RequestedSampleFormat);
            _sampleCount = uint.MaxValue;
            _started = false;
            _volume = 1f;
@@ -44,45 +51,51 @@ namespace Ryujinx.Audio.Backends.SDL2
        private void EnsureAudioStreamSetup(AudioBuffer buffer)
        {
            uint bufferSampleCount = (uint)GetSampleCount(buffer);
-            bool needAudioSetup = (_outputStream == 0 && !_hasSetupError) ||
+            bool needAudioSetup = (_outputStream == null && !_hasSetupError) ||
                (bufferSampleCount >= Constants.TargetSampleCount && bufferSampleCount < _sampleCount);

            if (needAudioSetup)
            {
                _sampleCount = Math.Max(Constants.TargetSampleCount, bufferSampleCount);

-                uint newOutputStream = SDL2HardwareDeviceDriver.OpenStream(RequestedSampleFormat, RequestedSampleRate, RequestedChannelCount, _sampleCount, _callbackDelegate);
+                SDL_AudioStream* newOutputStream = SDL3HardwareDeviceDriver.OpenStream(RequestedSampleFormat, RequestedSampleRate, RequestedChannelCount, _sampleCount, _callbackDelegate);

-                _hasSetupError = newOutputStream == 0;
+                _hasSetupError = newOutputStream == null;

                if (!_hasSetupError)
                {
-                    if (_outputStream != 0)
+                    if (_outputStream != null)
                    {
-                        SDL_CloseAudioDevice(_outputStream);
+                        SDL_DestroyAudioStream(_outputStream);
                    }

                    _outputStream = newOutputStream;

-                    SDL_PauseAudioDevice(_outputStream, _started ? 0 : 1);
+                    if (_started) {
+                        SDL_ResumeAudioStreamDevice(_outputStream);
+                    } else {
+                        SDL_PauseAudioStreamDevice(_outputStream);
+                    }

                    Logger.Info?.Print(LogClass.Audio, $"New audio stream setup with a target sample count of {_sampleCount}");
                }
            }
        }

-        private unsafe void Update(nint userdata, nint stream, int streamLength)
+        private unsafe void Update(nint userdata, SDL_AudioStream* streamDevice, int additionalAmount, int totalAmmount)
        {
-            Span<byte> streamSpan = new((void*)stream, streamLength);
+            using SpanOwner<byte> stream = SpanOwner<byte>.Rent(additionalAmount);
+            Span<byte> streamSpan = stream.Span;

-            int maxFrameCount = (int)GetSampleCount(streamLength);
+
+            int maxFrameCount = (int)GetSampleCount(additionalAmount);
            int bufferedFrames = _ringBuffer.Length / _bytesPerFrame;

            int frameCount = Math.Min(bufferedFrames, maxFrameCount);

            if (frameCount == 0)
            {
-                // SDL2 left the responsibility to the user to clear the buffer.
+                // SDL3 left the responsibility to the user to clear the buffer.
                streamSpan.Clear();

                return;
@@ -94,15 +107,17 @@ namespace Ryujinx.Audio.Backends.SDL2

            _ringBuffer.Read(samples, 0, samples.Length);

-            fixed (byte* p = samples)
-            {
-                nint pStreamSrc = (nint)p;
+            // Zero the dest buffer
+            streamSpan.Clear();

-                // Zero the dest buffer
-                streamSpan.Clear();
+            fixed (byte* pStreamDst = streamSpan) {
+                fixed (byte* pStreamSrc = samples)
+                {

-                // Apply volume to written data
-                SDL_MixAudioFormat(stream, pStreamSrc, _nativeSampleFormat, (uint)samples.Length, (int)(_driver.Volume * _volume * SDL_MIX_MAXVOLUME));
+                    // Apply volume to written data
+                    SDL_MixAudio(pStreamDst, pStreamSrc, _nativeSampleFormat, (uint)samples.Length, _driver.Volume * _volume);
+                    SDL_PutAudioStreamData(streamDevice, (nint)pStreamDst, additionalAmount);
+                }
            }

            ulong sampleCount = GetSampleCount(samples.Length);
@@ -111,7 +126,7 @@ namespace Ryujinx.Audio.Backends.SDL2

            bool needUpdate = false;

-            while (availaibleSampleCount > 0 && _queuedBuffers.TryPeek(out SDL2AudioBuffer driverBuffer))
+            while (availaibleSampleCount > 0 && _queuedBuffers.TryPeek(out SDL3AudioBuffer driverBuffer))
            {
                ulong sampleStillNeeded = driverBuffer.SampleCount - Interlocked.Read(ref driverBuffer.SamplePlayed);
                ulong playedAudioBufferSampleCount = Math.Min(sampleStillNeeded, availaibleSampleCount);
@@ -152,9 +167,9 @@ namespace Ryujinx.Audio.Backends.SDL2
        {
            EnsureAudioStreamSetup(buffer);

-            if (_outputStream != 0)
+            if (_outputStream != null)
            {
-                SDL2AudioBuffer driverBuffer = new(buffer.DataPointer, GetSampleCount(buffer));
+                SDL3AudioBuffer driverBuffer = new(buffer.DataPointer, GetSampleCount(buffer));

                _ringBuffer.Write(buffer.Data, 0, buffer.Data.Length);

@@ -177,9 +192,9 @@ namespace Ryujinx.Audio.Backends.SDL2
        {
            if (!_started)
            {
-                if (_outputStream != 0)
+                if (_outputStream != null)
                {
-                    SDL_PauseAudioDevice(_outputStream, 0);
+                    SDL_ResumeAudioStreamDevice(_outputStream);
                }

                _started = true;
@@ -190,9 +205,9 @@ namespace Ryujinx.Audio.Backends.SDL2
        {
            if (_started)
            {
-                if (_outputStream != 0)
+                if (_outputStream != null)
                {
-                    SDL_PauseAudioDevice(_outputStream, 1);
+                    SDL_PauseAudioStreamDevice(_outputStream);
                }

                _started = false;
@@ -203,7 +218,7 @@ namespace Ryujinx.Audio.Backends.SDL2

        public override bool WasBufferFullyConsumed(AudioBuffer buffer)
        {
-            if (!_queuedBuffers.TryPeek(out SDL2AudioBuffer driverBuffer))
+            if (!_queuedBuffers.TryPeek(out SDL3AudioBuffer driverBuffer))
            {
                return true;
            }
@@ -218,9 +233,9 @@ namespace Ryujinx.Audio.Backends.SDL2
                PrepareToClose();
                Stop();

-                if (_outputStream != 0)
+                if (_outputStream != null)
                {
-                    SDL_CloseAudioDevice(_outputStream);
+                    SDL_DestroyAudioStream(_outputStream);
                }
            }
        }
--- a/src/Ryujinx.Audio/Renderer/Common/BehaviourParameter.cs
+++ b/src/Ryujinx.Audio/Renderer/Common/BehaviourParameter.cs
@@ -1,9 +1,11 @@
+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="Server.BehaviourContext"/>.
+    /// Represents the input parameter for <see cref="BehaviourInfo"/>.
    /// </summary>
    [StructLayout(LayoutKind.Sequential, Pack = 1)]
    public struct BehaviourParameter
@@ -21,7 +23,7 @@ namespace Ryujinx.Audio.Renderer.Common
        /// <summary>
        /// The flags given controlling behaviour of the audio renderer
        /// </summary>
-        /// <remarks>See <see cref="Server.BehaviourContext.UpdateFlags(ulong)"/> and <see cref="Server.BehaviourContext.IsMemoryPoolForceMappingEnabled"/>.</remarks>
+        /// <remarks>See <see cref="BehaviourInfo.UpdateFlags(ulong)"/> and <see cref="BehaviourInfo.IsMemoryPoolForceMappingEnabled"/>.</remarks>
        public ulong Flags;

        /// <summary>
@@ -43,7 +45,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="Server.MemoryPool.MemoryPoolState"/> mapping fail.</remarks>
+            /// <remarks>This is usually used to report a faulting cpu address when a <see cref="MemoryPoolInfo"/> mapping fail.</remarks>
            public ulong ExtraErrorInfo;
        }
    }
--- a/src/Ryujinx.Audio/Renderer/Common/VoiceUpdateState.cs
+++ b/src/Ryujinx.Audio/Renderer/Common/VoiceUpdateState.cs
@@ -1,4 +1,5 @@
 using Ryujinx.Audio.Renderer.Dsp.State;
+using Ryujinx.Audio.Renderer.Parameter;
 using Ryujinx.Common.Memory;
 using Ryujinx.Common.Utilities;
 using System;
@@ -11,7 +12,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 VoiceUpdateState
+    public struct VoiceState
    {
        public const int Align = 0x10;
        public const int BiquadStateOffset = 0x0;
@@ -25,7 +26,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="Parameter.VoiceInParameter.DecodingBehaviour.PlayedSampleCountResetWhenLooping"/> is set.</remarks>
+        /// <remarks>This is reset to 0 when looping while <see cref="VoiceInParameter1.DecodingBehaviour.PlayedSampleCountResetWhenLooping"/> is set.</remarks>
        public ulong PlayedSampleCount;

        /// <summary>
--- a/src/Ryujinx.Audio/Renderer/Dsp/BiquadFilterHelper.cs
+++ b/src/Ryujinx.Audio/Renderer/Dsp/BiquadFilterHelper.cs
@@ -1,5 +1,7 @@
 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;

@@ -9,6 +11,112 @@ 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>
@@ -20,21 +128,21 @@ namespace Ryujinx.Audio.Renderer.Dsp
        /// <param name="sampleCount">The count of samples to process</param>
        [MethodImpl(MethodImplOptions.AggressiveInlining)]
        public static void ProcessBiquadFilter(
-            ref BiquadFilterParameter parameter,
+            ref BiquadFilterParameter2 parameter,
            ref BiquadFilterState state,
            Span<float> outputBuffer,
            ReadOnlySpan<float> inputBuffer,
            uint sampleCount)
        {
-            Span<short> numeratorSpan = parameter.Numerator.AsSpan();
-            Span<short> denominatorSpan = parameter.Denominator.AsSpan();
+            Span<float> numeratorSpan = parameter.Numerator.AsSpan();
+            Span<float> denominatorSpan = parameter.Denominator.AsSpan();
            
-            float a0 = FixedPointHelper.ToFloat(numeratorSpan[0], FixedPointPrecisionForParameter);
-            float a1 = FixedPointHelper.ToFloat(numeratorSpan[1], FixedPointPrecisionForParameter);
-            float a2 = FixedPointHelper.ToFloat(numeratorSpan[2], FixedPointPrecisionForParameter);
+            float a0 = numeratorSpan[0];
+            float a1 = numeratorSpan[1];
+            float a2 = numeratorSpan[2];

-            float b1 = FixedPointHelper.ToFloat(denominatorSpan[0], FixedPointPrecisionForParameter);
-            float b2 = FixedPointHelper.ToFloat(denominatorSpan[1], FixedPointPrecisionForParameter);
+            float b1 = denominatorSpan[0];
+            float b2 = denominatorSpan[1];

            for (int i = 0; i < sampleCount; i++)
            {
@@ -60,22 +168,22 @@ namespace Ryujinx.Audio.Renderer.Dsp
        /// <param name="volume">Mix volume</param>
        [MethodImpl(MethodImplOptions.AggressiveInlining)]
        public static void ProcessBiquadFilterAndMix(
-            ref BiquadFilterParameter parameter,
+            ref BiquadFilterParameter2 parameter,
            ref BiquadFilterState state,
            Span<float> outputBuffer,
            ReadOnlySpan<float> inputBuffer,
            uint sampleCount,
            float volume)
        {
-            Span<short> numeratorSpan = parameter.Numerator.AsSpan();
-            Span<short> denominatorSpan = parameter.Denominator.AsSpan();
+            Span<float> numeratorSpan = parameter.Numerator.AsSpan();
+            Span<float> denominatorSpan = parameter.Denominator.AsSpan();
            
-            float a0 = FixedPointHelper.ToFloat(numeratorSpan[0], FixedPointPrecisionForParameter);
-            float a1 = FixedPointHelper.ToFloat(numeratorSpan[1], FixedPointPrecisionForParameter);
-            float a2 = FixedPointHelper.ToFloat(numeratorSpan[2], FixedPointPrecisionForParameter);
+            float a0 = numeratorSpan[0];
+            float a1 = numeratorSpan[1];
+            float a2 = numeratorSpan[2];

-            float b1 = FixedPointHelper.ToFloat(denominatorSpan[0], FixedPointPrecisionForParameter);
-            float b2 = FixedPointHelper.ToFloat(denominatorSpan[1], FixedPointPrecisionForParameter);
+            float b1 = denominatorSpan[0];
+            float b2 = denominatorSpan[1];

            for (int i = 0; i < sampleCount; i++)
            {
@@ -105,7 +213,7 @@ namespace Ryujinx.Audio.Renderer.Dsp
        /// <returns>Last filtered sample value</returns>
        [MethodImpl(MethodImplOptions.AggressiveInlining)]
        public static float ProcessBiquadFilterAndMixRamp(
-            ref BiquadFilterParameter parameter,
+            ref BiquadFilterParameter2 parameter,
            ref BiquadFilterState state,
            Span<float> outputBuffer,
            ReadOnlySpan<float> inputBuffer,
@@ -113,15 +221,15 @@ namespace Ryujinx.Audio.Renderer.Dsp
            float volume,
            float ramp)
        {
-            Span<short> numeratorSpan = parameter.Numerator.AsSpan();
-            Span<short> denominatorSpan = parameter.Denominator.AsSpan();
+            Span<float> numeratorSpan = parameter.Numerator.AsSpan();
+            Span<float> denominatorSpan = parameter.Denominator.AsSpan();
            
-            float a0 = FixedPointHelper.ToFloat(numeratorSpan[0], FixedPointPrecisionForParameter);
-            float a1 = FixedPointHelper.ToFloat(numeratorSpan[1], FixedPointPrecisionForParameter);
-            float a2 = FixedPointHelper.ToFloat(numeratorSpan[2], FixedPointPrecisionForParameter);
+            float a0 = numeratorSpan[0];
+            float a1 = numeratorSpan[1];
+            float a2 = numeratorSpan[2];

-            float b1 = FixedPointHelper.ToFloat(denominatorSpan[0], FixedPointPrecisionForParameter);
-            float b2 = FixedPointHelper.ToFloat(denominatorSpan[1], FixedPointPrecisionForParameter);
+            float b1 = denominatorSpan[0];
+            float b2 = denominatorSpan[1];

            float mixState = 0f;

@@ -155,7 +263,7 @@ namespace Ryujinx.Audio.Renderer.Dsp
        /// <param name="sampleCount">The count of samples to process</param>
        [MethodImpl(MethodImplOptions.AggressiveInlining)]
        public static void ProcessBiquadFilter(
-            ReadOnlySpan<BiquadFilterParameter> parameters,
+            ReadOnlySpan<BiquadFilterParameter2> parameters,
            Span<BiquadFilterState> states,
            Span<float> outputBuffer,
            ReadOnlySpan<float> inputBuffer,
@@ -163,19 +271,19 @@ namespace Ryujinx.Audio.Renderer.Dsp
        {
            for (int stageIndex = 0; stageIndex < parameters.Length; stageIndex++)
            {
-                BiquadFilterParameter parameter = parameters[stageIndex];
+                BiquadFilterParameter2 parameter = parameters[stageIndex];

                ref BiquadFilterState state = ref states[stageIndex];
                
-                Span<short> numeratorSpan = parameter.Numerator.AsSpan();
-                Span<short> denominatorSpan = parameter.Denominator.AsSpan();
+                Span<float> numeratorSpan = parameter.Numerator.AsSpan();
+                Span<float> denominatorSpan = parameter.Denominator.AsSpan();

-                float a0 = FixedPointHelper.ToFloat(numeratorSpan[0], FixedPointPrecisionForParameter);
-                float a1 = FixedPointHelper.ToFloat(numeratorSpan[1], FixedPointPrecisionForParameter);
-                float a2 = FixedPointHelper.ToFloat(numeratorSpan[2], FixedPointPrecisionForParameter);
+                float a0 = numeratorSpan[0];
+                float a1 = numeratorSpan[1];
+                float a2 = numeratorSpan[2];

-                float b1 = FixedPointHelper.ToFloat(denominatorSpan[0], FixedPointPrecisionForParameter);
-                float b2 = FixedPointHelper.ToFloat(denominatorSpan[1], FixedPointPrecisionForParameter);
+                float b1 = denominatorSpan[0];
+                float b2 = denominatorSpan[1];

                for (int i = 0; i < sampleCount; i++)
                {
@@ -204,8 +312,8 @@ namespace Ryujinx.Audio.Renderer.Dsp
        /// <param name="volume">Mix volume</param>
        [MethodImpl(MethodImplOptions.AggressiveInlining)]
        public static void ProcessDoubleBiquadFilterAndMix(
-            ref BiquadFilterParameter parameter0,
-            ref BiquadFilterParameter parameter1,
+            ref BiquadFilterParameter2 parameter0,
+            ref BiquadFilterParameter2 parameter1,
            ref BiquadFilterState state0,
            ref BiquadFilterState state1,
            Span<float> outputBuffer,
@@ -213,25 +321,25 @@ namespace Ryujinx.Audio.Renderer.Dsp
            uint sampleCount,
            float volume)
        {
-            Span<short> numerator0Span = parameter0.Numerator.AsSpan();
-            Span<short> numerator1Span = parameter1.Numerator.AsSpan();
-            Span<short> denominator0Span = parameter0.Denominator.AsSpan();
-            Span<short> denominator1Span = parameter1.Denominator.AsSpan();
+            Span<float> numerator0Span = parameter0.Numerator.AsSpan();
+            Span<float> numerator1Span = parameter1.Numerator.AsSpan();
+            Span<float> denominator0Span = parameter0.Denominator.AsSpan();
+            Span<float> denominator1Span = parameter1.Denominator.AsSpan();
            
            
-            float a00 = FixedPointHelper.ToFloat(numerator0Span[0], FixedPointPrecisionForParameter);
-            float a10 = FixedPointHelper.ToFloat(numerator0Span[1], FixedPointPrecisionForParameter);
-            float a20 = FixedPointHelper.ToFloat(numerator0Span[2], FixedPointPrecisionForParameter);
+            float a00 = numerator0Span[0];
+            float a10 = numerator0Span[1];
+            float a20 = numerator0Span[2];

-            float b10 = FixedPointHelper.ToFloat(denominator0Span[0], FixedPointPrecisionForParameter);
-            float b20 = FixedPointHelper.ToFloat(denominator0Span[1], FixedPointPrecisionForParameter);
+            float b10 = denominator0Span[0];
+            float b20 = denominator0Span[1];

-            float a01 = FixedPointHelper.ToFloat(numerator1Span[0], FixedPointPrecisionForParameter);
-            float a11 = FixedPointHelper.ToFloat(numerator1Span[1], FixedPointPrecisionForParameter);
-            float a21 = FixedPointHelper.ToFloat(numerator1Span[2], FixedPointPrecisionForParameter);
+            float a01 = numerator1Span[0];
+            float a11 = numerator1Span[1];
+            float a21 = numerator1Span[2];

-            float b11 = FixedPointHelper.ToFloat(denominator1Span[0], FixedPointPrecisionForParameter);
-            float b21 = FixedPointHelper.ToFloat(denominator1Span[1], FixedPointPrecisionForParameter);
+            float b11 = denominator1Span[0];
+            float b21 = denominator1Span[1];

            for (int i = 0; i < sampleCount; i++)
            {
@@ -269,8 +377,8 @@ namespace Ryujinx.Audio.Renderer.Dsp
        /// <returns>Last filtered sample value</returns>
        [MethodImpl(MethodImplOptions.AggressiveInlining)]
        public static float ProcessDoubleBiquadFilterAndMixRamp(
-            ref BiquadFilterParameter parameter0,
-            ref BiquadFilterParameter parameter1,
+            ref BiquadFilterParameter2 parameter0,
+            ref BiquadFilterParameter2 parameter1,
            ref BiquadFilterState state0,
            ref BiquadFilterState state1,
            Span<float> outputBuffer,
@@ -279,24 +387,24 @@ namespace Ryujinx.Audio.Renderer.Dsp
            float volume,
            float ramp)
        {
-            Span<short> numerator0Span = parameter0.Numerator.AsSpan();
-            Span<short> numerator1Span = parameter1.Numerator.AsSpan();
-            Span<short> denominator0Span = parameter0.Denominator.AsSpan();
-            Span<short> denominator1Span = parameter1.Denominator.AsSpan();
+            Span<float> numerator0Span = parameter0.Numerator.AsSpan();
+            Span<float> numerator1Span = parameter1.Numerator.AsSpan();
+            Span<float> denominator0Span = parameter0.Denominator.AsSpan();
+            Span<float> denominator1Span = parameter1.Denominator.AsSpan();
            
-            float a00 = FixedPointHelper.ToFloat(numerator0Span[0], FixedPointPrecisionForParameter);
-            float a10 = FixedPointHelper.ToFloat(numerator0Span[1], FixedPointPrecisionForParameter);
-            float a20 = FixedPointHelper.ToFloat(numerator0Span[2], FixedPointPrecisionForParameter);
+            float a00 = numerator0Span[0];
+            float a10 = numerator0Span[1];
+            float a20 = numerator0Span[2];

-            float b10 = FixedPointHelper.ToFloat(denominator0Span[0], FixedPointPrecisionForParameter);
-            float b20 = FixedPointHelper.ToFloat(denominator0Span[1], FixedPointPrecisionForParameter);
+            float b10 = denominator0Span[0];
+            float b20 = denominator0Span[1];

-            float a01 = FixedPointHelper.ToFloat(numerator1Span[0], FixedPointPrecisionForParameter);
-            float a11 = FixedPointHelper.ToFloat(numerator1Span[1], FixedPointPrecisionForParameter);
-            float a21 = FixedPointHelper.ToFloat(numerator1Span[2], FixedPointPrecisionForParameter);
+            float a01 = numerator1Span[0];
+            float a11 = numerator1Span[1];
+            float a21 = numerator1Span[2];

-            float b11 = FixedPointHelper.ToFloat(denominator1Span[0], FixedPointPrecisionForParameter);
-            float b21 = FixedPointHelper.ToFloat(denominator1Span[1], FixedPointPrecisionForParameter);
+            float b11 = denominator1Span[0];
+            float b21 = denominator1Span[1];

            float mixState = 0f;

--- a/src/Ryujinx.Audio/Renderer/Dsp/Command/AdpcmDataSourceCommandVersion1.cs
+++ b/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 static Ryujinx.Audio.Renderer.Parameter.VoiceInParameter;
+using Ryujinx.Audio.Renderer.Parameter;
 using WaveBuffer = Ryujinx.Audio.Renderer.Common.WaveBuffer;

 namespace Ryujinx.Audio.Renderer.Dsp.Command
@@ -11,38 +11,41 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
    {
        public bool Enabled { get; set; }

-        public int NodeId { get; }
+        public int NodeId { get; private set; }

        public CommandType CommandType => CommandType.AdpcmDataSourceVersion1;

        public uint EstimatedProcessingTime { get; set; }

-        public ushort OutputBufferIndex { get; }
-        public uint SampleRate { get; }
+        public ushort OutputBufferIndex { get; private set; }
+        public uint SampleRate { get; private set; }

-        public float Pitch { get; }
+        public float Pitch { get; private set; }

        public WaveBuffer[] WaveBuffers { get; }

-        public Memory<VoiceUpdateState> State { get; }
+        public Memory<VoiceState> State { get; private set; }

-        public ulong AdpcmParameter { get; }
-        public ulong AdpcmParameterSize { get; }
+        public ulong AdpcmParameter { get; private set; }
+        public ulong AdpcmParameterSize { get; private set; }

-        public DecodingBehaviour DecodingBehaviour { get; }
+        public DecodingBehaviour DecodingBehaviour { get; private set; }

-        public AdpcmDataSourceCommandVersion1(ref VoiceState serverState, Memory<VoiceUpdateState> state, ushort outputBufferIndex, int nodeId)
+        public AdpcmDataSourceCommandVersion1()
+        {
+            WaveBuffers = new WaveBuffer[Constants.VoiceWaveBufferCount];
+        }
+
+        public AdpcmDataSourceCommandVersion1 Initialize(ref VoiceInfo serverInfo, Memory<VoiceState> state, ushort outputBufferIndex, int nodeId)
        {
            Enabled = true;
            NodeId = nodeId;

            OutputBufferIndex = outputBufferIndex;
-            SampleRate = serverState.SampleRate;
-            Pitch = serverState.Pitch;
+            SampleRate = serverInfo.SampleRate;
+            Pitch = serverInfo.Pitch;
            
-            Span<Server.Voice.WaveBuffer> waveBufferSpan = serverState.WaveBuffers.AsSpan();
-
-            WaveBuffers = new WaveBuffer[Constants.VoiceWaveBufferCount];
+            Span<Server.Voice.WaveBuffer> waveBufferSpan = serverInfo.WaveBuffers.AsSpan();

            for (int i = 0; i < WaveBuffers.Length; i++)
            {
@@ -51,10 +54,12 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
                WaveBuffers[i] = voiceWaveBuffer.ToCommon(1);
            }

-            AdpcmParameter = serverState.DataSourceStateAddressInfo.GetReference(true);
-            AdpcmParameterSize = serverState.DataSourceStateAddressInfo.Size;
+            AdpcmParameter = serverInfo.DataSourceStateAddressInfo.GetReference(true);
+            AdpcmParameterSize = serverInfo.DataSourceStateAddressInfo.Size;
            State = state;
-            DecodingBehaviour = serverState.DecodingBehaviour;
+            DecodingBehaviour = serverInfo.DecodingBehaviour;
+
+            return this;
        }

        public void Process(CommandList context)
--- a/src/Ryujinx.Audio/Renderer/Dsp/Command/AuxiliaryBufferCommand.cs
+++ b/src/Ryujinx.Audio/Renderer/Dsp/Command/AuxiliaryBufferCommand.cs
@@ -12,26 +12,31 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
    {
        public bool Enabled { get; set; }

-        public int NodeId { get; }
+        public int NodeId { get; private set; }

        public CommandType CommandType => CommandType.AuxiliaryBuffer;

        public uint EstimatedProcessingTime { get; set; }

-        public uint InputBufferIndex { get; }
-        public uint OutputBufferIndex { get; }
+        public uint InputBufferIndex { get; private set; }
+        public uint OutputBufferIndex { get; private set; }

-        public AuxiliaryBufferAddresses BufferInfo { get; }
+        public AuxiliaryBufferAddresses BufferInfo { get; private set; }

-        public CpuAddress InputBuffer { get; }
-        public CpuAddress OutputBuffer { get; }
-        public uint CountMax { get; }
-        public uint UpdateCount { get; }
-        public uint WriteOffset { get; }
+        public CpuAddress InputBuffer { get; private set; }
+        public CpuAddress OutputBuffer { get; private set; }
+        public uint CountMax { get; private set; }
+        public uint UpdateCount { get; private set; }
+        public uint WriteOffset { get; private set; }

-        public bool IsEffectEnabled { get; }
+        public bool IsEffectEnabled { get; private set; }

-        public AuxiliaryBufferCommand(
+        public AuxiliaryBufferCommand()
+        {
+            
+        }
+        
+        public AuxiliaryBufferCommand Initialize(
            uint bufferOffset,
            byte inputBufferOffset,
            byte outputBufferOffset,
@@ -55,6 +60,8 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
            UpdateCount = updateCount;
            WriteOffset = writeOffset;
            IsEffectEnabled = isEnabled;
+            
+            return this;
        }

        [MethodImpl(MethodImplOptions.AggressiveInlining)]
--- a/src/Ryujinx.Audio/Renderer/Dsp/Command/BiquadFilterAndMixCommand.cs
+++ b/src/Ryujinx.Audio/Renderer/Dsp/Command/BiquadFilterAndMixCommand.cs
@@ -9,39 +9,44 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
    {
        public bool Enabled { get; set; }

-        public int NodeId { get; }
+        public int NodeId { get; private set; }

        public CommandType CommandType => CommandType.BiquadFilterAndMix;

        public uint EstimatedProcessingTime { get; set; }

-        public ushort InputBufferIndex { get; }
-        public ushort OutputBufferIndex { get; }
+        public ushort InputBufferIndex { get; private set; }
+        public ushort OutputBufferIndex { get; private set; }

-        private BiquadFilterParameter _parameter;
+        private BiquadFilterParameter2 _parameter;

-        public Memory<BiquadFilterState> BiquadFilterState { get; }
-        public Memory<BiquadFilterState> PreviousBiquadFilterState { get; }
+        public Memory<BiquadFilterState> BiquadFilterState { get; private set; }
+        public Memory<BiquadFilterState> PreviousBiquadFilterState { get; private set; }

-        public Memory<VoiceUpdateState> State { get; }
+        public Memory<VoiceState> State { get; private set; }

-        public int LastSampleIndex { get; }
+        public int LastSampleIndex { get; private set; }

-        public float Volume0 { get; }
-        public float Volume1 { get; }
+        public float Volume0 { get; private set; }
+        public float Volume1 { get; private set; }

-        public bool NeedInitialization { get; }
-        public bool HasVolumeRamp { get; }
-        public bool IsFirstMixBuffer { get; }
+        public bool NeedInitialization { get; private set; }
+        public bool HasVolumeRamp { get; private set; }
+        public bool IsFirstMixBuffer { get; private set; }

-        public BiquadFilterAndMixCommand(
+        public BiquadFilterAndMixCommand()
+        {
+            
+        }
+
+        public BiquadFilterAndMixCommand Initialize(
            float volume0,
            float volume1,
            uint inputBufferIndex,
            uint outputBufferIndex,
            int lastSampleIndex,
-            Memory<VoiceUpdateState> state,
-            ref BiquadFilterParameter filter,
+            Memory<VoiceState> state,
+            ref BiquadFilterParameter2 filter,
            Memory<BiquadFilterState> biquadFilterState,
            Memory<BiquadFilterState> previousBiquadFilterState,
            bool needInitialization,
@@ -68,6 +73,8 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
            NeedInitialization = needInitialization;
            HasVolumeRamp = hasVolumeRamp;
            IsFirstMixBuffer = isFirstMixBuffer;
+
+            return this;
        }

        public void Process(CommandList context)
--- a/src/Ryujinx.Audio/Renderer/Dsp/Command/BiquadFilterCommand.cs
+++ b/src/Ryujinx.Audio/Renderer/Dsp/Command/BiquadFilterCommand.cs
@@ -8,22 +8,27 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
    {
        public bool Enabled { get; set; }

-        public int NodeId { get; }
+        public int NodeId { get; private set; }

        public CommandType CommandType => CommandType.BiquadFilter;

        public uint EstimatedProcessingTime { get; set; }

-        public Memory<BiquadFilterState> BiquadFilterState { get; }
-        public int InputBufferIndex { get; }
-        public int OutputBufferIndex { get; }
-        public bool NeedInitialization { get; }
+        public Memory<BiquadFilterState> BiquadFilterState { get; private set; }
+        public int InputBufferIndex { get; private set; }
+        public int OutputBufferIndex { get; private set; }
+        public bool NeedInitialization { get; private set; }

-        private BiquadFilterParameter _parameter;
+        private BiquadFilterParameter2 _parameter;

-        public BiquadFilterCommand(
+        public BiquadFilterCommand()
+        {
+            
+        }
+
+        public BiquadFilterCommand Initialize(
            int baseIndex,
-            ref BiquadFilterParameter filter,
+            ref BiquadFilterParameter2 filter,
            Memory<BiquadFilterState> biquadFilterStateMemory,
            int inputBufferOffset,
            int outputBufferOffset,
@@ -38,6 +43,8 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command

            Enabled = true;
            NodeId = nodeId;
+
+            return this;
        }

        public void Process(CommandList context)
--- a/src/Ryujinx.Audio/Renderer/Dsp/Command/CaptureBufferCommand.cs
+++ b/src/Ryujinx.Audio/Renderer/Dsp/Command/CaptureBufferCommand.cs
@@ -12,25 +12,30 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
    {
        public bool Enabled { get; set; }

-        public int NodeId { get; }
+        public int NodeId { get; private set; }

        public CommandType CommandType => CommandType.CaptureBuffer;

        public uint EstimatedProcessingTime { get; set; }

-        public uint InputBufferIndex { get; }
+        public uint InputBufferIndex { get; private set; }

-        public ulong CpuBufferInfoAddress { get; }
-        public ulong DspBufferInfoAddress { get; }
+        public ulong CpuBufferInfoAddress { get; private set; }
+        public ulong DspBufferInfoAddress { get; private set; }

-        public CpuAddress OutputBuffer { get; }
-        public uint CountMax { get; }
-        public uint UpdateCount { get; }
-        public uint WriteOffset { get; }
+        public CpuAddress OutputBuffer { get; private set; }
+        public uint CountMax { get; private set; }
+        public uint UpdateCount { get; private set; }
+        public uint WriteOffset { get; private set; }

-        public bool IsEffectEnabled { get; }
+        public bool IsEffectEnabled { get; private set; }

-        public CaptureBufferCommand(uint bufferOffset, byte inputBufferOffset, ulong sendBufferInfo, bool isEnabled,
+        public CaptureBufferCommand()
+        {
+            
+        }
+        
+        public CaptureBufferCommand Initialize(uint bufferOffset, byte inputBufferOffset, ulong sendBufferInfo, bool isEnabled,
                                    uint countMax, CpuAddress outputBuffer, uint updateCount, uint writeOffset, int nodeId)
        {
            Enabled = true;
@@ -43,6 +48,8 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
            UpdateCount = updateCount;
            WriteOffset = writeOffset;
            IsEffectEnabled = isEnabled;
+
+            return this;
        }

        [MethodImpl(MethodImplOptions.AggressiveInlining)]
--- a/src/Ryujinx.Audio/Renderer/Dsp/Command/CircularBufferSinkCommand.cs
+++ b/src/Ryujinx.Audio/Renderer/Dsp/Command/CircularBufferSinkCommand.cs
@@ -9,25 +9,29 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
    {
        public bool Enabled { get; set; }

-        public int NodeId { get; }
+        public int NodeId { get; private set; }

        public CommandType CommandType => CommandType.CircularBufferSink;

        public uint EstimatedProcessingTime { get; set; }

        public ushort[] Input { get; }
-        public uint InputCount { get; }
+        public uint InputCount { get; private set; }

-        public ulong CircularBuffer { get; }
-        public ulong CircularBufferSize { get; }
-        public ulong CurrentOffset { get; }
+        public ulong CircularBuffer { get; private set; }
+        public ulong CircularBufferSize { get; private set; }
+        public ulong CurrentOffset { get; private set; }

-        public CircularBufferSinkCommand(uint bufferOffset, ref CircularBufferParameter parameter, ref AddressInfo circularBufferAddressInfo, uint currentOffset, int nodeId)
+        public CircularBufferSinkCommand()
+        {
+            Input = new ushort[Constants.ChannelCountMax];
+        }
+        
+        public CircularBufferSinkCommand Initialize(uint bufferOffset, ref CircularBufferParameter parameter, ref AddressInfo circularBufferAddressInfo, uint currentOffset, int nodeId)
        {
            Enabled = true;
            NodeId = nodeId;

-            Input = new ushort[Constants.ChannelCountMax];
            InputCount = parameter.InputCount;
            
            Span<byte> inputSpan = parameter.Input.AsSpan();
@@ -42,6 +46,8 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
            CurrentOffset = currentOffset;

            Debug.Assert(CircularBuffer != 0);
+
+            return this;
        }

        public void Process(CommandList context)
--- a/src/Ryujinx.Audio/Renderer/Dsp/Command/ClearMixBufferCommand.cs
+++ b/src/Ryujinx.Audio/Renderer/Dsp/Command/ClearMixBufferCommand.cs
@@ -4,16 +4,23 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
    {
        public bool Enabled { get; set; }

-        public int NodeId { get; }
+        public int NodeId { get; private set; }

        public CommandType CommandType => CommandType.ClearMixBuffer;

        public uint EstimatedProcessingTime { get; set; }

-        public ClearMixBufferCommand(int nodeId)
+        public ClearMixBufferCommand()
+        {
+            
+        }
+
+        public ClearMixBufferCommand Initialize(int nodeId)
        {
            Enabled = true;
            NodeId = nodeId;
+
+            return this;
        }

        public void Process(CommandList context)
--- a/src/Ryujinx.Audio/Renderer/Dsp/Command/CommandList.cs
+++ b/src/Ryujinx.Audio/Renderer/Dsp/Command/CommandList.cs
@@ -20,6 +20,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
        public Memory<float> Buffers { get; }
        public uint BufferCount { get; }

+        private readonly static ObjectPool<List<ICommand>> CommandsListPool = new(() => new List<ICommand>(256));
        public List<ICommand> Commands { get; }

        public IVirtualMemoryManager MemoryManager { get; }
@@ -46,7 +47,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
            SampleRate = sampleRate;
            BufferCount = mixBufferCount + voiceChannelCountMax;
            Buffers = mixBuffer;
-            Commands = [];
+            Commands = CommandsListPool.Allocate();
            MemoryManager = memoryManager;

            _buffersEntryCount = Buffers.Length;
@@ -129,7 +130,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
                    {
                        startTime = PerformanceCounter.ElapsedNanoseconds;
                    }
-
+                    
                    command.Process(this);

                    if (shouldMeter)
@@ -142,6 +143,8 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
                        }
                    }
                }
+                
+                CommandBuffer.ReleaseCommand(command);
            }

            EndTime = (ulong)PerformanceCounter.ElapsedNanoseconds;
@@ -149,6 +152,8 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command

        public void Dispose()
        {
+            Commands.Clear();
+            CommandsListPool.Release(Commands);
            GC.SuppressFinalize(this);
            _buffersMemoryHandle.Dispose();
        }
--- a/src/Ryujinx.Audio/Renderer/Dsp/Command/CommandType.cs
+++ b/src/Ryujinx.Audio/Renderer/Dsp/Command/CommandType.cs
@@ -12,6 +12,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
        Volume,
        VolumeRamp,
        BiquadFilter,
+        BiquadFilterFloatCoeff, // new
        Mix,
        MixRamp,
        MixRampGrouped,
@@ -31,9 +32,17 @@ 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
    }
 }
--- a/src/Ryujinx.Audio/Renderer/Dsp/Command/CompressorCommand.cs
+++ b/src/Ryujinx.Audio/Renderer/Dsp/Command/CompressorCommand.cs
@@ -15,22 +15,28 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command

        public bool Enabled { get; set; }

-        public int NodeId { get; }
+        public int NodeId { get; private set; }

        public CommandType CommandType => CommandType.Compressor;

        public uint EstimatedProcessingTime { get; set; }

        public CompressorParameter Parameter => _parameter;
-        public Memory<CompressorState> State { get; }
-        public Memory<EffectResultState> ResultState { get; }
+        public Memory<CompressorState> State { get; private set; }
+        public Memory<EffectResultState> ResultState { get; private set; }
        public ushort[] OutputBufferIndices { get; }
        public ushort[] InputBufferIndices { get; }
-        public bool IsEffectEnabled { get; }
+        public bool IsEffectEnabled { get; private set; }

        private CompressorParameter _parameter;

-        public CompressorCommand(uint bufferOffset, CompressorParameter parameter, Memory<CompressorState> state, Memory<EffectResultState> resultState, bool isEnabled, int nodeId)
+        public CompressorCommand()
+        {
+            InputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
+            OutputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
+        }
+
+        public CompressorCommand Initialize(uint bufferOffset, CompressorParameter parameter, Memory<CompressorState> state, Memory<EffectResultState> resultState, bool isEnabled, int nodeId)
        {
            Enabled = true;
            NodeId = nodeId;
@@ -39,9 +45,6 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
            ResultState = resultState;

            IsEffectEnabled = isEnabled;
-
-            InputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
-            OutputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
            
            Span<byte> inputSpan = _parameter.Input.AsSpan();
            Span<byte> outputSpan = _parameter.Output.AsSpan();
@@ -51,6 +54,8 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
                InputBufferIndices[i] = (ushort)(bufferOffset + inputSpan[i]);
                OutputBufferIndices[i] = (ushort)(bufferOffset + outputSpan[i]);
            }
+
+            return this;
        }

        public void Process(CommandList context)
--- a/src/Ryujinx.Audio/Renderer/Dsp/Command/CopyMixBufferCommand.cs
+++ b/src/Ryujinx.Audio/Renderer/Dsp/Command/CopyMixBufferCommand.cs
@@ -4,22 +4,29 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
    {
        public bool Enabled { get; set; }

-        public int NodeId { get; }
+        public int NodeId { get; private set; }

        public CommandType CommandType => CommandType.CopyMixBuffer;

        public uint EstimatedProcessingTime { get; set; }

-        public ushort InputBufferIndex { get; }
-        public ushort OutputBufferIndex { get; }
+        public ushort InputBufferIndex { get; private set; }
+        public ushort OutputBufferIndex { get; private set; }

-        public CopyMixBufferCommand(uint inputBufferIndex, uint outputBufferIndex, int nodeId)
+        public CopyMixBufferCommand()
+        {
+            
+        }
+
+        public CopyMixBufferCommand Initialize(uint inputBufferIndex, uint outputBufferIndex, int nodeId)
        {
            Enabled = true;
            NodeId = nodeId;

            InputBufferIndex = (ushort)inputBufferIndex;
            OutputBufferIndex = (ushort)outputBufferIndex;
+
+            return this;
        }

        public void Process(CommandList context)
--- a/src/Ryujinx.Audio/Renderer/Dsp/Command/DataSourceVersion2Command.cs
+++ b/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 static Ryujinx.Audio.Renderer.Parameter.VoiceInParameter;
+using Ryujinx.Audio.Renderer.Parameter;
 using WaveBuffer = Ryujinx.Audio.Renderer.Common.WaveBuffer;

 namespace Ryujinx.Audio.Renderer.Dsp.Command
@@ -11,51 +11,54 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
    {
        public bool Enabled { get; set; }

-        public int NodeId { get; }
+        public int NodeId { get; private set; }

-        public CommandType CommandType { get; }
+        public CommandType CommandType { get; private set; }

        public uint EstimatedProcessingTime { get; set; }

-        public ushort OutputBufferIndex { get; }
-        public uint SampleRate { get; }
+        public ushort OutputBufferIndex { get; private set; }
+        public uint SampleRate { get; private set; }

-        public float Pitch { get; }
+        public float Pitch { get; private set; }

        public WaveBuffer[] WaveBuffers { get; }

-        public Memory<VoiceUpdateState> State { get; }
+        public Memory<VoiceState> State { get; private set; }

-        public ulong ExtraParameter { get; }
-        public ulong ExtraParameterSize { get; }
+        public ulong ExtraParameter { get; private set; }
+        public ulong ExtraParameterSize { get; private set; }

-        public uint ChannelIndex { get; }
+        public uint ChannelIndex { get; private set; }

-        public uint ChannelCount { get; }
+        public uint ChannelCount { get; private set; }

-        public DecodingBehaviour DecodingBehaviour { get; }
+        public DecodingBehaviour DecodingBehaviour { get; private set; }

-        public SampleFormat SampleFormat { get; }
+        public SampleFormat SampleFormat { get; private set; }

-        public SampleRateConversionQuality SrcQuality { get; }
+        public SampleRateConversionQuality SrcQuality { get; private set; }

-        public DataSourceVersion2Command(ref VoiceState serverState, Memory<VoiceUpdateState> state, ushort outputBufferIndex, ushort channelIndex, int nodeId)
+        public DataSourceVersion2Command()
+        {
+            WaveBuffers = new WaveBuffer[Constants.VoiceWaveBufferCount];
+        }
+
+        public DataSourceVersion2Command Initialize(ref VoiceInfo serverInfo, Memory<VoiceState> state, ushort outputBufferIndex, ushort channelIndex, int nodeId)
        {
            Enabled = true;
            NodeId = nodeId;
            ChannelIndex = channelIndex;
-            ChannelCount = serverState.ChannelsCount;
-            SampleFormat = serverState.SampleFormat;
-            SrcQuality = serverState.SrcQuality;
+            ChannelCount = serverInfo.ChannelsCount;
+            SampleFormat = serverInfo.SampleFormat;
+            SrcQuality = serverInfo.SrcQuality;
            CommandType = GetCommandTypeBySampleFormat(SampleFormat);

            OutputBufferIndex = (ushort)(channelIndex + outputBufferIndex);
-            SampleRate = serverState.SampleRate;
-            Pitch = serverState.Pitch;
+            SampleRate = serverInfo.SampleRate;
+            Pitch = serverInfo.Pitch;
            
-            Span<Server.Voice.WaveBuffer> waveBufferSpan = serverState.WaveBuffers.AsSpan();
-
-            WaveBuffers = new WaveBuffer[Constants.VoiceWaveBufferCount];
+            Span<Server.Voice.WaveBuffer> waveBufferSpan = serverInfo.WaveBuffers.AsSpan();

            for (int i = 0; i < WaveBuffers.Length; i++)
            {
@@ -66,12 +69,14 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command

            if (SampleFormat == SampleFormat.Adpcm)
            {
-                ExtraParameter = serverState.DataSourceStateAddressInfo.GetReference(true);
-                ExtraParameterSize = serverState.DataSourceStateAddressInfo.Size;
+                ExtraParameter = serverInfo.DataSourceStateAddressInfo.GetReference(true);
+                ExtraParameterSize = serverInfo.DataSourceStateAddressInfo.Size;
            }

            State = state;
-            DecodingBehaviour = serverState.DecodingBehaviour;
+            DecodingBehaviour = serverInfo.DecodingBehaviour;
+
+            return this;
        }

        private static CommandType GetCommandTypeBySampleFormat(SampleFormat sampleFormat)
--- a/src/Ryujinx.Audio/Renderer/Dsp/Command/DelayCommand.cs
+++ b/src/Ryujinx.Audio/Renderer/Dsp/Command/DelayCommand.cs
@@ -13,24 +13,30 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
    {
        public bool Enabled { get; set; }

-        public int NodeId { get; }
+        public int NodeId { get; private set; }

        public CommandType CommandType => CommandType.Delay;

        public uint EstimatedProcessingTime { get; set; }

        public DelayParameter Parameter => _parameter;
-        public Memory<DelayState> State { get; }
-        public ulong WorkBuffer { get; }
+        public Memory<DelayState> State { get; private set; }
+        public ulong WorkBuffer { get; private set; }
        public ushort[] OutputBufferIndices { get; }
        public ushort[] InputBufferIndices { get; }
-        public bool IsEffectEnabled { get; }
+        public bool IsEffectEnabled { get; private set; }

        private DelayParameter _parameter;

        private const int FixedPointPrecision = 14;

-        public DelayCommand(uint bufferOffset, DelayParameter parameter, Memory<DelayState> state, bool isEnabled, ulong workBuffer, int nodeId, bool newEffectChannelMappingSupported)
+        public DelayCommand()
+        {
+            InputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
+            OutputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
+        }
+
+        public DelayCommand Initialize(uint bufferOffset, DelayParameter parameter, Memory<DelayState> state, bool isEnabled, ulong workBuffer, int nodeId, bool newEffectChannelMappingSupported)
        {
            Enabled = true;
            NodeId = nodeId;
@@ -39,9 +45,6 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
            WorkBuffer = workBuffer;

            IsEffectEnabled = isEnabled;
-
-            InputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
-            OutputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
            
            Span<byte> inputSpan = Parameter.Input.AsSpan();
            Span<byte> outputSpan = Parameter.Output.AsSpan();
@@ -54,6 +57,8 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command

            DataSourceHelper.RemapLegacyChannelEffectMappingToChannelResourceMapping(newEffectChannelMappingSupported, InputBufferIndices, Parameter.ChannelCount);
            DataSourceHelper.RemapLegacyChannelEffectMappingToChannelResourceMapping(newEffectChannelMappingSupported, OutputBufferIndices, Parameter.ChannelCount);
+
+            return this;
        }

        [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
--- a/src/Ryujinx.Audio/Renderer/Dsp/Command/DepopForMixBuffersCommand.cs
+++ b/src/Ryujinx.Audio/Renderer/Dsp/Command/DepopForMixBuffersCommand.cs
@@ -7,21 +7,26 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
    {
        public bool Enabled { get; set; }

-        public int NodeId { get; }
+        public int NodeId { get; private set; }

        public CommandType CommandType => CommandType.DepopForMixBuffers;

        public uint EstimatedProcessingTime { get; set; }

-        public uint MixBufferOffset { get; }
+        public uint MixBufferOffset { get; private set; }

-        public uint MixBufferCount { get; }
+        public uint MixBufferCount { get; private set; }

-        public float Decay { get; }
+        public float Decay { get; private set; }

-        public Memory<float> DepopBuffer { get; }
+        public Memory<float> DepopBuffer { get; private set; }

-        public DepopForMixBuffersCommand(Memory<float> depopBuffer, uint bufferOffset, uint mixBufferCount, int nodeId, uint sampleRate)
+        public DepopForMixBuffersCommand()
+        {
+            
+        }
+
+        public DepopForMixBuffersCommand Initialize(Memory<float> depopBuffer, uint bufferOffset, uint mixBufferCount, int nodeId, uint sampleRate)
        {
            Enabled = true;
            NodeId = nodeId;
@@ -37,6 +42,8 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
            {
                Decay = 0.943695f;
            }
+
+            return this;
        }

        [MethodImpl(MethodImplOptions.AggressiveInlining)]
--- a/src/Ryujinx.Audio/Renderer/Dsp/Command/DepopPrepareCommand.cs
+++ b/src/Ryujinx.Audio/Renderer/Dsp/Command/DepopPrepareCommand.cs
@@ -7,27 +7,30 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
    {
        public bool Enabled { get; set; }

-        public int NodeId { get; }
+        public int NodeId { get; private set; }

        public CommandType CommandType => CommandType.DepopPrepare;

        public uint EstimatedProcessingTime { get; set; }

-        public uint MixBufferCount { get; }
+        public uint MixBufferCount { get; private set; }

        public ushort[] OutputBufferIndices { get; }

-        public Memory<VoiceUpdateState> State { get; }
-        public Memory<float> DepopBuffer { get; }
+        public Memory<VoiceState> State { get; private set; }
+        public Memory<float> DepopBuffer { get; private set; }

-        public DepopPrepareCommand(Memory<VoiceUpdateState> state, Memory<float> depopBuffer, uint mixBufferCount, uint bufferOffset, int nodeId, bool enabled)
+        public DepopPrepareCommand()
+        {
+            OutputBufferIndices = new ushort[Constants.MixBufferCountMax];
+        }
+
+        public DepopPrepareCommand Initialize(Memory<VoiceState> state, Memory<float> depopBuffer, uint mixBufferCount, uint bufferOffset, int nodeId, bool enabled)
        {
            Enabled = enabled;
            NodeId = nodeId;
            MixBufferCount = mixBufferCount;

-            OutputBufferIndices = new ushort[Constants.MixBufferCountMax];
-
            for (int i = 0; i < Constants.MixBufferCountMax; i++)
            {
                OutputBufferIndices[i] = (ushort)(bufferOffset + i);
@@ -35,11 +38,13 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command

            State = state;
            DepopBuffer = depopBuffer;
+
+            return this;
        }

        public void Process(CommandList context)
        {
-            ref VoiceUpdateState state = ref State.Span[0];
+            ref VoiceState state = ref State.Span[0];

            Span<float> depopBuffer = DepopBuffer.Span;
            Span<float> lastSamplesSpan = state.LastSamples.AsSpan();
--- a/src/Ryujinx.Audio/Renderer/Dsp/Command/DeviceSinkCommand.cs
+++ b/src/Ryujinx.Audio/Renderer/Dsp/Command/DeviceSinkCommand.cs
@@ -1,6 +1,7 @@
 using Ryujinx.Audio.Integration;
 using Ryujinx.Audio.Renderer.Server.Sink;
 using System;
+using System.Buffers;
 using System.Runtime.CompilerServices;
 using System.Text;

@@ -10,27 +11,34 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
    {
        public bool Enabled { get; set; }

-        public int NodeId { get; }
+        public int NodeId { get; private set; }

        public CommandType CommandType => CommandType.DeviceSink;

        public uint EstimatedProcessingTime { get; set; }

-        public string DeviceName { get; }
+        public string DeviceName { get; private set; }

-        public int SessionId { get; }
+        public int SessionId { get; private set; }

-        public uint InputCount { get; }
-        public ushort[] InputBufferIndices { get; }
+        public uint InputCount { get; private set; }
+        public ushort[] InputBufferIndices { get; private set; }

-        public Memory<float> Buffers { get; }
+        public Memory<float> Buffers { get; private set; }

-        public DeviceSinkCommand(uint bufferOffset, DeviceSink sink, int sessionId, Memory<float> buffers, int nodeId)
+        public DeviceSinkCommand()
+        {
+            
+        }
+
+        public DeviceSinkCommand Initialize(uint bufferOffset, DeviceSink sink, int sessionId, Memory<float> buffers, int nodeId)
        {
            Enabled = true;
            NodeId = nodeId;

-            DeviceName = Encoding.ASCII.GetString(sink.Parameter.DeviceName).TrimEnd('\0');
+            // Unused and wasting time and memory, re-add if needed
+            // DeviceName = Encoding.ASCII.GetString(sink.Parameter.DeviceName).TrimEnd('\0');
+            
            SessionId = sessionId;
            InputCount = sink.Parameter.InputCount;
            InputBufferIndices = new ushort[InputCount];
@@ -42,14 +50,16 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
                InputBufferIndices[i] = (ushort)(bufferOffset + inputSpan[i]);
            }

-            if (sink.UpsamplerState != null)
+            if (sink.UpsamplerInfo != null)
            {
-                Buffers = sink.UpsamplerState.OutputBuffer;
+                Buffers = sink.UpsamplerInfo.OutputBuffer;
            }
            else
            {
                Buffers = buffers;
            }
+
+            return this;
        }

        [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -81,7 +91,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
                    inputCount = bufferCount;
                }

-                short[] outputBuffer = new short[inputCount * SampleCount];
+                short[] outputBuffer = ArrayPool<short>.Shared.Rent((int)inputCount * SampleCount);

                for (int i = 0; i < bufferCount; i++)
                {
@@ -93,7 +103,9 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
                    }
                }

-                device.AppendBuffer(outputBuffer, inputCount);
+                device.AppendBuffer(outputBuffer.AsSpan(..((int)inputCount * SampleCount)), inputCount);
+                
+                ArrayPool<short>.Shared.Return(outputBuffer);
            }
            else
            {
--- a/src/Ryujinx.Audio/Renderer/Dsp/Command/DownMixSurroundToStereoCommand.cs
+++ b/src/Ryujinx.Audio/Renderer/Dsp/Command/DownMixSurroundToStereoCommand.cs
@@ -7,7 +7,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
    {
        public bool Enabled { get; set; }

-        public int NodeId { get; }
+        public int NodeId { get; private set; }

        public CommandType CommandType => CommandType.DownMixSurroundToStereo;

@@ -16,16 +16,19 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
        public ushort[] InputBufferIndices { get; }
        public ushort[] OutputBufferIndices { get; }

-        public float[] Coefficients { get; }
+        public float[] Coefficients { get; private set; }

-        public DownMixSurroundToStereoCommand(uint bufferOffset, Span<byte> inputBufferOffset, Span<byte> outputBufferOffset, float[] downMixParameter, int nodeId)
+        public DownMixSurroundToStereoCommand()
+        {
+            InputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
+            OutputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
+        }
+
+        public DownMixSurroundToStereoCommand Initialize(uint bufferOffset, Span<byte> inputBufferOffset, Span<byte> outputBufferOffset, float[] downMixParameter, int nodeId)
        {
            Enabled = true;
            NodeId = nodeId;

-            InputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
-            OutputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
-
            for (int i = 0; i < Constants.VoiceChannelCountMax; i++)
            {
                InputBufferIndices[i] = (ushort)(bufferOffset + inputBufferOffset[i]);
@@ -33,6 +36,8 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
            }

            Coefficients = downMixParameter;
+            
+            return this;
        }

        [MethodImpl(MethodImplOptions.AggressiveInlining)]
--- a/src/Ryujinx.Audio/Renderer/Dsp/Command/FillBufferCommand.cs
+++ b/src/Ryujinx.Audio/Renderer/Dsp/Command/FillBufferCommand.cs
@@ -0,0 +1,73 @@
+using Ryujinx.Audio.Renderer.Server.Splitter;
+using System.Runtime.CompilerServices;
+
+namespace Ryujinx.Audio.Renderer.Dsp.Command
+{
+    public class FillBufferCommand : ICommand
+    {
+        public bool Enabled { get; set; }
+
+        public int NodeId { get; private set; }
+
+        public CommandType CommandType => CommandType.FillBuffer;
+
+        public uint EstimatedProcessingTime { get; set; }
+
+        public SplitterDestinationVersion1 Destination1 { get; private set; }
+        public SplitterDestinationVersion2 Destination2 { get; private set; }
+        public bool IsV2 { get; private set; }
+        public int Length { get; private set; }
+        public float Value { get; private set; }
+
+        public FillBufferCommand()
+        {
+            
+        }
+        
+        public FillBufferCommand Initialize(SplitterDestination destination, int length, float value, int nodeId)
+        {
+            Enabled = true;
+            NodeId = nodeId;
+
+            if (Unsafe.IsNullRef(ref destination.GetV2RefOrNull()))
+            {
+                Destination1 = destination.GetV1RefOrNull();
+                IsV2 = false;
+            }
+            else
+            {
+                Destination2 = destination.GetV2RefOrNull();
+                IsV2 = true;
+            }
+            
+            Length = length;
+            Value = value;
+
+            return this;
+        }
+
+        [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();
+        }
+    }
+}
--- a/src/Ryujinx.Audio/Renderer/Dsp/Command/LimiterCommandVersion1.cs
+++ b/src/Ryujinx.Audio/Renderer/Dsp/Command/LimiterCommandVersion1.cs
@@ -10,22 +10,28 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
    {
        public bool Enabled { get; set; }

-        public int NodeId { get; }
+        public int NodeId { get; private set; }

        public CommandType CommandType => CommandType.LimiterVersion1;

        public uint EstimatedProcessingTime { get; set; }

        public LimiterParameter Parameter => _parameter;
-        public Memory<LimiterState> State { get; }
-        public ulong WorkBuffer { get; }
+        public Memory<LimiterState> State { get; private set; }
+        public ulong WorkBuffer { get; private set; }
        public ushort[] OutputBufferIndices { get; }
        public ushort[] InputBufferIndices { get; }
-        public bool IsEffectEnabled { get; }
+        public bool IsEffectEnabled { get; private set; }

        private LimiterParameter _parameter;

-        public LimiterCommandVersion1(uint bufferOffset, LimiterParameter parameter, Memory<LimiterState> state, bool isEnabled, ulong workBuffer, int nodeId)
+        public LimiterCommandVersion1()
+        {
+            InputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
+            OutputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
+        }
+        
+        public LimiterCommandVersion1 Initialize(uint bufferOffset, LimiterParameter parameter, Memory<LimiterState> state, bool isEnabled, ulong workBuffer, int nodeId)
        {
            Enabled = true;
            NodeId = nodeId;
@@ -35,9 +41,6 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command

            IsEffectEnabled = isEnabled;

-            InputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
-            OutputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
-            
            Span<byte> inputSpan = _parameter.Input.AsSpan();
            Span<byte> outputSpan = _parameter.Output.AsSpan();

@@ -46,6 +49,8 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
                InputBufferIndices[i] = (ushort)(bufferOffset + inputSpan[i]);
                OutputBufferIndices[i] = (ushort)(bufferOffset + outputSpan[i]);
            }
+
+            return this;
        }

        public void Process(CommandList context)
--- a/src/Ryujinx.Audio/Renderer/Dsp/Command/LimiterCommandVersion2.cs
+++ b/src/Ryujinx.Audio/Renderer/Dsp/Command/LimiterCommandVersion2.cs
@@ -12,23 +12,29 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
    {
        public bool Enabled { get; set; }

-        public int NodeId { get; }
+        public int NodeId { get; private set; }

        public CommandType CommandType => CommandType.LimiterVersion2;

        public uint EstimatedProcessingTime { get; set; }

        public LimiterParameter Parameter => _parameter;
-        public Memory<LimiterState> State { get; }
-        public Memory<EffectResultState> ResultState { get; }
-        public ulong WorkBuffer { get; }
+        public Memory<LimiterState> State { get; private set; }
+        public Memory<EffectResultState> ResultState { get; private set; }
+        public ulong WorkBuffer { get; private set; }
        public ushort[] OutputBufferIndices { get; }
        public ushort[] InputBufferIndices { get; }
-        public bool IsEffectEnabled { get; }
+        public bool IsEffectEnabled { get; private set; }

        private LimiterParameter _parameter;

-        public LimiterCommandVersion2(
+        public LimiterCommandVersion2()
+        {
+            InputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
+            OutputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
+        }
+        
+        public LimiterCommandVersion2 Initialize(
            uint bufferOffset,
            LimiterParameter parameter,
            Memory<LimiterState> state,
@@ -45,9 +51,6 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
            WorkBuffer = workBuffer;

            IsEffectEnabled = isEnabled;
-
-            InputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
-            OutputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
            
            Span<byte> inputSpan = _parameter.Input.AsSpan();
            Span<byte> outputSpan = _parameter.Output.AsSpan();
@@ -57,6 +60,8 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
                InputBufferIndices[i] = (ushort)(bufferOffset + inputSpan[i]);
                OutputBufferIndices[i] = (ushort)(bufferOffset + outputSpan[i]);
            }
+            
+            return this;
        }

        public void Process(CommandList context)
--- a/src/Ryujinx.Audio/Renderer/Dsp/Command/MixCommand.cs
+++ b/src/Ryujinx.Audio/Renderer/Dsp/Command/MixCommand.cs
@@ -11,18 +11,23 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
    {
        public bool Enabled { get; set; }

-        public int NodeId { get; }
+        public int NodeId { get; private set; }

        public CommandType CommandType => CommandType.Mix;

        public uint EstimatedProcessingTime { get; set; }

-        public ushort InputBufferIndex { get; }
-        public ushort OutputBufferIndex { get; }
+        public ushort InputBufferIndex { get; private set; }
+        public ushort OutputBufferIndex { get; private set; }

-        public float Volume { get; }
+        public float Volume { get; private set; }

-        public MixCommand(uint inputBufferIndex, uint outputBufferIndex, int nodeId, float volume)
+        public MixCommand()
+        {
+            
+        }
+        
+        public MixCommand Initialize(uint inputBufferIndex, uint outputBufferIndex, int nodeId, float volume)
        {
            Enabled = true;
            NodeId = nodeId;
@@ -31,6 +36,8 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
            OutputBufferIndex = (ushort)outputBufferIndex;

            Volume = volume;
+
+            return this;
        }

        [MethodImpl(MethodImplOptions.AggressiveInlining)]
--- a/src/Ryujinx.Audio/Renderer/Dsp/Command/MixRampCommand.cs
+++ b/src/Ryujinx.Audio/Renderer/Dsp/Command/MixRampCommand.cs
@@ -8,23 +8,28 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
    {
        public bool Enabled { get; set; }

-        public int NodeId { get; }
+        public int NodeId { get; private set; }

        public CommandType CommandType => CommandType.MixRamp;

        public uint EstimatedProcessingTime { get; set; }

-        public ushort InputBufferIndex { get; }
-        public ushort OutputBufferIndex { get; }
+        public ushort InputBufferIndex { get; private set; }
+        public ushort OutputBufferIndex { get; private set; }

-        public float Volume0 { get; }
-        public float Volume1 { get; }
+        public float Volume0 { get; private set; }
+        public float Volume1 { get; private set; }

-        public Memory<VoiceUpdateState> State { get; }
+        public Memory<VoiceState> State { get; private set; }

-        public int LastSampleIndex { get; }
+        public int LastSampleIndex { get; private set; }

-        public MixRampCommand(float volume0, float volume1, uint inputBufferIndex, uint outputBufferIndex, int lastSampleIndex, Memory<VoiceUpdateState> state, int nodeId)
+        public MixRampCommand()
+        {
+            
+        }
+
+        public MixRampCommand Initialize(float volume0, float volume1, uint inputBufferIndex, uint outputBufferIndex, int lastSampleIndex, Memory<VoiceState> state, int nodeId)
        {
            Enabled = true;
            NodeId = nodeId;
@@ -37,6 +42,8 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command

            State = state;
            LastSampleIndex = lastSampleIndex;
+
+            return this;
        }

        [MethodImpl(MethodImplOptions.AggressiveInlining)]
--- a/src/Ryujinx.Audio/Renderer/Dsp/Command/MixRampGroupedCommand.cs
+++ b/src/Ryujinx.Audio/Renderer/Dsp/Command/MixRampGroupedCommand.cs
@@ -8,29 +8,34 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
    {
        public bool Enabled { get; set; }

-        public int NodeId { get; }
+        public int NodeId { get; private set; }

        public CommandType CommandType => CommandType.MixRampGrouped;

        public uint EstimatedProcessingTime { get; set; }

-        public uint MixBufferCount { get; }
+        public uint MixBufferCount { get; private set; }

-        public ushort[] InputBufferIndices { get; }
-        public ushort[] OutputBufferIndices { get; }
+        public ushort[] InputBufferIndices { get; private set; }
+        public ushort[] OutputBufferIndices { get; private set; }

-        public float[] Volume0 { get; }
-        public float[] Volume1 { get; }
+        public float[] Volume0 { get; private set; }
+        public float[] Volume1 { get; private set; }

-        public Memory<VoiceUpdateState> State { get; }
+        public Memory<VoiceState> State { get; private set; }

-        public MixRampGroupedCommand(
+        public MixRampGroupedCommand()
+        {
+            
+        }
+
+        public MixRampGroupedCommand Initialize(
            uint mixBufferCount,
            uint inputBufferIndex,
            uint outputBufferIndex,
            ReadOnlySpan<float> volume0,
            ReadOnlySpan<float> volume1,
-            Memory<VoiceUpdateState> state,
+            Memory<VoiceState> state,
            int nodeId)
        {
            Enabled = true;
@@ -52,6 +57,8 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
            }

            State = state;
+            
+            return this;
        }

        [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -79,7 +86,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command

        public void Process(CommandList context)
        {
-            ref VoiceUpdateState state = ref State.Span[0];
+            ref VoiceState state = ref State.Span[0];
            
            Span<float> lastSamplesSpan = state.LastSamples.AsSpan();
            
--- a/src/Ryujinx.Audio/Renderer/Dsp/Command/MultiTapBiquadFilterAndMixCommand.cs
+++ b/src/Ryujinx.Audio/Renderer/Dsp/Command/MultiTapBiquadFilterAndMixCommand.cs
@@ -9,44 +9,49 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
    {
        public bool Enabled { get; set; }

-        public int NodeId { get; }
+        public int NodeId { get; private set; }

        public CommandType CommandType => CommandType.MultiTapBiquadFilterAndMix;

        public uint EstimatedProcessingTime { get; set; }

-        public ushort InputBufferIndex { get; }
-        public ushort OutputBufferIndex { get; }
+        public ushort InputBufferIndex { get; private set; }
+        public ushort OutputBufferIndex { get; private set; }

-        private BiquadFilterParameter _parameter0;
-        private BiquadFilterParameter _parameter1;
+        private BiquadFilterParameter2 _parameter0;
+        private BiquadFilterParameter2 _parameter1;

-        public Memory<BiquadFilterState> BiquadFilterState0 { get; }
-        public Memory<BiquadFilterState> BiquadFilterState1 { get; }
-        public Memory<BiquadFilterState> PreviousBiquadFilterState0 { get; }
-        public Memory<BiquadFilterState> PreviousBiquadFilterState1 { get; }
+        public Memory<BiquadFilterState> BiquadFilterState0 { get; private set; }
+        public Memory<BiquadFilterState> BiquadFilterState1 { get; private set; }
+        public Memory<BiquadFilterState> PreviousBiquadFilterState0 { get; private set; }
+        public Memory<BiquadFilterState> PreviousBiquadFilterState1 { get; private set; }

-        public Memory<VoiceUpdateState> State { get; }
+        public Memory<VoiceState> State { get; private set; }

-        public int LastSampleIndex { get; }
+        public int LastSampleIndex { get; private set; }

-        public float Volume0 { get; }
-        public float Volume1 { get; }
+        public float Volume0 { get; private set; }
+        public float Volume1 { get; private set; }

-        public bool NeedInitialization0 { get; }
-        public bool NeedInitialization1 { get; }
-        public bool HasVolumeRamp { get; }
-        public bool IsFirstMixBuffer { get; }
+        public bool NeedInitialization0 { get; private set; }
+        public bool NeedInitialization1 { get; private set; }
+        public bool HasVolumeRamp { get; private set; }
+        public bool IsFirstMixBuffer { get; private set; }

-        public MultiTapBiquadFilterAndMixCommand(
+        public MultiTapBiquadFilterAndMixCommand()
+        {
+            
+        }
+
+        public MultiTapBiquadFilterAndMixCommand Initialize(
            float volume0,
            float volume1,
            uint inputBufferIndex,
            uint outputBufferIndex,
            int lastSampleIndex,
-            Memory<VoiceUpdateState> state,
-            ref BiquadFilterParameter filter0,
-            ref BiquadFilterParameter filter1,
+            Memory<VoiceState> state,
+            ref BiquadFilterParameter2 filter0,
+            ref BiquadFilterParameter2 filter1,
            Memory<BiquadFilterState> biquadFilterState0,
            Memory<BiquadFilterState> biquadFilterState1,
            Memory<BiquadFilterState> previousBiquadFilterState0,
@@ -80,6 +85,8 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
            NeedInitialization1 = needInitialization1;
            HasVolumeRamp = hasVolumeRamp;
            IsFirstMixBuffer = isFirstMixBuffer;
+
+            return this;
        }

        private void UpdateState(Memory<BiquadFilterState> state, Memory<BiquadFilterState> previousState, bool needInitialization)
--- a/src/Ryujinx.Audio/Renderer/Dsp/Command/MultiTapBiquadFilterCommand.cs
+++ b/src/Ryujinx.Audio/Renderer/Dsp/Command/MultiTapBiquadFilterCommand.cs
@@ -8,40 +8,47 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
    {
        public bool Enabled { get; set; }

-        public int NodeId { get; }
+        public int NodeId { get; private set; }

        public CommandType CommandType => CommandType.MultiTapBiquadFilter;

        public uint EstimatedProcessingTime { get; set; }

-        private readonly BiquadFilterParameter[] _parameters;
-        private readonly Memory<BiquadFilterState> _biquadFilterStates;
-        private readonly int _inputBufferIndex;
-        private readonly int _outputBufferIndex;
-        private readonly bool[] _isInitialized;
+        public BiquadFilterParameter2[] Parameters { get; private set; }
+        public Memory<BiquadFilterState> BiquadFilterStates { get; private set; }
+        public int InputBufferIndex { get; private set; }
+        public int OutputBufferIndex { get; private set; }
+        public bool[] IsInitialized { get; private set; }

-        public MultiTapBiquadFilterCommand(int baseIndex, ReadOnlySpan<BiquadFilterParameter> filters, Memory<BiquadFilterState> biquadFilterStateMemory, int inputBufferOffset, int outputBufferOffset, ReadOnlySpan<bool> isInitialized, int nodeId)
+        public MultiTapBiquadFilterCommand()
        {
-            _parameters = filters.ToArray();
-            _biquadFilterStates = biquadFilterStateMemory;
-            _inputBufferIndex = baseIndex + inputBufferOffset;
-            _outputBufferIndex = baseIndex + outputBufferOffset;
-            _isInitialized = isInitialized.ToArray();
+            
+        }
+
+        public MultiTapBiquadFilterCommand Initialize(int baseIndex, ReadOnlySpan<BiquadFilterParameter2> filters, Memory<BiquadFilterState> biquadFilterStateMemory, int inputBufferOffset, int outputBufferOffset, ReadOnlySpan<bool> isInitialized, int nodeId)
+        {
+            Parameters = filters.ToArray();
+            BiquadFilterStates = biquadFilterStateMemory;
+            InputBufferIndex = baseIndex + inputBufferOffset;
+            OutputBufferIndex = baseIndex + outputBufferOffset;
+            IsInitialized = isInitialized.ToArray();

            Enabled = true;
            NodeId = nodeId;
+            
+            return this;
        }

        public void Process(CommandList context)
        {
-            Span<BiquadFilterState> states = _biquadFilterStates.Span;
+            Span<BiquadFilterState> states = BiquadFilterStates.Span;

-            ReadOnlySpan<float> inputBuffer = context.GetBuffer(_inputBufferIndex);
-            Span<float> outputBuffer = context.GetBuffer(_outputBufferIndex);
+            ReadOnlySpan<float> inputBuffer = context.GetBuffer(InputBufferIndex);
+            Span<float> outputBuffer = context.GetBuffer(OutputBufferIndex);

-            for (int i = 0; i < _parameters.Length; i++)
+            for (int i = 0; i < Parameters.Length; i++)
            {
-                if (!_isInitialized[i])
+                if (!IsInitialized[i])
                {
                    states[i] = new BiquadFilterState();
                }
@@ -49,13 +56,13 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command

            // NOTE: Nintendo only implement single and double biquad filters but no generic path when the command definition suggests it could be done.
            // As such we currently only implement a generic path for simplicity for double biquad.
-            if (_parameters.Length == 1)
+            if (Parameters.Length == 1)
            {
-                BiquadFilterHelper.ProcessBiquadFilter(ref _parameters[0], ref states[0], outputBuffer, inputBuffer, context.SampleCount);
+                BiquadFilterHelper.ProcessBiquadFilter(ref Parameters[0], ref states[0], outputBuffer, inputBuffer, context.SampleCount);
            }
            else
            {
-                BiquadFilterHelper.ProcessBiquadFilter(_parameters, states, outputBuffer, inputBuffer, context.SampleCount);
+                BiquadFilterHelper.ProcessBiquadFilter(Parameters, states, outputBuffer, inputBuffer, context.SampleCount);
            }
        }
    }
--- a/src/Ryujinx.Audio/Renderer/Dsp/Command/PcmFloatDataSourceCommandVersion1.cs
+++ b/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 static Ryujinx.Audio.Renderer.Parameter.VoiceInParameter;
+using Ryujinx.Audio.Renderer.Parameter;
 using WaveBuffer = Ryujinx.Audio.Renderer.Common.WaveBuffer;

 namespace Ryujinx.Audio.Renderer.Dsp.Command
@@ -11,39 +11,42 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
    {
        public bool Enabled { get; set; }

-        public int NodeId { get; }
+        public int NodeId { get; private set; }

        public CommandType CommandType => CommandType.PcmFloatDataSourceVersion1;

        public uint EstimatedProcessingTime { get; set; }

-        public ushort OutputBufferIndex { get; }
-        public uint SampleRate { get; }
-        public uint ChannelIndex { get; }
+        public ushort OutputBufferIndex { get; private set; }
+        public uint SampleRate { get; private set; }
+        public uint ChannelIndex { get; private set; }

-        public uint ChannelCount { get; }
+        public uint ChannelCount { get; private set; }

-        public float Pitch { get; }
+        public float Pitch { get; private set; }

        public WaveBuffer[] WaveBuffers { get; }

-        public Memory<VoiceUpdateState> State { get; }
-        public DecodingBehaviour DecodingBehaviour { get; }
+        public Memory<VoiceState> State { get; private set; }
+        public DecodingBehaviour DecodingBehaviour { get; private set; }

-        public PcmFloatDataSourceCommandVersion1(ref VoiceState serverState, Memory<VoiceUpdateState> state, ushort outputBufferIndex, ushort channelIndex, int nodeId)
+        public PcmFloatDataSourceCommandVersion1()
+        {
+            WaveBuffers = new WaveBuffer[Constants.VoiceWaveBufferCount];
+        }
+
+        public PcmFloatDataSourceCommandVersion1 Initialize(ref VoiceInfo serverInfo, Memory<VoiceState> state, ushort outputBufferIndex, ushort channelIndex, int nodeId)
        {
            Enabled = true;
            NodeId = nodeId;

            OutputBufferIndex = (ushort)(channelIndex + outputBufferIndex);
-            SampleRate = serverState.SampleRate;
+            SampleRate = serverInfo.SampleRate;
            ChannelIndex = channelIndex;
-            ChannelCount = serverState.ChannelsCount;
-            Pitch = serverState.Pitch;
-
-            WaveBuffers = new WaveBuffer[Constants.VoiceWaveBufferCount];
+            ChannelCount = serverInfo.ChannelsCount;
+            Pitch = serverInfo.Pitch;
            
-            Span<Server.Voice.WaveBuffer> waveBufferSpan = serverState.WaveBuffers.AsSpan();
+            Span<Server.Voice.WaveBuffer> waveBufferSpan = serverInfo.WaveBuffers.AsSpan();

            for (int i = 0; i < WaveBuffers.Length; i++)
            {
@@ -53,7 +56,9 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
            }

            State = state;
-            DecodingBehaviour = serverState.DecodingBehaviour;
+            DecodingBehaviour = serverInfo.DecodingBehaviour;
+
+            return this;
        }

        public void Process(CommandList context)
--- a/src/Ryujinx.Audio/Renderer/Dsp/Command/PcmInt16DataSourceCommandVersion1.cs
+++ b/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 static Ryujinx.Audio.Renderer.Parameter.VoiceInParameter;
+using Ryujinx.Audio.Renderer.Parameter;
 using WaveBuffer = Ryujinx.Audio.Renderer.Common.WaveBuffer;

 namespace Ryujinx.Audio.Renderer.Dsp.Command
@@ -11,39 +11,42 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
    {
        public bool Enabled { get; set; }

-        public int NodeId { get; }
+        public int NodeId { get; private set; }

        public CommandType CommandType => CommandType.PcmInt16DataSourceVersion1;

        public uint EstimatedProcessingTime { get; set; }

-        public ushort OutputBufferIndex { get; }
-        public uint SampleRate { get; }
-        public uint ChannelIndex { get; }
+        public ushort OutputBufferIndex { get; private set; }
+        public uint SampleRate { get; private set; }
+        public uint ChannelIndex { get; private set; }

-        public uint ChannelCount { get; }
+        public uint ChannelCount { get; private set; }

-        public float Pitch { get; }
+        public float Pitch { get; private set; }

        public WaveBuffer[] WaveBuffers { get; }

-        public Memory<VoiceUpdateState> State { get; }
-        public DecodingBehaviour DecodingBehaviour { get; }
+        public Memory<VoiceState> State { get; private set; }
+        public DecodingBehaviour DecodingBehaviour { get; private set; }

-        public PcmInt16DataSourceCommandVersion1(ref VoiceState serverState, Memory<VoiceUpdateState> state, ushort outputBufferIndex, ushort channelIndex, int nodeId)
+        public PcmInt16DataSourceCommandVersion1()
+        {
+            WaveBuffers = new WaveBuffer[Constants.VoiceWaveBufferCount];
+        }
+
+        public PcmInt16DataSourceCommandVersion1 Initialize(ref VoiceInfo serverInfo, Memory<VoiceState> state, ushort outputBufferIndex, ushort channelIndex, int nodeId)
        {
            Enabled = true;
            NodeId = nodeId;

            OutputBufferIndex = (ushort)(channelIndex + outputBufferIndex);
-            SampleRate = serverState.SampleRate;
+            SampleRate = serverInfo.SampleRate;
            ChannelIndex = channelIndex;
-            ChannelCount = serverState.ChannelsCount;
-            Pitch = serverState.Pitch;
-
-            WaveBuffers = new WaveBuffer[Constants.VoiceWaveBufferCount];
+            ChannelCount = serverInfo.ChannelsCount;
+            Pitch = serverInfo.Pitch;
            
-            Span<Server.Voice.WaveBuffer> waveBufferSpan = serverState.WaveBuffers.AsSpan();
+            Span<Server.Voice.WaveBuffer> waveBufferSpan = serverInfo.WaveBuffers.AsSpan();

            for (int i = 0; i < WaveBuffers.Length; i++)
            {
@@ -53,7 +56,9 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
            }

            State = state;
-            DecodingBehaviour = serverState.DecodingBehaviour;
+            DecodingBehaviour = serverInfo.DecodingBehaviour;
+
+            return this;
        }

        public void Process(CommandList context)
--- a/src/Ryujinx.Audio/Renderer/Dsp/Command/PerformanceCommand.cs
+++ b/src/Ryujinx.Audio/Renderer/Dsp/Command/PerformanceCommand.cs
@@ -13,22 +13,34 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command

        public bool Enabled { get; set; }

-        public int NodeId { get; }
+        public int NodeId { get; private set; }

        public CommandType CommandType => CommandType.Performance;

        public uint EstimatedProcessingTime { get; set; }

-        public PerformanceEntryAddresses PerformanceEntryAddresses { get; }
+        public PerformanceEntryAddresses PerformanceEntryAddresses { get; private set; }

        public Type PerformanceType { get; set; }

-        public PerformanceCommand(ref PerformanceEntryAddresses performanceEntryAddresses, Type performanceType, int nodeId)
+        public PerformanceCommand()
        {
+            
+        }
+
+        public PerformanceCommand Initialize(ref PerformanceEntryAddresses performanceEntryAddresses, Type performanceType, int nodeId)
+        {
+            if (PerformanceEntryAddresses is not null)
+            {
+                PerformanceEntryAddresses.PerformanceEntryAddressesPool.Release(PerformanceEntryAddresses);
+            }
+            
            Enabled = true;
            PerformanceEntryAddresses = performanceEntryAddresses;
            PerformanceType = performanceType;
            NodeId = nodeId;
+
+            return this;
        }

        public void Process(CommandList context)
--- a/src/Ryujinx.Audio/Renderer/Dsp/Command/Reverb3dCommand.cs
+++ b/src/Ryujinx.Audio/Renderer/Dsp/Command/Reverb3dCommand.cs
@@ -35,26 +35,32 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command

        public bool Enabled { get; set; }

-        public int NodeId { get; }
+        public int NodeId { get; private set; }

        public CommandType CommandType => CommandType.Reverb3d;

        public uint EstimatedProcessingTime { get; set; }

-        public ushort InputBufferIndex { get; }
-        public ushort OutputBufferIndex { get; }
+        public ushort InputBufferIndex { get; private set; }
+        public ushort OutputBufferIndex { get; private set; }

        public Reverb3dParameter Parameter => _parameter;
-        public Memory<Reverb3dState> State { get; }
-        public ulong WorkBuffer { get; }
+        public Memory<Reverb3dState> State { get; private set; }
+        public ulong WorkBuffer { get; private set; }
        public ushort[] OutputBufferIndices { get; }
        public ushort[] InputBufferIndices { get; }

-        public bool IsEffectEnabled { get; }
+        public bool IsEffectEnabled { get; private set; }

        private Reverb3dParameter _parameter;

-        public Reverb3dCommand(uint bufferOffset, Reverb3dParameter parameter, Memory<Reverb3dState> state, bool isEnabled, ulong workBuffer, int nodeId, bool newEffectChannelMappingSupported)
+        public Reverb3dCommand()
+        {
+            InputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
+            OutputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
+        }
+
+        public Reverb3dCommand Initialize(uint bufferOffset, Reverb3dParameter parameter, Memory<Reverb3dState> state, bool isEnabled, ulong workBuffer, int nodeId, bool newEffectChannelMappingSupported)
        {
            Enabled = true;
            IsEffectEnabled = isEnabled;
@@ -62,9 +68,6 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
            _parameter = parameter;
            State = state;
            WorkBuffer = workBuffer;
-
-            InputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
-            OutputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
            
            Span<byte> inputSpan = Parameter.Input.AsSpan();
            Span<byte> outputSpan = Parameter.Output.AsSpan();
@@ -79,6 +82,8 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
            // TODO: Update reverb 3d processing and remove this to use RemapLegacyChannelEffectMappingToChannelResourceMapping.
            DataSourceHelper.RemapChannelResourceMappingToLegacy(newEffectChannelMappingSupported, InputBufferIndices, Parameter.ChannelCount);
            DataSourceHelper.RemapChannelResourceMappingToLegacy(newEffectChannelMappingSupported, OutputBufferIndices, Parameter.ChannelCount);
+
+            return this;
        }

        [MethodImpl(MethodImplOptions.AggressiveInlining)]
--- a/src/Ryujinx.Audio/Renderer/Dsp/Command/ReverbCommand.cs
+++ b/src/Ryujinx.Audio/Renderer/Dsp/Command/ReverbCommand.cs
@@ -33,26 +33,32 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command

        public bool Enabled { get; set; }

-        public int NodeId { get; }
+        public int NodeId { get; private set; }

        public CommandType CommandType => CommandType.Reverb;

        public uint EstimatedProcessingTime { get; set; }

        public ReverbParameter Parameter => _parameter;
-        public Memory<ReverbState> State { get; }
-        public ulong WorkBuffer { get; }
+        public Memory<ReverbState> State { get; private set; }
+        public ulong WorkBuffer { get; private set; }
        public ushort[] OutputBufferIndices { get; }
        public ushort[] InputBufferIndices { get; }
-        public bool IsLongSizePreDelaySupported { get; }
+        public bool IsLongSizePreDelaySupported { get; private set; }

-        public bool IsEffectEnabled { get; }
+        public bool IsEffectEnabled { get; private set; }

        private ReverbParameter _parameter;

        private const int FixedPointPrecision = 14;

-        public ReverbCommand(uint bufferOffset, ReverbParameter parameter, Memory<ReverbState> state, bool isEnabled, ulong workBuffer, int nodeId, bool isLongSizePreDelaySupported, bool newEffectChannelMappingSupported)
+        public ReverbCommand()
+        {
+            InputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
+            OutputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
+        }
+
+        public ReverbCommand Initialize(uint bufferOffset, ReverbParameter parameter, Memory<ReverbState> state, bool isEnabled, ulong workBuffer, int nodeId, bool isLongSizePreDelaySupported, bool newEffectChannelMappingSupported)
        {
            Enabled = true;
            IsEffectEnabled = isEnabled;
@@ -60,9 +66,6 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
            _parameter = parameter;
            State = state;
            WorkBuffer = workBuffer;
-
-            InputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
-            OutputBufferIndices = new ushort[Constants.VoiceChannelCountMax];
            
            Span<byte> inputSpan = Parameter.Input.AsSpan();
            Span<byte> outputSpan = Parameter.Output.AsSpan();
@@ -79,6 +82,8 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
            // TODO: Update reverb processing and remove this to use RemapLegacyChannelEffectMappingToChannelResourceMapping.
            DataSourceHelper.RemapChannelResourceMappingToLegacy(newEffectChannelMappingSupported, InputBufferIndices, Parameter.ChannelCount);
            DataSourceHelper.RemapChannelResourceMappingToLegacy(newEffectChannelMappingSupported, OutputBufferIndices, Parameter.ChannelCount);
+
+            return this;
        }

        [MethodImpl(MethodImplOptions.AggressiveInlining)]
--- a/src/Ryujinx.Audio/Renderer/Dsp/Command/UpsampleCommand.cs
+++ b/src/Ryujinx.Audio/Renderer/Dsp/Command/UpsampleCommand.cs
@@ -7,22 +7,27 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
    {
        public bool Enabled { get; set; }

-        public int NodeId { get; }
+        public int NodeId { get; private set; }

        public CommandType CommandType => CommandType.Upsample;

        public uint EstimatedProcessingTime { get; set; }

-        public uint BufferCount { get; }
-        public uint InputBufferIndex { get; }
-        public uint InputSampleCount { get; }
-        public uint InputSampleRate { get; }
+        public uint BufferCount { get; private set; }
+        public uint InputBufferIndex { get; private set; }
+        public uint InputSampleCount { get; private set; }
+        public uint InputSampleRate { get; private set; }

-        public UpsamplerState UpsamplerInfo { get; }
+        public UpsamplerInfo UpsamplerInfo { get; private set; }

-        public Memory<float> OutBuffer { get; }
+        public Memory<float> OutBuffer { get; private set; }

-        public UpsampleCommand(uint bufferOffset, UpsamplerState info, uint inputCount, Span<byte> inputBufferOffset, uint bufferCount, uint sampleCount, uint sampleRate, int nodeId)
+        public UpsampleCommand()
+        {
+            
+        }
+
+        public UpsampleCommand Initialize(uint bufferOffset, UpsamplerInfo info, uint inputCount, Span<byte> inputBufferOffset, uint bufferCount, uint sampleCount, uint sampleRate, int nodeId)
        {
            Enabled = true;
            NodeId = nodeId;
@@ -47,6 +52,8 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
            }

            UpsamplerInfo = info;
+
+            return this;
        }

        private Span<float> GetBuffer(int index, int sampleCount)
--- a/src/Ryujinx.Audio/Renderer/Dsp/Command/VolumeCommand.cs
+++ b/src/Ryujinx.Audio/Renderer/Dsp/Command/VolumeCommand.cs
@@ -11,18 +11,23 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
    {
        public bool Enabled { get; set; }

-        public int NodeId { get; }
+        public int NodeId { get; private set; }

        public CommandType CommandType => CommandType.Volume;

        public uint EstimatedProcessingTime { get; set; }

-        public ushort InputBufferIndex { get; }
-        public ushort OutputBufferIndex { get; }
+        public ushort InputBufferIndex { get; private set; }
+        public ushort OutputBufferIndex { get; private set; }

-        public float Volume { get; }
+        public float Volume { get; private set; }

-        public VolumeCommand(float volume, uint bufferIndex, int nodeId)
+        public VolumeCommand()
+        {
+            
+        }
+
+        public VolumeCommand Initialize(float volume, uint bufferIndex, int nodeId)
        {
            Enabled = true;
            NodeId = nodeId;
@@ -31,6 +36,8 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
            OutputBufferIndex = (ushort)bufferIndex;

            Volume = volume;
+
+            return this;
        }

        [MethodImpl(MethodImplOptions.AggressiveInlining)]
--- a/src/Ryujinx.Audio/Renderer/Dsp/Command/VolumeRampCommand.cs
+++ b/src/Ryujinx.Audio/Renderer/Dsp/Command/VolumeRampCommand.cs
@@ -7,19 +7,24 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
    {
        public bool Enabled { get; set; }

-        public int NodeId { get; }
+        public int NodeId { get; private set; }

        public CommandType CommandType => CommandType.VolumeRamp;

        public uint EstimatedProcessingTime { get; set; }

-        public ushort InputBufferIndex { get; }
-        public ushort OutputBufferIndex { get; }
+        public ushort InputBufferIndex { get; private set; }
+        public ushort OutputBufferIndex { get; private set; }

-        public float Volume0 { get; }
-        public float Volume1 { get; }
+        public float Volume0 { get; private set; }
+        public float Volume1 { get; private set; }

-        public VolumeRampCommand(float volume0, float volume1, uint bufferIndex, int nodeId)
+        public VolumeRampCommand()
+        {
+            
+        }
+        
+        public VolumeRampCommand Initialize(float volume0, float volume1, uint bufferIndex, int nodeId)
        {
            Enabled = true;
            NodeId = nodeId;
@@ -29,6 +34,8 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command

            Volume0 = volume0;
            Volume1 = volume1;
+
+            return this;
        }

        [MethodImpl(MethodImplOptions.AggressiveInlining)]
--- a/src/Ryujinx.Audio/Renderer/Dsp/DataSourceHelper.cs
+++ b/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 static Ryujinx.Audio.Renderer.Parameter.VoiceInParameter;
+using Ryujinx.Audio.Renderer.Parameter;

 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 VoiceUpdateState voiceState, uint targetSampleRate, int sampleCount)
+        public static void ProcessWaveBuffers(IVirtualMemoryManager memoryManager, Span<float> outputBuffer, ref WaveBufferInformation info, Span<WaveBuffer> wavebuffers, ref VoiceState voiceState, uint targetSampleRate, int sampleCount)
        {
            const int TempBufferSize = 0x3F00;

--- a/src/Ryujinx.Audio/Renderer/Dsp/ResamplerHelper.cs
+++ b/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 static Ryujinx.Audio.Renderer.Parameter.VoiceInParameter;
+using Ryujinx.Audio.Renderer.Parameter;

 namespace Ryujinx.Audio.Renderer.Dsp
 {
--- a/src/Ryujinx.Audio/Renderer/Parameter/AudioRendererConfiguration.cs
+++ b/src/Ryujinx.Audio/Renderer/Parameter/AudioRendererConfiguration.cs
@@ -1,3 +1,4 @@
+using Ryujinx.Audio.Renderer.Server;
 using Ryujinx.Audio.Renderer.Server.Types;
 using System.Runtime.InteropServices;

@@ -93,7 +94,7 @@ namespace Ryujinx.Audio.Renderer.Parameter
        /// <summary>
        /// The user audio revision
        /// </summary>
-        /// <seealso cref="Server.BehaviourContext"/>
+        /// <seealso cref="BehaviourInfo"/>
        public int Revision;
    }
 }
--- a/src/Ryujinx.Audio/Renderer/Parameter/BiquadFilterParameter1.cs
+++ b/src/Ryujinx.Audio/Renderer/Parameter/BiquadFilterParameter1.cs
@@ -7,7 +7,7 @@ namespace Ryujinx.Audio.Renderer.Parameter
    /// Biquad filter parameters.
    /// </summary>
    [StructLayout(LayoutKind.Sequential, Size = 0xC, Pack = 1)]
-    public struct BiquadFilterParameter
+    public struct BiquadFilterParameter1
    {
        /// <summary>
        /// Set to true if the biquad filter is active.
--- a/src/Ryujinx.Audio/Renderer/Parameter/BiquadFilterParameter2.cs
+++ b/src/Ryujinx.Audio/Renderer/Parameter/BiquadFilterParameter2.cs
@@ -0,0 +1,36 @@
+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;
+    }
+}
--- a/src/Ryujinx.Audio/Renderer/Parameter/Effect/BiquadFilterEffectParameter1.cs
+++ b/src/Ryujinx.Audio/Renderer/Parameter/Effect/BiquadFilterEffectParameter1.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 BiquadFilterEffectParameter
+    public struct BiquadFilterEffectParameter1
    {
        /// <summary>
        /// The input channel indices that will be used by the <see cref="Dsp.AudioProcessor"/>.
--- a/src/Ryujinx.Audio/Renderer/Parameter/Effect/BiquadFilterEffectParameter2.cs
+++ b/src/Ryujinx.Audio/Renderer/Parameter/Effect/BiquadFilterEffectParameter2.cs
@@ -0,0 +1,49 @@
+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;
+    }
+}
--- a/src/Ryujinx.Audio/Renderer/Parameter/ISplitterDestinationInParameter.cs
+++ b/src/Ryujinx.Audio/Renderer/Parameter/ISplitterDestinationInParameter.cs
@@ -17,11 +17,11 @@ namespace Ryujinx.Audio.Renderer.Parameter
        /// The mix to output the result of the splitter.
        /// </summary>
        int DestinationId { get; }
-
+        
        /// <summary>
        /// Biquad filter parameters.
        /// </summary>
-        Array2<BiquadFilterParameter> BiquadFilters { get; }
+        Array2<BiquadFilterParameter2> BiquadFilters2 { get; }

        /// <summary>
        /// Set to true if in use.
--- a/src/Ryujinx.Audio/Renderer/Parameter/SinkInParameter.cs
+++ b/src/Ryujinx.Audio/Renderer/Parameter/SinkInParameter.cs
@@ -25,7 +25,7 @@ namespace Ryujinx.Audio.Renderer.Parameter
        /// <summary>
        /// Reserved/padding.
        /// </summary>
-        private readonly ushort _reserved1;
+        private readonly ushort _magic; // 0xCAFE

        /// <summary>
        /// The node id of the sink.
--- a/src/Ryujinx.Audio/Renderer/Parameter/SplitterDestinationInParameterVersion1.cs
+++ b/src/Ryujinx.Audio/Renderer/Parameter/SplitterDestinationInParameterVersion1.cs
@@ -60,8 +60,8 @@ namespace Ryujinx.Audio.Renderer.Parameter
        readonly int ISplitterDestinationInParameter.Id => Id;

        readonly int ISplitterDestinationInParameter.DestinationId => DestinationId;
-
-        readonly Array2<BiquadFilterParameter> ISplitterDestinationInParameter.BiquadFilters => default;
+        
+        readonly Array2<BiquadFilterParameter2> ISplitterDestinationInParameter.BiquadFilters2 => default;

        readonly bool ISplitterDestinationInParameter.IsUsed => IsUsed;
        readonly bool ISplitterDestinationInParameter.ResetPrevVolume => ResetPrevVolume;
--- a/src/Ryujinx.Audio/Renderer/Parameter/SplitterDestinationInParameterVersion2a.cs
+++ b/src/Ryujinx.Audio/Renderer/Parameter/SplitterDestinationInParameterVersion2a.cs
@@ -0,0 +1,100 @@
+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;
+        }
+    }
+}
--- a/src/Ryujinx.Audio/Renderer/Parameter/SplitterDestinationInParameterVersion2b.cs
+++ b/src/Ryujinx.Audio/Renderer/Parameter/SplitterDestinationInParameterVersion2b.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 SplitterDestinationInParameterVersion2 : ISplitterDestinationInParameter
+    public struct SplitterDestinationInParameterVersion2b : ISplitterDestinationInParameter
    {
        /// <summary>
        /// Magic of the input header.
@@ -34,7 +34,7 @@ namespace Ryujinx.Audio.Renderer.Parameter
        /// <summary>
        /// Biquad filter parameters.
        /// </summary>
-        public Array2<BiquadFilterParameter> BiquadFilters;
+        public Array2<BiquadFilterParameter2> BiquadFilters;

        /// <summary>
        /// Set to true if in use.
@@ -66,7 +66,7 @@ namespace Ryujinx.Audio.Renderer.Parameter

        readonly int ISplitterDestinationInParameter.DestinationId => DestinationId;

-        readonly Array2<BiquadFilterParameter> ISplitterDestinationInParameter.BiquadFilters => BiquadFilters;
+        readonly Array2<BiquadFilterParameter2> ISplitterDestinationInParameter.BiquadFilters2 => BiquadFilters;

        readonly bool ISplitterDestinationInParameter.IsUsed => IsUsed;
        readonly bool ISplitterDestinationInParameter.ResetPrevVolume => ResetPrevVolume;
--- a/src/Ryujinx.Audio/Renderer/Parameter/VoiceInParameter1.cs
+++ b/src/Ryujinx.Audio/Renderer/Parameter/VoiceInParameter1.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 VoiceInParameter
+    public struct VoiceInParameter1
    {
        /// <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<BiquadFilterParameter> BiquadFilters;
+        public Array2<BiquadFilterParameter1> BiquadFilters;

        /// <summary>
        /// Total count of <see cref="WaveBufferInternal"/> of the voice.
@@ -171,8 +171,9 @@ namespace Ryujinx.Audio.Renderer.Parameter
        /// Reserved/unused.
        /// </summary>
        private unsafe fixed uint _reserved3[2];
-
-        /// <summary>
+    }
+    
+    /// <summary>
        /// Input information for a voice wavebuffer.
        /// </summary>
        [StructLayout(LayoutKind.Sequential, Size = 0x38, Pack = 1)]
@@ -328,5 +329,4 @@ namespace Ryujinx.Audio.Renderer.Parameter
            /// </summary>
            Low,
        }
-    }
 }
--- a/src/Ryujinx.Audio/Renderer/Parameter/VoiceInParameter2.cs
+++ b/src/Ryujinx.Audio/Renderer/Parameter/VoiceInParameter2.cs
@@ -0,0 +1,173 @@
+using Ryujinx.Audio.Common;
+using Ryujinx.Audio.Renderer.Common;
+using Ryujinx.Common.Memory;
+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];
+    }
+}
--- a/src/Ryujinx.Audio/Renderer/Parameter/VoiceOutStatus.cs
+++ b/src/Ryujinx.Audio/Renderer/Parameter/VoiceOutStatus.cs
@@ -1,3 +1,5 @@
+using Ryujinx.Audio.Renderer.Common;
+using Ryujinx.Audio.Renderer.Server;
 using System.Runtime.InteropServices;

 namespace Ryujinx.Audio.Renderer.Parameter
@@ -5,7 +7,7 @@ namespace Ryujinx.Audio.Renderer.Parameter
    /// <summary>
    /// Output information about a voice.
    /// </summary>
-    /// <remarks>See <seealso cref="Server.StateUpdater.UpdateVoices(Server.Voice.VoiceContext, System.Memory{Server.MemoryPool.MemoryPoolState})"/></remarks>
+    /// <remarks>See <seealso cref="StateUpdater.UpdateVoices1"/></remarks>
    [StructLayout(LayoutKind.Sequential, Pack = 1)]
    public struct VoiceOutStatus
    {
@@ -13,7 +15,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="Parameter.VoiceInParameter.DecodingBehaviour.PlayedSampleCountResetWhenLooping"/> is set.</remarks>
+        /// <remarks>This is reset to 0 when looping while <see cref="DecodingBehaviour.PlayedSampleCountResetWhenLooping"/> is set.</remarks>
        public ulong PlayedSampleCount;

        /// <summary>
--- a/src/Ryujinx.Audio/Renderer/Server/AudioRenderSystem.cs
+++ b/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 MemoryPoolState _dspMemoryPoolState;
+        private MemoryPoolInfo _dspMemoryPoolInfo;
        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 BehaviourContext _behaviourContext;
+        private BehaviourInfo _behaviourInfo;
 #pragma warning disable IDE0052 // Remove unread private member
        private ulong _totalElapsedTicksUpdating;
        private ulong _totalElapsedTicks;
 #pragma warning restore IDE0052
        private int _sessionId;
-        private Memory<MemoryPoolState> _memoryPools;
+        private Memory<MemoryPoolInfo> _memoryPools;

        private uint _sampleRate;
        private uint _sampleCount;
@@ -84,7 +84,7 @@ namespace Ryujinx.Audio.Renderer.Server
        public AudioRenderSystem(AudioRendererManager manager, IWritableEvent systemEvent)
        {
            _manager = manager;
-            _dspMemoryPoolState = MemoryPoolState.Create(MemoryPoolState.LocationType.Dsp);
+            _dspMemoryPoolInfo = MemoryPoolInfo.Create(MemoryPoolInfo.LocationType.Dsp);
            _voiceContext = new VoiceContext();
            _mixContext = new MixContext();
            _sinkContext = new SinkContext();
@@ -93,7 +93,7 @@ namespace Ryujinx.Audio.Renderer.Server

            _commandProcessingTimeEstimator = null;
            _systemEvent = systemEvent;
-            _behaviourContext = new BehaviourContext();
+            _behaviourInfo = new BehaviourInfo();

            _totalElapsedTicksUpdating = 0;
            _sessionId = 0;
@@ -110,7 +110,7 @@ namespace Ryujinx.Audio.Renderer.Server
            ulong appletResourceId,
            IVirtualMemoryManager memoryManager)
        {
-            if (!BehaviourContext.CheckValidRevision(parameter.Revision))
+            if (!BehaviourInfo.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{BehaviourContext.GetRevisionNumber(parameter.Revision)}");
+            Logger.Info?.Print(LogClass.AudioRenderer, $"Initializing with REV{BehaviourInfo.GetRevisionNumber(parameter.Revision)}");

-            _behaviourContext.SetUserRevision(parameter.Revision);
+            _behaviourInfo.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 _dspMemoryPoolState, workBuffer, workBufferSize);
+            poolMapper.InitializeSystemPool(ref _dspMemoryPoolInfo, 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 (_behaviourContext.IsBiquadFilterParameterForSplitterEnabled() &&
+            if (_behaviourInfo.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(_dspMemoryPoolState.Translate(workBuffer, workBufferAllocator.Offset), workBufferAllocator.Offset);
+            AudioProcessorMemoryManager.InvalidateDspCache(_dspMemoryPoolInfo.Translate(workBuffer, workBufferAllocator.Offset), workBufferAllocator.Offset);

            Debug.Assert((workBufferAllocator.Offset % Constants.BufferAlignment) == 0);

-            Memory<VoiceState> voices = workBufferAllocator.Allocate<VoiceState>(parameter.VoiceCount, VoiceState.Alignment);
+            Memory<VoiceInfo> voices = workBufferAllocator.Allocate<VoiceInfo>(parameter.VoiceCount, VoiceInfo.Alignment);

            if (voices.IsEmpty)
            {
                return ResultCode.WorkBufferTooSmall;
            }

-            foreach (ref VoiceState voice in voices.Span)
+            foreach (ref VoiceInfo voice in voices.Span)
            {
                voice.Initialize();
            }

-            // A pain to handle as we can't have VoiceState*, use indices to be a bit more safe
+            // A pain to handle as we can't have VoiceInfo*, 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<VoiceUpdateState> voiceUpdateStates = workBufferAllocator.Allocate<VoiceUpdateState>(parameter.VoiceCount, VoiceUpdateState.Align);
+            Memory<VoiceState> voiceStates = workBufferAllocator.Allocate<VoiceState>(parameter.VoiceCount, VoiceState.Align);

-            if (voiceUpdateStates.IsEmpty)
+            if (voiceStates.IsEmpty)
            {
                return ResultCode.WorkBufferTooSmall;
            }

            uint mixesCount = parameter.SubMixBufferCount + 1;

-            Memory<MixState> mixes = workBufferAllocator.Allocate<MixState>(mixesCount, MixState.Alignment);
+            Memory<MixInfo> mixes = workBufferAllocator.Allocate<MixInfo>(mixesCount, MixInfo.Alignment);

            if (mixes.IsEmpty)
            {
@@ -251,18 +251,18 @@ namespace Ryujinx.Audio.Renderer.Server

            if (parameter.EffectCount == 0)
            {
-                foreach (ref MixState mix in mixes.Span)
+                foreach (ref MixInfo mix in mixes.Span)
                {
-                    mix = new MixState(Memory<int>.Empty, ref _behaviourContext);
+                    mix = new MixInfo(Memory<int>.Empty, ref _behaviourInfo);
                }
            }
            else
            {
                Memory<int> effectProcessingOrderArray = workBufferAllocator.Allocate<int>(parameter.EffectCount * mixesCount, 0x10);

-                foreach (ref MixState mix in mixes.Span)
+                foreach (ref MixInfo mix in mixes.Span)
                {
-                    mix = new MixState(effectProcessingOrderArray[..(int)parameter.EffectCount], ref _behaviourContext);
+                    mix = new MixInfo(effectProcessingOrderArray[..(int)parameter.EffectCount], ref _behaviourInfo);

                    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> sortedMixesState = workBufferAllocator.Allocate<int>(mixesCount, 0x10);
+            Memory<int> sortedMixesInfo = workBufferAllocator.Allocate<int>(mixesCount, 0x10);

-            if (sortedMixesState.IsEmpty)
+            if (sortedMixesInfo.IsEmpty)
            {
                return ResultCode.WorkBufferTooSmall;
            }

            // Clear memory (use -1 as it's an invalid index)
-            sortedMixesState.Span.Fill(-1);
+            sortedMixesInfo.Span.Fill(-1);

            Memory<byte> nodeStatesWorkBuffer = Memory<byte>.Empty;
            Memory<byte> edgeMatrixWorkBuffer = Memory<byte>.Empty;

-            if (_behaviourContext.IsSplitterSupported())
+            if (_behaviourInfo.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(sortedMixesState, mixes, nodeStatesWorkBuffer, edgeMatrixWorkBuffer);
+            _mixContext.Initialize(sortedMixesInfo, mixes, nodeStatesWorkBuffer, edgeMatrixWorkBuffer);

-            _memoryPools = workBufferAllocator.Allocate<MemoryPoolState>(_memoryPoolCount, MemoryPoolState.Alignment);
+            _memoryPools = workBufferAllocator.Allocate<MemoryPoolInfo>(_memoryPoolCount, MemoryPoolInfo.Alignment);

            if (_memoryPools.IsEmpty)
            {
                return ResultCode.WorkBufferTooSmall;
            }

-            foreach (ref MemoryPoolState state in _memoryPools.Span)
+            foreach (ref MemoryPoolInfo info in _memoryPools.Span)
            {
-                state = MemoryPoolState.Create(MemoryPoolState.LocationType.Cpu);
+                info = MemoryPoolInfo.Create(MemoryPoolInfo.LocationType.Cpu);
            }

-            if (!_splitterContext.Initialize(ref _behaviourContext, ref parameter, workBufferAllocator, splitterBqfStates))
+            if (!_splitterContext.Initialize(ref _behaviourInfo, 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, _behaviourContext.IsEffectInfoVersion2Supported() ? parameter.EffectCount : 0);
+            _effectContext.Initialize(parameter.EffectCount, _behaviourInfo.IsEffectInfoVersion2Supported() ? parameter.EffectCount : 0);
            _sinkContext.Initialize(parameter.SinkCount);

-            Memory<VoiceUpdateState> voiceUpdateStatesDsp = workBufferAllocator.Allocate<VoiceUpdateState>(parameter.VoiceCount, VoiceUpdateState.Align);
+            Memory<VoiceState> voiceStatesDsp = workBufferAllocator.Allocate<VoiceState>(parameter.VoiceCount, VoiceState.Align);

-            if (voiceUpdateStatesDsp.IsEmpty)
+            if (voiceStatesDsp.IsEmpty)
            {
                return ResultCode.WorkBufferTooSmall;
            }

-            _voiceContext.Initialize(sortedVoices, voices, voiceChannelResources, voiceUpdateStates, voiceUpdateStatesDsp, parameter.VoiceCount);
+            _voiceContext.Initialize(sortedVoices, voices, voiceChannelResources, voiceStates, voiceStatesDsp, parameter.VoiceCount);

            if (parameter.PerformanceMetricFramesCount > 0)
            {
-                ulong performanceBufferSize = PerformanceManager.GetRequiredBufferSizeForPerformanceMetricsPerFrame(ref parameter, ref _behaviourContext) * (parameter.PerformanceMetricFramesCount + 1) + 0xC;
+                ulong performanceBufferSize = PerformanceManager.GetRequiredBufferSizeForPerformanceMetricsPerFrame(ref parameter, ref _behaviourInfo) * (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, _behaviourContext);
+                _performanceManager = PerformanceManager.Create(_performanceBuffer, ref parameter, _behaviourInfo);
            }
            else
            {
@@ -359,14 +359,14 @@ namespace Ryujinx.Audio.Renderer.Server
            _elapsedFrameCount = 0;
            _voiceDropParameter = 1.0f;

-            _commandProcessingTimeEstimator = _behaviourContext.GetCommandProcessingTimeEstimatorVersion() switch
+            _commandProcessingTimeEstimator = _behaviourInfo.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 {_behaviourContext.GetCommandProcessingTimeEstimatorVersion()}."),
+                _ => throw new NotImplementedException($"Unsupported processing time estimator version {_behaviourInfo.GetCommandProcessingTimeEstimatorVersion()}."),
            };

            return ResultCode.Success;
@@ -411,11 +411,11 @@ namespace Ryujinx.Audio.Renderer.Server

                output.Span.Clear();

-                StateUpdater stateUpdater = new(input, output, _processHandle, _behaviourContext);
+                StateUpdater stateUpdater = new(input, output, _processHandle, _behaviourInfo);

                ResultCode result;

-                result = stateUpdater.UpdateBehaviourContext();
+                result = stateUpdater.UpdateBehaviourInfo();

                if (result != ResultCode.Success)
                {
@@ -436,9 +436,16 @@ namespace Ryujinx.Audio.Renderer.Server
                    return result;
                }

-                PoolMapper poolMapper = new(_processHandle, _memoryPools, _behaviourContext.IsMemoryPoolForceMappingEnabled());
+                PoolMapper poolMapper = new(_processHandle, _memoryPools, _behaviourInfo.IsMemoryPoolForceMappingEnabled());

-                result = stateUpdater.UpdateVoices(_voiceContext, poolMapper);
+                if (_behaviourInfo.IsBiquadFilterParameterFloatSupported())
+                {
+                    result = stateUpdater.UpdateVoices2(_voiceContext, poolMapper);
+                }
+                else
+                {
+                    result = stateUpdater.UpdateVoices1(_voiceContext, poolMapper);
+                }

                if (result != ResultCode.Success)
                {
@@ -452,7 +459,7 @@ namespace Ryujinx.Audio.Renderer.Server
                    return result;
                }

-                if (_behaviourContext.IsSplitterSupported())
+                if (_behaviourInfo.IsSplitterSupported())
                {
                    result = stateUpdater.UpdateSplitter(_splitterContext);

@@ -490,7 +497,7 @@ namespace Ryujinx.Audio.Renderer.Server
                    return result;
                }

-                if (_behaviourContext.IsElapsedFrameCountSupported())
+                if (_behaviourInfo.IsElapsedFrameCountSupported())
                {
                    result = stateUpdater.UpdateRendererInfo(_elapsedFrameCount);

@@ -557,7 +564,7 @@ namespace Ryujinx.Audio.Renderer.Server
                    break;
                }

-                ref VoiceState voice = ref _voiceContext.GetState(NodeIdHelper.GetBase(targetNodeId));
+                ref VoiceInfo voice = ref _voiceContext.GetState(NodeIdHelper.GetBase(targetNodeId));

                if (voice.Priority == Constants.VoiceHighestPriority)
                {
@@ -646,7 +653,7 @@ namespace Ryujinx.Audio.Renderer.Server

            _voiceContext.UpdateForCommandGeneration();

-            if (_behaviourContext.IsEffectInfoVersion2Supported())
+            if (_behaviourInfo.IsEffectInfoVersion2Supported())
            {
                _effectContext.UpdateResultStateForCommandGeneration();
            }
@@ -661,7 +668,7 @@ namespace Ryujinx.Audio.Renderer.Server

        private int GetMaxAllocatedTimeForDsp()
        {
-            return (int)(Constants.AudioProcessorMaxUpdateTimePerSessions * _behaviourContext.GetAudioRendererProcessingTimeLimit() * (GetRenderingTimeLimit() / 100.0f));
+            return (int)(Constants.AudioProcessorMaxUpdateTimePerSessions * _behaviourInfo.GetAudioRendererProcessingTimeLimit() * (GetRenderingTimeLimit() / 100.0f));
        }

        public void SendCommands()
@@ -736,7 +743,7 @@ namespace Ryujinx.Audio.Renderer.Server
            return new RendererSystemContext
            {
                ChannelCount = _manager.Processor.OutputDevices[_sessionId].GetChannelCount(),
-                BehaviourContext = _behaviourContext,
+                BehaviourInfo = _behaviourInfo,
                DepopBuffer = _depopBuffer,
                MixBufferCount = GetMixBufferCount(),
                SessionId = _sessionId,
@@ -751,9 +758,9 @@ namespace Ryujinx.Audio.Renderer.Server

        public static ulong GetWorkBufferSize(ref AudioRendererConfiguration parameter)
        {
-            BehaviourContext behaviourContext = new();
+            BehaviourInfo behaviourInfo = new();

-            behaviourContext.SetUserRevision(parameter.Revision);
+            behaviourInfo.SetUserRevision(parameter.Revision);

            uint mixesCount = parameter.SubMixBufferCount + 1;

@@ -771,28 +778,28 @@ namespace Ryujinx.Audio.Renderer.Server
            size = WorkBufferAllocator.GetTargetSize<float>(size, BitUtils.AlignUp<ulong>(parameter.MixBufferCount, Constants.BufferAlignment), Constants.BufferAlignment);

            // Voice
-            size = WorkBufferAllocator.GetTargetSize<VoiceState>(size, parameter.VoiceCount, VoiceState.Alignment);
+            size = WorkBufferAllocator.GetTargetSize<VoiceInfo>(size, parameter.VoiceCount, VoiceInfo.Alignment);
            size = WorkBufferAllocator.GetTargetSize<int>(size, parameter.VoiceCount, 0x10);
            size = WorkBufferAllocator.GetTargetSize<VoiceChannelResource>(size, parameter.VoiceCount, VoiceChannelResource.Alignment);
-            size = WorkBufferAllocator.GetTargetSize<VoiceUpdateState>(size, parameter.VoiceCount, VoiceUpdateState.Align);
+            size = WorkBufferAllocator.GetTargetSize<VoiceState>(size, parameter.VoiceCount, VoiceState.Align);

            // Mix
-            size = WorkBufferAllocator.GetTargetSize<MixState>(size, mixesCount, MixState.Alignment);
+            size = WorkBufferAllocator.GetTargetSize<MixInfo>(size, mixesCount, MixInfo.Alignment);
            size = WorkBufferAllocator.GetTargetSize<int>(size, parameter.EffectCount * mixesCount, 0x10);
            size = WorkBufferAllocator.GetTargetSize<int>(size, mixesCount, 0x10);

-            if (behaviourContext.IsSplitterSupported())
+            if (behaviourInfo.IsSplitterSupported())
            {
                size += (ulong)BitUtils.AlignUp(NodeStates.GetWorkBufferSize((int)mixesCount) + EdgeMatrix.GetWorkBufferSize((int)mixesCount), 0x10);
            }

            // Memory Pool
-            size = WorkBufferAllocator.GetTargetSize<MemoryPoolState>(size, memoryPoolCount, MemoryPoolState.Alignment);
+            size = WorkBufferAllocator.GetTargetSize<MemoryPoolInfo>(size, memoryPoolCount, MemoryPoolInfo.Alignment);

            // Splitter
-            size = SplitterContext.GetWorkBufferSize(size, ref behaviourContext, ref parameter);
+            size = SplitterContext.GetWorkBufferSize(size, ref behaviourInfo, ref parameter);

-            if (behaviourContext.IsBiquadFilterParameterForSplitterEnabled() &&
+            if (behaviourInfo.IsBiquadFilterParameterForSplitterEnabled() &&
                parameter.SplitterCount > 0 &&
                parameter.SplitterDestinationCount > 0)
            {
@@ -800,12 +807,12 @@ namespace Ryujinx.Audio.Renderer.Server
            }

            // DSP Voice
-            size = WorkBufferAllocator.GetTargetSize<VoiceUpdateState>(size, parameter.VoiceCount, VoiceUpdateState.Align);
+            size = WorkBufferAllocator.GetTargetSize<VoiceState>(size, parameter.VoiceCount, VoiceState.Align);

            // Performance
            if (parameter.PerformanceMetricFramesCount > 0)
            {
-                ulong performanceMetricsPerFramesSize = PerformanceManager.GetRequiredBufferSizeForPerformanceMetricsPerFrame(ref parameter, ref behaviourContext) * (parameter.PerformanceMetricFramesCount + 1) + 0xC;
+                ulong performanceMetricsPerFramesSize = PerformanceManager.GetRequiredBufferSizeForPerformanceMetricsPerFrame(ref parameter, ref behaviourInfo) * (parameter.PerformanceMetricFramesCount + 1) + 0xC;

                size += BitUtils.AlignUp<ulong>(performanceMetricsPerFramesSize, Constants.PerformanceMetricsPerFramesSizeAlignment);
            }
@@ -847,13 +854,13 @@ namespace Ryujinx.Audio.Renderer.Server
                }

                PoolMapper mapper = new(_processHandle, false);
-                mapper.Unmap(ref _dspMemoryPoolState);
+                mapper.Unmap(ref _dspMemoryPoolInfo);

                PoolMapper.ClearUsageState(_memoryPools);

                for (int i = 0; i < _memoryPoolCount; i++)
                {
-                    ref MemoryPoolState memoryPool = ref _memoryPools.Span[i];
+                    ref MemoryPoolInfo memoryPool = ref _memoryPools.Span[i];

                    if (memoryPool.IsMapped())
                    {
@@ -875,7 +882,7 @@ namespace Ryujinx.Audio.Renderer.Server

        public void SetVoiceDropParameter(float voiceDropParameter)
        {
-            _voiceDropParameter = Math.Clamp(voiceDropParameter, 0.0f, 2.0f);
+            _voiceDropParameter = Math.Clamp(voiceDropParameter, 0.0f, 4.0f);
        }

        public float GetVoiceDropParameter()
--- a/src/Ryujinx.Audio/Renderer/Server/BehaviourContext.cs
+++ b/src/Ryujinx.Audio/Renderer/Server/BehaviourContext.cs
@@ -1,3 +1,5 @@
+using Ryujinx.Audio.Renderer.Parameter;
+using Ryujinx.Common.Memory;
 using System;
 using System.Buffers;
 using System.Diagnostics;
@@ -9,7 +11,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 BehaviourContext
+    public class BehaviourInfo
    {
        /// <summary>
        /// The base magic of the Audio Renderer revision.
@@ -40,7 +42,7 @@ namespace Ryujinx.Audio.Renderer.Server
        public const int Revision4 = 4 << 24;

        /// <summary>
-        /// REV5: <see cref="Parameter.VoiceInParameter.DecodingBehaviour"/>, <see cref="Parameter.VoiceInParameter.FlushWaveBufferCount"/> were added to voice.
+        /// REV5: <see cref="VoiceInParameter1.DecodingBehaviour"/>, <see cref="VoiceInParameter1.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.
@@ -64,7 +66,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="Parameter.VoiceInParameter.SrcQuality"/> was added (see <see cref="Parameter.VoiceInParameter.SampleRateConversionQuality"/> for more info).
+        /// <see cref="VoiceInParameter1.SrcQuality"/> was added (see <see cref="VoiceInParameter1.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.
@@ -115,16 +117,27 @@ namespace Ryujinx.Audio.Renderer.Server
        /// </summary>
        /// <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 = Revision13;
-
-        /// <summary>
-        /// Target revision magic supported by the implementation.
-        /// </summary>
-        public const int ProcessRevision = BaseRevisionMagic + LastRevision;
+        public const int LastRevision = Revision15;

        /// <summary>
        /// Get the revision number from the revision magic.
@@ -133,15 +146,25 @@ 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 ErrorInfo[] _errorInfos;
+        private readonly Array10<ErrorInfo> _errorInfos;

        /// <summary>
        /// Current position in the <see cref="_errorInfos"/> array.
@@ -149,17 +172,12 @@ namespace Ryujinx.Audio.Renderer.Server
        private uint _errorIndex;

        /// <summary>
-        /// Current flags of the <see cref="BehaviourContext"/>.
+        /// Create a new instance of <see cref="BehaviourInfo"/>.
        /// </summary>
-        private ulong _flags;
-
-        /// <summary>
-        /// Create a new instance of <see cref="BehaviourContext"/>.
-        /// </summary>
-        public BehaviourContext()
+        public BehaviourInfo()
        {
            UserRevision = 0;
-            _errorInfos = new ErrorInfo[Constants.MaxErrorInfos];
+            _errorInfos = new Array10<ErrorInfo>();
            _errorIndex = 0;
        }

@@ -173,7 +191,7 @@ namespace Ryujinx.Audio.Renderer.Server
        }

        /// <summary>
-        /// Update flags of the <see cref="BehaviourContext"/>.
+        /// Update flags of the <see cref="BehaviourInfo"/>.
        /// </summary>
        /// <param name="flags">The new flags.</param>
        public void UpdateFlags(ulong flags)
@@ -321,9 +339,9 @@ namespace Ryujinx.Audio.Renderer.Server
        }

        /// <summary>
-        /// Check if the audio renderer should support <see cref="Parameter.VoiceInParameter.DecodingBehaviour"/>.
+        /// Check if the audio renderer should support <see cref="VoiceInParameter1.DecodingBehaviour"/>.
        /// </summary>
-        /// <returns>True if the audio renderer should support <see cref="Parameter.VoiceInParameter.DecodingBehaviour"/>.</returns>
+        /// <returns>True if the audio renderer should support <see cref="VoiceInParameter1.DecodingBehaviour"/>.</returns>
        public bool IsDecodingBehaviourFlagSupported()
        {
            return CheckFeatureSupported(UserRevision, BaseRevisionMagic + Revision5);
@@ -400,6 +418,24 @@ 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"/>.
@@ -440,7 +476,7 @@ namespace Ryujinx.Audio.Renderer.Server

            if (_errorIndex <= Constants.MaxErrorInfos - 1)
            {
-                _errorInfos[_errorIndex++] = errorInfo;
+                _errorInfos[(int)_errorIndex++] = errorInfo;
            }
        }

@@ -457,22 +493,8 @@ namespace Ryujinx.Audio.Renderer.Server
            }

            errorCount = Math.Min(_errorIndex, Constants.MaxErrorInfos);
-
-            for (int i = 0; i < Constants.MaxErrorInfos; i++)
-            {
-                if (i < errorCount)
-                {
-                    errorInfos[i] = _errorInfos[i];
-                }
-                else
-                {
-                    errorInfos[i] = new ErrorInfo
-                    {
-                        ErrorCode = 0,
-                        ExtraErrorInfo = 0,
-                    };
-                }
-            }
+            
+            _errorInfos.AsSpan().CopyTo(errorInfos);
        }

        /// <summary>
--- a/src/Ryujinx.Audio/Renderer/Server/CommandBuffer.cs
+++ b/src/Ryujinx.Audio/Renderer/Server/CommandBuffer.cs
@@ -5,8 +5,10 @@ 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 Ryujinx.Common;
 using System;
 using CpuAddress = System.UInt64;

@@ -32,6 +34,162 @@ namespace Ryujinx.Audio.Renderer.Server
        /// </summary>
        public CommandList CommandList { get; }

+        private readonly static ObjectPool<PcmInt16DataSourceCommandVersion1> _pcmInt16DataSourceCommandVersion1Pool = new(() => new PcmInt16DataSourceCommandVersion1());
+        private readonly static ObjectPool<PcmFloatDataSourceCommandVersion1> _pcmFloatDataSourceCommandVersion1Pool = new(() => new PcmFloatDataSourceCommandVersion1());
+        private readonly static ObjectPool<AdpcmDataSourceCommandVersion1> _adpcmDataSourceCommandVersion1Pool = new(() => new AdpcmDataSourceCommandVersion1());
+        private readonly static ObjectPool<DataSourceVersion2Command> _dataSourceVersion2CommandPool = new(() => new DataSourceVersion2Command());
+        private readonly static ObjectPool<VolumeCommand> _volumeCommandPool = new(() => new VolumeCommand());
+        private readonly static ObjectPool<VolumeRampCommand> _volumeRampCommandPool = new(() => new VolumeRampCommand());
+        private readonly static ObjectPool<BiquadFilterCommand> _biquadFilterCommandPool = new(() => new BiquadFilterCommand());
+        private readonly static ObjectPool<MixCommand> _mixCommandPool = new(() => new MixCommand());
+        private readonly static ObjectPool<MixRampCommand> _mixRampCommandPool = new(() => new MixRampCommand());
+        private readonly static ObjectPool<MixRampGroupedCommand> _mixRampGroupedCommandPool = new(() => new MixRampGroupedCommand());
+        private readonly static ObjectPool<DepopPrepareCommand> _depopPrepareCommandPool = new(() => new DepopPrepareCommand());
+        private readonly static ObjectPool<DepopForMixBuffersCommand> _depopForMixBuffersCommandPool = new(() => new DepopForMixBuffersCommand());
+        private readonly static ObjectPool<DelayCommand> _delayCommandPool = new(() => new DelayCommand());
+        private readonly static ObjectPool<UpsampleCommand> _upsampleCommandPool = new(() => new UpsampleCommand());
+        private readonly static ObjectPool<DownMixSurroundToStereoCommand> _downMixSurroundToStereoCommandPool = new(() => new DownMixSurroundToStereoCommand());
+        private readonly static ObjectPool<AuxiliaryBufferCommand> _auxiliaryBufferCommandPool = new(() => new AuxiliaryBufferCommand());
+        private readonly static ObjectPool<DeviceSinkCommand> _deviceSinkCommandPool = new(() => new DeviceSinkCommand());
+        private readonly static ObjectPool<CircularBufferSinkCommand> _circularBufferSinkCommandPool = new(() => new CircularBufferSinkCommand());
+        private readonly static ObjectPool<ReverbCommand> _reverbCommandPool = new(() => new ReverbCommand());
+        private readonly static ObjectPool<Reverb3dCommand> _reverb3dCommandPool = new(() => new Reverb3dCommand());
+        private readonly static ObjectPool<PerformanceCommand> _performanceCommandPool = new(() => new PerformanceCommand());
+        private readonly static ObjectPool<ClearMixBufferCommand> _clearMixBufferCommandPool = new(() => new ClearMixBufferCommand());
+        private readonly static ObjectPool<CopyMixBufferCommand> _copyMixBufferCommandPool = new(() => new CopyMixBufferCommand());
+        private readonly static ObjectPool<LimiterCommandVersion1> _limiterCommandVersion1Pool = new(() => new LimiterCommandVersion1());
+        private readonly static ObjectPool<LimiterCommandVersion2> _limiterCommandVersion2Pool = new(() => new LimiterCommandVersion2());
+        private readonly static ObjectPool<MultiTapBiquadFilterCommand> _multiTapBiquadFilterCommandPool = new(() => new MultiTapBiquadFilterCommand());
+        private readonly static ObjectPool<CaptureBufferCommand> _captureBufferCommandPool = new(() => new CaptureBufferCommand());
+        private readonly static ObjectPool<CompressorCommand> _compressorCommandPool = new(() => new CompressorCommand());
+        private readonly static ObjectPool<BiquadFilterAndMixCommand> _biquadFilterAndMixCommandPool = new(() => new BiquadFilterAndMixCommand());
+        private readonly static ObjectPool<MultiTapBiquadFilterAndMixCommand> _multiTapBiquadFilterAndMixCommandPool = new(() => new MultiTapBiquadFilterAndMixCommand());
+        private readonly static ObjectPool<FillBufferCommand> _fillBufferCommandPool = new(() => new FillBufferCommand());
+
+        public static void ReleaseCommand(ICommand command)
+        {
+            switch (command.CommandType)
+            {
+                case CommandType.PcmInt16DataSourceVersion1:
+                    _pcmInt16DataSourceCommandVersion1Pool.Release((PcmInt16DataSourceCommandVersion1)command);
+                    break;
+                case CommandType.PcmInt16DataSourceVersion2:
+                    _dataSourceVersion2CommandPool.Release((DataSourceVersion2Command)command);
+                    break;
+                case CommandType.PcmFloatDataSourceVersion1:
+                    _pcmFloatDataSourceCommandVersion1Pool.Release((PcmFloatDataSourceCommandVersion1)command);
+                    break;
+                case CommandType.PcmFloatDataSourceVersion2:
+                    _dataSourceVersion2CommandPool.Release((DataSourceVersion2Command)command);
+                    break;
+                case CommandType.AdpcmDataSourceVersion1:
+                    _adpcmDataSourceCommandVersion1Pool.Release((AdpcmDataSourceCommandVersion1)command);
+                    break;
+                case CommandType.AdpcmDataSourceVersion2:
+                    _dataSourceVersion2CommandPool.Release((DataSourceVersion2Command)command);
+                    break;
+                case CommandType.Volume:
+                    _volumeCommandPool.Release((VolumeCommand)command);
+                    break;
+                case CommandType.VolumeRamp:
+                    _volumeRampCommandPool.Release((VolumeRampCommand)command);
+                    break;
+                case CommandType.BiquadFilter:
+                    _biquadFilterCommandPool.Release((BiquadFilterCommand)command);
+                    break;
+                case CommandType.BiquadFilterFloatCoeff:
+                    throw new NotImplementedException();
+                case CommandType.Mix:
+                    _mixCommandPool.Release((MixCommand)command);
+                    break;
+                case CommandType.MixRamp:
+                    _mixRampCommandPool.Release((MixRampCommand)command);
+                    break;
+                case CommandType.MixRampGrouped:
+                    _mixRampGroupedCommandPool.Release((MixRampGroupedCommand)command);
+                    break;
+                case CommandType.DepopPrepare:
+                    _depopPrepareCommandPool.Release((DepopPrepareCommand)command);
+                    break;
+                case CommandType.DepopForMixBuffers:
+                    _depopForMixBuffersCommandPool.Release((DepopForMixBuffersCommand)command);
+                    break;
+                case CommandType.Delay:
+                    _delayCommandPool.Release((DelayCommand)command);
+                    break;
+                case CommandType.Upsample:
+                    _upsampleCommandPool.Release((UpsampleCommand)command);
+                    break;
+                case CommandType.DownMixSurroundToStereo:
+                    _downMixSurroundToStereoCommandPool.Release((DownMixSurroundToStereoCommand)command);
+                    break;
+                case CommandType.AuxiliaryBuffer:
+                    _auxiliaryBufferCommandPool.Release((AuxiliaryBufferCommand)command);
+                    break;
+                case CommandType.DeviceSink:
+                    _deviceSinkCommandPool.Release((DeviceSinkCommand)command);
+                    break;
+                case CommandType.CircularBufferSink:
+                    _circularBufferSinkCommandPool.Release((CircularBufferSinkCommand)command);
+                    break;
+                case CommandType.Reverb:
+                    _reverbCommandPool.Release((ReverbCommand)command);
+                    break;
+                case CommandType.Reverb3d:
+                    _reverb3dCommandPool.Release((Reverb3dCommand)command);
+                    break;
+                case CommandType.Performance:
+                    _performanceCommandPool.Release((PerformanceCommand)command);
+                    break;
+                case CommandType.ClearMixBuffer:
+                    _clearMixBufferCommandPool.Release((ClearMixBufferCommand)command);
+                    break;
+                case CommandType.CopyMixBuffer:
+                    _copyMixBufferCommandPool.Release((CopyMixBufferCommand)command);
+                    break;
+                case CommandType.LimiterVersion1:
+                    _limiterCommandVersion1Pool.Release((LimiterCommandVersion1)command);
+                    break;
+                case CommandType.LimiterVersion2:
+                    _limiterCommandVersion2Pool.Release((LimiterCommandVersion2)command);
+                    break;
+                case CommandType.MultiTapBiquadFilter:
+                    _multiTapBiquadFilterCommandPool.Release((MultiTapBiquadFilterCommand)command);
+                    break;
+                case CommandType.MultiTapBiquadFilterFloatCoeff:
+                    throw new NotImplementedException();
+                case CommandType.CaptureBuffer:
+                    _captureBufferCommandPool.Release((CaptureBufferCommand)command);
+                    break;
+                case CommandType.Compressor:
+                    _compressorCommandPool.Release((CompressorCommand)command);
+                    break;
+                case CommandType.BiquadFilterAndMix:
+                    _biquadFilterAndMixCommandPool.Release((BiquadFilterAndMixCommand)command);
+                    break;
+                case CommandType.BiquadFilterAndMixFloatCoeff:
+                    throw new NotImplementedException();
+                case CommandType.MultiTapBiquadFilterAndMix:
+                    _multiTapBiquadFilterAndMixCommandPool.Release((MultiTapBiquadFilterAndMixCommand)command);
+                    break;
+                case CommandType.MultiTapBiquadFilterAndMixFloatCoef:
+                    throw new NotImplementedException();
+                case CommandType.AuxiliaryBufferGrouped:
+                    throw new NotImplementedException();
+                case CommandType.FillMixBuffer:
+                    throw new NotImplementedException();
+                case CommandType.BiquadFilterCrossFade:
+                    throw new NotImplementedException();
+                case CommandType.MultiTapBiquadFilterCrossFade:
+                    throw new NotImplementedException();
+                case CommandType.FillBuffer:
+                    _fillBufferCommandPool.Release((FillBufferCommand)command);
+                    break;
+                default:
+                    throw new NotImplementedException();
+            }
+        }
+        
        /// <summary>
        /// Create a new <see cref="CommandBuffer"/>.
        /// </summary>
@@ -61,7 +219,7 @@ namespace Ryujinx.Audio.Renderer.Server
        /// <param name="nodeId">The node id associated to this command.</param>
        public void GenerateClearMixBuffer(int nodeId)
        {
-            ClearMixBufferCommand command = new(nodeId);
+            ClearMixBufferCommand command = _clearMixBufferCommandPool.Allocate().Initialize(nodeId);

            command.EstimatedProcessingTime = _commandProcessingTimeEstimator.Estimate(command);

@@ -77,9 +235,9 @@ 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<VoiceUpdateState> state, Memory<float> depopBuffer, uint bufferCount, uint bufferOffset, int nodeId, bool wasPlaying)
+        public void GenerateDepopPrepare(Memory<VoiceState> state, Memory<float> depopBuffer, uint bufferCount, uint bufferOffset, int nodeId, bool wasPlaying)
        {
-            DepopPrepareCommand command = new(state, depopBuffer, bufferCount, bufferOffset, nodeId, wasPlaying);
+            DepopPrepareCommand command = _depopPrepareCommandPool.Allocate().Initialize(state, depopBuffer, bufferCount, bufferOffset, nodeId, wasPlaying);

            command.EstimatedProcessingTime = _commandProcessingTimeEstimator.Estimate(command);

@@ -94,7 +252,7 @@ namespace Ryujinx.Audio.Renderer.Server
        /// <param name="nodeId">The node id associated to this command.</param>
        public void GeneratePerformance(ref PerformanceEntryAddresses performanceEntryAddresses, PerformanceCommand.Type type, int nodeId)
        {
-            PerformanceCommand command = new(ref performanceEntryAddresses, type, nodeId);
+            PerformanceCommand command = _performanceCommandPool.Allocate().Initialize(ref performanceEntryAddresses, type, nodeId);

            command.EstimatedProcessingTime = _commandProcessingTimeEstimator.Estimate(command);

@@ -110,7 +268,7 @@ namespace Ryujinx.Audio.Renderer.Server
        /// <param name="nodeId">The node id associated to this command.</param>
        public void GenerateVolumeRamp(float previousVolume, float volume, uint bufferIndex, int nodeId)
        {
-            VolumeRampCommand command = new(previousVolume, volume, bufferIndex, nodeId);
+            VolumeRampCommand command = _volumeRampCommandPool.Allocate().Initialize(previousVolume, volume, bufferIndex, nodeId);

            command.EstimatedProcessingTime = _commandProcessingTimeEstimator.Estimate(command);

@@ -120,14 +278,14 @@ namespace Ryujinx.Audio.Renderer.Server
        /// <summary>
        /// Create a new <see cref="DataSourceVersion2Command"/>.
        /// </summary>
-        /// <param name="voiceState">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="voiceInfo">The <see cref="VoiceInfo"/> to generate the command from.</param>
+        /// <param name="state">The <see cref="VoiceState"/> 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 VoiceState voiceState, Memory<VoiceUpdateState> state, ushort outputBufferIndex, ushort channelIndex, int nodeId)
+        public void GenerateDataSourceVersion2(ref VoiceInfo voiceInfo, Memory<VoiceState> state, ushort outputBufferIndex, ushort channelIndex, int nodeId)
        {
-            DataSourceVersion2Command command = new(ref voiceState, state, outputBufferIndex, channelIndex, nodeId);
+            DataSourceVersion2Command command = _dataSourceVersion2CommandPool.Allocate().Initialize(ref voiceInfo, state, outputBufferIndex, channelIndex, nodeId);

            command.EstimatedProcessingTime = _commandProcessingTimeEstimator.Estimate(command);

@@ -137,14 +295,14 @@ namespace Ryujinx.Audio.Renderer.Server
        /// <summary>
        /// Create a new <see cref="PcmInt16DataSourceCommandVersion1"/>.
        /// </summary>
-        /// <param name="voiceState">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="voiceInfo">The <see cref="VoiceInfo"/> to generate the command from.</param>
+        /// <param name="state">The <see cref="VoiceState"/> 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 VoiceState voiceState, Memory<VoiceUpdateState> state, ushort outputBufferIndex, ushort channelIndex, int nodeId)
+        public void GeneratePcmInt16DataSourceVersion1(ref VoiceInfo voiceInfo, Memory<VoiceState> state, ushort outputBufferIndex, ushort channelIndex, int nodeId)
        {
-            PcmInt16DataSourceCommandVersion1 command = new(ref voiceState, state, outputBufferIndex, channelIndex, nodeId);
+            PcmInt16DataSourceCommandVersion1 command = _pcmInt16DataSourceCommandVersion1Pool.Allocate().Initialize(ref voiceInfo, state, outputBufferIndex, channelIndex, nodeId);

            command.EstimatedProcessingTime = _commandProcessingTimeEstimator.Estimate(command);

@@ -154,14 +312,14 @@ namespace Ryujinx.Audio.Renderer.Server
        /// <summary>
        /// Create a new <see cref="PcmFloatDataSourceCommandVersion1"/>.
        /// </summary>
-        /// <param name="voiceState">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="voiceInfo">The <see cref="VoiceInfo"/> to generate the command from.</param>
+        /// <param name="state">The <see cref="VoiceState"/> 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 VoiceState voiceState, Memory<VoiceUpdateState> state, ushort outputBufferIndex, ushort channelIndex, int nodeId)
+        public void GeneratePcmFloatDataSourceVersion1(ref VoiceInfo voiceInfo, Memory<VoiceState> state, ushort outputBufferIndex, ushort channelIndex, int nodeId)
        {
-            PcmFloatDataSourceCommandVersion1 command = new(ref voiceState, state, outputBufferIndex, channelIndex, nodeId);
+            PcmFloatDataSourceCommandVersion1 command = _pcmFloatDataSourceCommandVersion1Pool.Allocate().Initialize(ref voiceInfo, state, outputBufferIndex, channelIndex, nodeId);

            command.EstimatedProcessingTime = _commandProcessingTimeEstimator.Estimate(command);

@@ -171,13 +329,13 @@ namespace Ryujinx.Audio.Renderer.Server
        /// <summary>
        /// Create a new <see cref="AdpcmDataSourceCommandVersion1"/>.
        /// </summary>
-        /// <param name="voiceState">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="voiceInfo">The <see cref="VoiceInfo"/> to generate the command from.</param>
+        /// <param name="state">The <see cref="VoiceState"/> 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 VoiceState voiceState, Memory<VoiceUpdateState> state, ushort outputBufferIndex, int nodeId)
+        public void GenerateAdpcmDataSourceVersion1(ref VoiceInfo voiceInfo, Memory<VoiceState> state, ushort outputBufferIndex, int nodeId)
        {
-            AdpcmDataSourceCommandVersion1 command = new(ref voiceState, state, outputBufferIndex, nodeId);
+            AdpcmDataSourceCommandVersion1 command = _adpcmDataSourceCommandVersion1Pool.Allocate().Initialize(ref voiceInfo, state, outputBufferIndex, nodeId);

            command.EstimatedProcessingTime = _commandProcessingTimeEstimator.Estimate(command);

@@ -194,9 +352,9 @@ 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 BiquadFilterParameter filter, Memory<BiquadFilterState> biquadFilterStateMemory, int inputBufferOffset, int outputBufferOffset, bool needInitialization, int nodeId)
+        public void GenerateBiquadFilter(int baseIndex, ref BiquadFilterParameter2 filter, Memory<BiquadFilterState> biquadFilterStateMemory, int inputBufferOffset, int outputBufferOffset, bool needInitialization, int nodeId)
        {
-            BiquadFilterCommand command = new(baseIndex, ref filter, biquadFilterStateMemory, inputBufferOffset, outputBufferOffset, needInitialization, nodeId);
+            BiquadFilterCommand command = _biquadFilterCommandPool.Allocate().Initialize(baseIndex, ref filter, biquadFilterStateMemory, inputBufferOffset, outputBufferOffset, needInitialization, nodeId);

            command.EstimatedProcessingTime = _commandProcessingTimeEstimator.Estimate(command);

@@ -213,9 +371,9 @@ 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<BiquadFilterParameter> filters, Memory<BiquadFilterState> biquadFilterStatesMemory, int inputBufferOffset, int outputBufferOffset, ReadOnlySpan<bool> isInitialized, int nodeId)
+        public void GenerateMultiTapBiquadFilter(int baseIndex, ReadOnlySpan<BiquadFilterParameter2> filters, Memory<BiquadFilterState> biquadFilterStatesMemory, int inputBufferOffset, int outputBufferOffset, ReadOnlySpan<bool> isInitialized, int nodeId)
        {
-            MultiTapBiquadFilterCommand command = new(baseIndex, filters, biquadFilterStatesMemory, inputBufferOffset, outputBufferOffset, isInitialized, nodeId);
+            MultiTapBiquadFilterCommand command = _multiTapBiquadFilterCommandPool.Allocate().Initialize(baseIndex, filters, biquadFilterStatesMemory, inputBufferOffset, outputBufferOffset, isInitialized, nodeId);

            command.EstimatedProcessingTime = _commandProcessingTimeEstimator.Estimate(command);

@@ -230,11 +388,11 @@ 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="VoiceUpdateState"/> to generate the command from.</param>
+        /// <param name="state">The <see cref="VoiceState"/> 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<VoiceUpdateState> state, int nodeId)
+        public void GenerateMixRampGrouped(uint mixBufferCount, uint inputBufferIndex, uint outputBufferIndex, ReadOnlySpan<float> previousVolume, ReadOnlySpan<float> volume, Memory<VoiceState> state, int nodeId)
        {
-            MixRampGroupedCommand command = new(mixBufferCount, inputBufferIndex, outputBufferIndex, previousVolume, volume, state, nodeId);
+            MixRampGroupedCommand command = _mixRampGroupedCommandPool.Allocate().Initialize(mixBufferCount, inputBufferIndex, outputBufferIndex, previousVolume, volume, state, nodeId);

            command.EstimatedProcessingTime = _commandProcessingTimeEstimator.Estimate(command);

@@ -248,12 +406,12 @@ 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="VoiceUpdateState.LastSamples"/> array to store the ramped sample.</param>
-        /// <param name="state">The <see cref="VoiceUpdateState"/> to generate the command from.</param>
+        /// <param name="lastSampleIndex">The index in the <see cref="VoiceState.LastSamples"/> array to store the ramped sample.</param>
+        /// <param name="state">The <see cref="VoiceState"/> 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<VoiceUpdateState> state, int nodeId)
+        public void GenerateMixRamp(float previousVolume, float volume, uint inputBufferIndex, uint outputBufferIndex, int lastSampleIndex, Memory<VoiceState> state, int nodeId)
        {
-            MixRampCommand command = new(previousVolume, volume, inputBufferIndex, outputBufferIndex, lastSampleIndex, state, nodeId);
+            MixRampCommand command = _mixRampCommandPool.Allocate().Initialize(previousVolume, volume, inputBufferIndex, outputBufferIndex, lastSampleIndex, state, nodeId);

            command.EstimatedProcessingTime = _commandProcessingTimeEstimator.Estimate(command);

@@ -267,8 +425,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="VoiceUpdateState.LastSamples"/> array to store the ramped sample.</param>
-        /// <param name="state">The <see cref="VoiceUpdateState"/> to generate the command from.</param>
+        /// <param name="lastSampleIndex">The index in the <see cref="VoiceState.LastSamples"/> array to store the ramped sample.</param>
+        /// <param name="state">The <see cref="VoiceState"/> 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>
@@ -282,8 +440,8 @@ namespace Ryujinx.Audio.Renderer.Server
            uint inputBufferIndex,
            uint outputBufferIndex,
            int lastSampleIndex,
-            Memory<VoiceUpdateState> state,
-            ref BiquadFilterParameter filter,
+            Memory<VoiceState> state,
+            ref BiquadFilterParameter2 filter,
            Memory<BiquadFilterState> biquadFilterState,
            Memory<BiquadFilterState> previousBiquadFilterState,
            bool needInitialization,
@@ -291,7 +449,7 @@ namespace Ryujinx.Audio.Renderer.Server
            bool isFirstMixBuffer,
            int nodeId)
        {
-            BiquadFilterAndMixCommand command = new(
+            BiquadFilterAndMixCommand command = _biquadFilterAndMixCommandPool.Allocate().Initialize(
                previousVolume,
                volume,
                inputBufferIndex,
@@ -318,8 +476,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="VoiceUpdateState.LastSamples"/> array to store the ramped sample.</param>
-        /// <param name="state">The <see cref="VoiceUpdateState"/> to generate the command from.</param>
+        /// <param name="lastSampleIndex">The index in the <see cref="VoiceState.LastSamples"/> array to store the ramped sample.</param>
+        /// <param name="state">The <see cref="VoiceState"/> 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>
@@ -337,9 +495,9 @@ namespace Ryujinx.Audio.Renderer.Server
            uint inputBufferIndex,
            uint outputBufferIndex,
            int lastSampleIndex,
-            Memory<VoiceUpdateState> state,
-            ref BiquadFilterParameter filter0,
-            ref BiquadFilterParameter filter1,
+            Memory<VoiceState> state,
+            ref BiquadFilterParameter2 filter0,
+            ref BiquadFilterParameter2 filter1,
            Memory<BiquadFilterState> biquadFilterState0,
            Memory<BiquadFilterState> biquadFilterState1,
            Memory<BiquadFilterState> previousBiquadFilterState0,
@@ -350,7 +508,7 @@ namespace Ryujinx.Audio.Renderer.Server
            bool isFirstMixBuffer,
            int nodeId)
        {
-            MultiTapBiquadFilterAndMixCommand command = new(
+            MultiTapBiquadFilterAndMixCommand command = _multiTapBiquadFilterAndMixCommandPool.Allocate().Initialize(
                previousVolume,
                volume,
                inputBufferIndex,
@@ -384,7 +542,7 @@ namespace Ryujinx.Audio.Renderer.Server
        /// <param name="sampleRate">The target sample rate in use.</param>
        public void GenerateDepopForMixBuffers(Memory<float> depopBuffer, uint bufferOffset, uint bufferCount, int nodeId, uint sampleRate)
        {
-            DepopForMixBuffersCommand command = new(depopBuffer, bufferOffset, bufferCount, nodeId, sampleRate);
+            DepopForMixBuffersCommand command = _depopForMixBuffersCommandPool.Allocate().Initialize(depopBuffer, bufferOffset, bufferCount, nodeId, sampleRate);

            command.EstimatedProcessingTime = _commandProcessingTimeEstimator.Estimate(command);

@@ -399,7 +557,7 @@ namespace Ryujinx.Audio.Renderer.Server
        /// <param name="nodeId">The node id associated to this command.</param>
        public void GenerateCopyMixBuffer(uint inputBufferIndex, uint outputBufferIndex, int nodeId)
        {
-            CopyMixBufferCommand command = new(inputBufferIndex, outputBufferIndex, nodeId);
+            CopyMixBufferCommand command = _copyMixBufferCommandPool.Allocate().Initialize(inputBufferIndex, outputBufferIndex, nodeId);

            command.EstimatedProcessingTime = _commandProcessingTimeEstimator.Estimate(command);

@@ -415,7 +573,7 @@ namespace Ryujinx.Audio.Renderer.Server
        /// <param name="volume">The mix volume.</param>
        public void GenerateMix(uint inputBufferIndex, uint outputBufferIndex, int nodeId, float volume)
        {
-            MixCommand command = new(inputBufferIndex, outputBufferIndex, nodeId, volume);
+            MixCommand command = _mixCommandPool.Allocate().Initialize(inputBufferIndex, outputBufferIndex, nodeId, volume);

            command.EstimatedProcessingTime = _commandProcessingTimeEstimator.Estimate(command);

@@ -437,7 +595,7 @@ namespace Ryujinx.Audio.Renderer.Server
        {
            if (parameter.IsChannelCountValid())
            {
-                ReverbCommand command = new(bufferOffset, parameter, state, isEnabled, workBuffer, nodeId, isLongSizePreDelaySupported, newEffectChannelMappingSupported);
+                ReverbCommand command = _reverbCommandPool.Allocate().Initialize(bufferOffset, parameter, state, isEnabled, workBuffer, nodeId, isLongSizePreDelaySupported, newEffectChannelMappingSupported);

                command.EstimatedProcessingTime = _commandProcessingTimeEstimator.Estimate(command);

@@ -459,7 +617,7 @@ namespace Ryujinx.Audio.Renderer.Server
        {
            if (parameter.IsChannelCountValid())
            {
-                Reverb3dCommand command = new(bufferOffset, parameter, state, isEnabled, workBuffer, nodeId, newEffectChannelMappingSupported);
+                Reverb3dCommand command = _reverb3dCommandPool.Allocate().Initialize(bufferOffset, parameter, state, isEnabled, workBuffer, nodeId, newEffectChannelMappingSupported);

                command.EstimatedProcessingTime = _commandProcessingTimeEstimator.Estimate(command);

@@ -481,7 +639,7 @@ namespace Ryujinx.Audio.Renderer.Server
        {
            if (parameter.IsChannelCountValid())
            {
-                DelayCommand command = new(bufferOffset, parameter, state, isEnabled, workBuffer, nodeId, newEffectChannelMappingSupported);
+                DelayCommand command = _delayCommandPool.Allocate().Initialize(bufferOffset, parameter, state, isEnabled, workBuffer, nodeId, newEffectChannelMappingSupported);

                command.EstimatedProcessingTime = _commandProcessingTimeEstimator.Estimate(command);

@@ -502,7 +660,7 @@ namespace Ryujinx.Audio.Renderer.Server
        {
            if (parameter.IsChannelCountValid())
            {
-                LimiterCommandVersion1 command = new(bufferOffset, parameter, state, isEnabled, workBuffer, nodeId);
+                LimiterCommandVersion1 command = _limiterCommandVersion1Pool.Allocate().Initialize(bufferOffset, parameter, state, isEnabled, workBuffer, nodeId);

                command.EstimatedProcessingTime = _commandProcessingTimeEstimator.Estimate(command);

@@ -524,7 +682,7 @@ namespace Ryujinx.Audio.Renderer.Server
        {
            if (parameter.IsChannelCountValid())
            {
-                LimiterCommandVersion2 command = new(bufferOffset, parameter, state, effectResultState, isEnabled, workBuffer, nodeId);
+                LimiterCommandVersion2 command = _limiterCommandVersion2Pool.Allocate().Initialize(bufferOffset, parameter, state, effectResultState, isEnabled, workBuffer, nodeId);

                command.EstimatedProcessingTime = _commandProcessingTimeEstimator.Estimate(command);

@@ -550,7 +708,7 @@ namespace Ryujinx.Audio.Renderer.Server
        {
            if (state.SendBufferInfoBase != 0 && state.ReturnBufferInfoBase != 0)
            {
-                AuxiliaryBufferCommand command = new(bufferOffset, inputBufferOffset, outputBufferOffset, ref state, isEnabled, countMax, outputBuffer, inputBuffer, updateCount, writeOffset, nodeId);
+                AuxiliaryBufferCommand command = _auxiliaryBufferCommandPool.Allocate().Initialize(bufferOffset, inputBufferOffset, outputBufferOffset, ref state, isEnabled, countMax, outputBuffer, inputBuffer, updateCount, writeOffset, nodeId);

                command.EstimatedProcessingTime = _commandProcessingTimeEstimator.Estimate(command);

@@ -574,7 +732,7 @@ namespace Ryujinx.Audio.Renderer.Server
        {
            if (sendBufferInfo != 0)
            {
-                CaptureBufferCommand command = new(bufferOffset, inputBufferOffset, sendBufferInfo, isEnabled, countMax, outputBuffer, updateCount, writeOffset, nodeId);
+                CaptureBufferCommand command = _captureBufferCommandPool.Allocate().Initialize(bufferOffset, inputBufferOffset, sendBufferInfo, isEnabled, countMax, outputBuffer, updateCount, writeOffset, nodeId);

                command.EstimatedProcessingTime = _commandProcessingTimeEstimator.Estimate(command);

@@ -595,7 +753,7 @@ namespace Ryujinx.Audio.Renderer.Server
        {
            if (parameter.IsChannelCountValid())
            {
-                CompressorCommand command = new(bufferOffset, parameter, state, effectResultState, isEnabled, nodeId);
+                CompressorCommand command = _compressorCommandPool.Allocate().Initialize(bufferOffset, parameter, state, effectResultState, isEnabled, nodeId);

                command.EstimatedProcessingTime = _commandProcessingTimeEstimator.Estimate(command);

@@ -611,7 +769,7 @@ namespace Ryujinx.Audio.Renderer.Server
        /// <param name="nodeId">The node id associated to this command.</param>
        public void GenerateVolume(float volume, uint bufferOffset, int nodeId)
        {
-            VolumeCommand command = new(volume, bufferOffset, nodeId);
+            VolumeCommand command = _volumeCommandPool.Allocate().Initialize(volume, bufferOffset, nodeId);

            command.EstimatedProcessingTime = _commandProcessingTimeEstimator.Estimate(command);

@@ -626,7 +784,7 @@ namespace Ryujinx.Audio.Renderer.Server
        /// <param name="nodeId">The node id associated to this command.</param>
        public void GenerateCircularBuffer(uint bufferOffset, CircularBufferSink sink, int nodeId)
        {
-            CircularBufferSinkCommand command = new(bufferOffset, ref sink.Parameter, ref sink.CircularBufferAddressInfo, sink.CurrentWriteOffset, nodeId);
+            CircularBufferSinkCommand command = _circularBufferSinkCommandPool.Allocate().Initialize(bufferOffset, ref sink.Parameter, ref sink.CircularBufferAddressInfo, sink.CurrentWriteOffset, nodeId);

            command.EstimatedProcessingTime = _commandProcessingTimeEstimator.Estimate(command);

@@ -643,7 +801,7 @@ namespace Ryujinx.Audio.Renderer.Server
        /// <param name="nodeId">The node id associated to this command.</param>
        public void GenerateDownMixSurroundToStereo(uint bufferOffset, Span<byte> inputBufferOffset, Span<byte> outputBufferOffset, float[] downMixParameter, int nodeId)
        {
-            DownMixSurroundToStereoCommand command = new(bufferOffset, inputBufferOffset, outputBufferOffset, downMixParameter, nodeId);
+            DownMixSurroundToStereoCommand command = _downMixSurroundToStereoCommandPool.Allocate().Initialize(bufferOffset, inputBufferOffset, outputBufferOffset, downMixParameter, nodeId);

            command.EstimatedProcessingTime = _commandProcessingTimeEstimator.Estimate(command);

@@ -654,16 +812,16 @@ 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="UpsamplerState"/> associated.</param>
+        /// <param name="upsampler">The <see cref="UpsamplerInfo"/> 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, UpsamplerState upsampler, uint inputCount, Span<byte> inputBufferOffset, uint bufferCountPerSample, uint sampleCount, uint sampleRate, int nodeId)
+        public void GenerateUpsample(uint bufferOffset, UpsamplerInfo 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);
+            UpsampleCommand command = _upsampleCommandPool.Allocate().Initialize(bufferOffset, upsampler, inputCount, inputBufferOffset, bufferCountPerSample, sampleCount, sampleRate, nodeId);

            command.EstimatedProcessingTime = _commandProcessingTimeEstimator.Estimate(command);

@@ -680,11 +838,20 @@ namespace Ryujinx.Audio.Renderer.Server
        /// <param name="nodeId">The node id associated to this command.</param>
        public void GenerateDeviceSink(uint bufferOffset, DeviceSink sink, int sessionId, Memory<float> buffer, int nodeId)
        {
-            DeviceSinkCommand command = new(bufferOffset, sink, sessionId, buffer, nodeId);
+            DeviceSinkCommand command = _deviceSinkCommandPool.Allocate().Initialize(bufferOffset, sink, sessionId, buffer, nodeId);

            command.EstimatedProcessingTime = _commandProcessingTimeEstimator.Estimate(command);

            AddCommand(command);
        }
+
+        public void GenerateFillBuffer(SplitterDestination destination, float value, int length, int nodeId)
+        {
+            FillBufferCommand command = _fillBufferCommandPool.Allocate().Initialize(destination, length, value, nodeId);
+            
+            command.EstimatedProcessingTime = _commandProcessingTimeEstimator.Estimate(command);
+            
+            AddCommand(command);
+        }
    }
 }
--- a/src/Ryujinx.Audio/Renderer/Server/CommandGenerator.cs
+++ b/src/Ryujinx.Audio/Renderer/Server/CommandGenerator.cs
@@ -41,27 +41,27 @@ namespace Ryujinx.Audio.Renderer.Server
            _commandBuffer.GenerateClearMixBuffer(Constants.InvalidNodeId);
        }

-        private void GenerateDataSource(ref VoiceState voiceState, Memory<VoiceUpdateState> dspState, int channelIndex)
+        private void GenerateDataSource(ref VoiceInfo voiceInfo, Memory<VoiceState> dspState, int channelIndex)
        {
-            if (voiceState.MixId != Constants.UnusedMixId)
+            if (voiceInfo.MixId != Constants.UnusedMixId)
            {
-                ref MixState mix = ref _mixContext.GetState(voiceState.MixId);
+                ref MixInfo mix = ref _mixContext.GetState(voiceInfo.MixId);

                _commandBuffer.GenerateDepopPrepare(
                    dspState,
                    _rendererContext.DepopBuffer,
                    mix.BufferCount,
                    mix.BufferOffset,
-                    voiceState.NodeId,
-                    voiceState.WasPlaying);
+                    voiceInfo.NodeId,
+                    voiceInfo.WasPlaying);
            }
-            else if (voiceState.SplitterId != Constants.UnusedSplitterId)
+            else if (voiceInfo.SplitterId != Constants.UnusedSplitterId)
            {
                int destinationId = 0;

                while (true)
                {
-                    SplitterDestination destination = _splitterContext.GetDestination((int)voiceState.SplitterId, destinationId++);
+                    SplitterDestination destination = _splitterContext.GetDestination((int)voiceInfo.SplitterId, destinationId++);

                    if (destination.IsNull)
                    {
@@ -74,15 +74,17 @@ namespace Ryujinx.Audio.Renderer.Server

                        if (mixId < _mixContext.GetCount() && mixId != Constants.UnusedSplitterIdInt)
                        {
-                            ref MixState mix = ref _mixContext.GetState(mixId);
+                            ref MixInfo mix = ref _mixContext.GetState(mixId);
+                            
+                            // _commandBuffer.GenerateFillBuffer();

                            _commandBuffer.GenerateDepopPrepare(
                                dspState,
                                _rendererContext.DepopBuffer,
                                mix.BufferCount,
                                mix.BufferOffset,
-                                voiceState.NodeId,
-                                voiceState.WasPlaying);
+                                voiceInfo.NodeId,
+                                voiceInfo.WasPlaying);

                            destination.MarkAsNeedToUpdateInternalState();
                        }
@@ -90,71 +92,71 @@ namespace Ryujinx.Audio.Renderer.Server
                }
            }

-            if (!voiceState.WasPlaying)
+            if (!voiceInfo.WasPlaying)
            {
-                Debug.Assert(voiceState.SampleFormat != SampleFormat.Adpcm || channelIndex == 0);
+                Debug.Assert(voiceInfo.SampleFormat != SampleFormat.Adpcm || channelIndex == 0);

-                if (_rendererContext.BehaviourContext.IsWaveBufferVersion2Supported())
+                if (_rendererContext.BehaviourInfo.IsWaveBufferVersion2Supported())
                {
                    _commandBuffer.GenerateDataSourceVersion2(
-                        ref voiceState,
+                        ref voiceInfo,
                        dspState,
                        (ushort)_rendererContext.MixBufferCount,
                        (ushort)channelIndex,
-                        voiceState.NodeId);
+                        voiceInfo.NodeId);
                }
                else
                {
-                    switch (voiceState.SampleFormat)
+                    switch (voiceInfo.SampleFormat)
                    {
                        case SampleFormat.PcmInt16:
                            _commandBuffer.GeneratePcmInt16DataSourceVersion1(
-                                ref voiceState,
+                                ref voiceInfo,
                                dspState,
                                (ushort)_rendererContext.MixBufferCount,
                                (ushort)channelIndex,
-                                voiceState.NodeId);
+                                voiceInfo.NodeId);
                            break;
                        case SampleFormat.PcmFloat:
                            _commandBuffer.GeneratePcmFloatDataSourceVersion1(
-                                ref voiceState,
+                                ref voiceInfo,
                                dspState,
                                (ushort)_rendererContext.MixBufferCount,
                                (ushort)channelIndex,
-                                voiceState.NodeId);
+                                voiceInfo.NodeId);
                            break;
                        case SampleFormat.Adpcm:
                            _commandBuffer.GenerateAdpcmDataSourceVersion1(
-                                ref voiceState,
+                                ref voiceInfo,
                                dspState,
                                (ushort)_rendererContext.MixBufferCount,
-                                voiceState.NodeId);
+                                voiceInfo.NodeId);
                            break;
                        default:
-                            throw new NotImplementedException($"Unsupported data source {voiceState.SampleFormat}");
+                            throw new NotImplementedException($"Unsupported data source {voiceInfo.SampleFormat}");
                    }
                }
            }
        }

-        private void GenerateBiquadFilterForVoice(ref VoiceState voiceState, Memory<VoiceUpdateState> state, int baseIndex, int bufferOffset, int nodeId)
+        private void GenerateBiquadFilterForVoice(ref VoiceInfo voiceInfo, Memory<VoiceState> state, int baseIndex, int bufferOffset, int nodeId)
        {
-            bool supportsOptimizedPath = _rendererContext.BehaviourContext.UseMultiTapBiquadFilterProcessing();
+            bool supportsOptimizedPath = _rendererContext.BehaviourInfo.UseMultiTapBiquadFilterProcessing();

-            Span<BiquadFilterParameter> biquadFiltersSpan = voiceState.BiquadFilters.AsSpan();
+            Span<BiquadFilterParameter2> biquadFiltersSpan = voiceInfo.BiquadFilters.AsSpan();

            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, voiceState.BiquadFilterNeedInitialization, nodeId);
+                _commandBuffer.GenerateMultiTapBiquadFilter(baseIndex, biquadFiltersSpan, stateMemory, bufferOffset, bufferOffset, voiceInfo.BiquadFilterNeedInitialization, nodeId);
            }
            else
            {
                for (int i = 0; i < biquadFiltersSpan.Length; i++)
                {
-                    ref BiquadFilterParameter filter = ref biquadFiltersSpan[i];
+                    ref BiquadFilterParameter2 filter = ref biquadFiltersSpan[i];

                    if (filter.Enable)
                    {
@@ -167,7 +169,7 @@ namespace Ryujinx.Audio.Renderer.Server
                            stateMemory.Slice(i, 1),
                            bufferOffset,
                            bufferOffset,
-                            !voiceState.BiquadFilterNeedInitialization[i],
+                            !voiceInfo.BiquadFilterNeedInitialization[i],
                            nodeId);
                    }
                }
@@ -176,7 +178,7 @@ namespace Ryujinx.Audio.Renderer.Server

        private void GenerateVoiceMixWithSplitter(
            SplitterDestination destination,
-            Memory<VoiceUpdateState> state,
+            Memory<VoiceState> state,
            uint bufferOffset,
            uint bufferCount,
            uint bufferIndex,
@@ -185,8 +187,8 @@ namespace Ryujinx.Audio.Renderer.Server
            ReadOnlySpan<float> mixVolumes = destination.MixBufferVolume;
            ReadOnlySpan<float> previousMixVolumes = destination.PreviousMixBufferVolume;

-            ref BiquadFilterParameter bqf0 = ref destination.GetBiquadFilterParameter(0);
-            ref BiquadFilterParameter bqf1 = ref destination.GetBiquadFilterParameter(1);
+            ref BiquadFilterParameter2 bqf0 = ref destination.GetBiquadFilterParameter(0);
+            ref BiquadFilterParameter2 bqf1 = ref destination.GetBiquadFilterParameter(1);

            Memory<BiquadFilterState> bqfState = _splitterContext.GetBiquadFilterState(destination);

@@ -270,7 +272,7 @@ namespace Ryujinx.Audio.Renderer.Server
        private void GenerateVoiceMix(
            ReadOnlySpan<float> mixVolumes,
            ReadOnlySpan<float> previousMixVolumes,
-            Memory<VoiceUpdateState> state,
+            Memory<VoiceState> state,
            uint bufferOffset,
            uint bufferCount,
            uint bufferIndex,
@@ -309,34 +311,34 @@ namespace Ryujinx.Audio.Renderer.Server
            }
        }

-        private void GenerateVoice(ref VoiceState voiceState)
+        private void GenerateVoice(ref VoiceInfo voiceInfo)
        {
-            int nodeId = voiceState.NodeId;
-            uint channelsCount = voiceState.ChannelsCount;
+            int nodeId = voiceInfo.NodeId;
+            uint channelsCount = voiceInfo.ChannelsCount;
            
-            Span<int> channelResourceIdsSpan = voiceState.ChannelResourceIds.AsSpan();
-            Span<BiquadFilterParameter> biquadFiltersSpan = voiceState.BiquadFilters.AsSpan();
+            Span<int> channelResourceIdsSpan = voiceInfo.ChannelResourceIds.AsSpan();
+            Span<BiquadFilterParameter2> biquadFiltersSpan = voiceInfo.BiquadFilters.AsSpan();

            for (int channelIndex = 0; channelIndex < channelsCount; channelIndex++)
            {
-                Memory<VoiceUpdateState> dspStateMemory = _voiceContext.GetUpdateStateForDsp(channelResourceIdsSpan[channelIndex]);
+                Memory<VoiceState> dspStateMemory = _voiceContext.GetUpdateStateForDsp(channelResourceIdsSpan[channelIndex]);

                ref VoiceChannelResource channelResource = ref _voiceContext.GetChannelResource(channelResourceIdsSpan[channelIndex]);

                PerformanceDetailType dataSourceDetailType = PerformanceDetailType.Adpcm;

-                if (voiceState.SampleFormat == SampleFormat.PcmInt16)
+                if (voiceInfo.SampleFormat == SampleFormat.PcmInt16)
                {
                    dataSourceDetailType = PerformanceDetailType.PcmInt16;
                }
-                else if (voiceState.SampleFormat == SampleFormat.PcmFloat)
+                else if (voiceInfo.SampleFormat == SampleFormat.PcmFloat)
                {
                    dataSourceDetailType = PerformanceDetailType.PcmFloat;
                }

                bool performanceInitialized = false;

-                PerformanceEntryAddresses performanceEntry = new();
+                PerformanceEntryAddresses performanceEntry = null;

                if (_performanceManager != null && _performanceManager.IsTargetNodeId(nodeId) && _performanceManager.GetNextEntry(out performanceEntry, dataSourceDetailType, PerformanceEntryType.Voice, nodeId))
                {
@@ -345,18 +347,18 @@ namespace Ryujinx.Audio.Renderer.Server
                    GeneratePerformance(ref performanceEntry, PerformanceCommand.Type.Start, nodeId);
                }

-                GenerateDataSource(ref voiceState, dspStateMemory, channelIndex);
+                GenerateDataSource(ref voiceInfo, dspStateMemory, channelIndex);

                if (performanceInitialized)
                {
                    GeneratePerformance(ref performanceEntry, PerformanceCommand.Type.End, nodeId);
                }

-                if (voiceState.WasPlaying)
+                if (voiceInfo.WasPlaying)
                {
-                    voiceState.PreviousVolume = 0.0f;
+                    voiceInfo.PreviousVolume = 0.0f;
                }
-                else if (voiceState.HasAnyDestination())
+                else if (voiceInfo.HasAnyDestination())
                {
                    performanceInitialized = false;

@@ -367,7 +369,7 @@ namespace Ryujinx.Audio.Renderer.Server
                        GeneratePerformance(ref performanceEntry, PerformanceCommand.Type.Start, nodeId);
                    }

-                    GenerateBiquadFilterForVoice(ref voiceState, dspStateMemory, (int)_rendererContext.MixBufferCount, channelIndex, nodeId);
+                    GenerateBiquadFilterForVoice(ref voiceInfo, dspStateMemory, (int)_rendererContext.MixBufferCount, channelIndex, nodeId);

                    if (performanceInitialized)
                    {
@@ -384,8 +386,8 @@ namespace Ryujinx.Audio.Renderer.Server
                    }

                    _commandBuffer.GenerateVolumeRamp(
-                        voiceState.PreviousVolume,
-                        voiceState.Volume,
+                        voiceInfo.PreviousVolume,
+                        voiceInfo.Volume,
                        _rendererContext.MixBufferCount + (uint)channelIndex,
                        nodeId);

@@ -394,17 +396,17 @@ namespace Ryujinx.Audio.Renderer.Server
                        GeneratePerformance(ref performanceEntry, PerformanceCommand.Type.End, nodeId);
                    }

-                    voiceState.PreviousVolume = voiceState.Volume;
+                    voiceInfo.PreviousVolume = voiceInfo.Volume;

-                    if (voiceState.MixId == Constants.UnusedMixId)
+                    if (voiceInfo.MixId == Constants.UnusedMixId)
                    {
-                        if (voiceState.SplitterId != Constants.UnusedSplitterId)
+                        if (voiceInfo.SplitterId != Constants.UnusedSplitterId)
                        {
                            int destinationId = channelIndex;

                            while (true)
                            {
-                                SplitterDestination destination = _splitterContext.GetDestination((int)voiceState.SplitterId, destinationId);
+                                SplitterDestination destination = _splitterContext.GetDestination((int)voiceInfo.SplitterId, destinationId);

                                if (destination.IsNull)
                                {
@@ -419,7 +421,7 @@ namespace Ryujinx.Audio.Renderer.Server

                                    if (mixId < _mixContext.GetCount() && mixId != Constants.UnusedSplitterIdInt)
                                    {
-                                        ref MixState mix = ref _mixContext.GetState(mixId);
+                                        ref MixInfo mix = ref _mixContext.GetState(mixId);

                                        if (destination.IsBiquadFilterEnabled())
                                        {
@@ -451,7 +453,7 @@ namespace Ryujinx.Audio.Renderer.Server
                    }
                    else
                    {
-                        ref MixState mix = ref _mixContext.GetState(voiceState.MixId);
+                        ref MixInfo mix = ref _mixContext.GetState(voiceInfo.MixId);

                        performanceInitialized = false;

@@ -479,9 +481,9 @@ namespace Ryujinx.Audio.Renderer.Server
                        channelResource.UpdateState();
                    }

-                    for (int i = 0; i < voiceState.BiquadFilterNeedInitialization.Length; i++)
+                    for (int i = 0; i < voiceInfo.BiquadFilterNeedInitialization.Length; i++)
                    {
-                        voiceState.BiquadFilterNeedInitialization[i] = biquadFiltersSpan[i].Enable;
+                        voiceInfo.BiquadFilterNeedInitialization[i] = biquadFiltersSpan[i].Enable;
                    }
                }
            }
@@ -491,13 +493,13 @@ namespace Ryujinx.Audio.Renderer.Server
        {
            for (int i = 0; i < _voiceContext.GetCount(); i++)
            {
-                ref VoiceState sortedState = ref _voiceContext.GetSortedState(i);
+                ref VoiceInfo sortedInfo = ref _voiceContext.GetSortedState(i);

-                if (!sortedState.ShouldSkip() && sortedState.UpdateForCommandGeneration(_voiceContext))
+                if (!sortedInfo.ShouldSkip() && sortedInfo.UpdateForCommandGeneration(_voiceContext))
                {
-                    int nodeId = sortedState.NodeId;
+                    int nodeId = sortedInfo.NodeId;

-                    PerformanceEntryAddresses performanceEntry = new();
+                    PerformanceEntryAddresses performanceEntry = null;

                    bool performanceInitialized = false;

@@ -508,7 +510,7 @@ namespace Ryujinx.Audio.Renderer.Server
                        GeneratePerformance(ref performanceEntry, PerformanceCommand.Type.Start, nodeId);
                    }

-                    GenerateVoice(ref sortedState);
+                    GenerateVoice(ref sortedInfo);

                    if (performanceInitialized)
                    {
@@ -639,9 +641,9 @@ namespace Ryujinx.Audio.Renderer.Server
            if (effect.IsEnabled)
            {
                bool needInitialization = effect.Parameter.Status == UsageState.Invalid ||
-                    (effect.Parameter.Status == UsageState.New && !_rendererContext.BehaviourContext.IsBiquadFilterEffectStateClearBugFixed());
+                    (effect.Parameter.Status == UsageState.New && !_rendererContext.BehaviourInfo.IsBiquadFilterEffectStateClearBugFixed());

-                BiquadFilterParameter parameter = new()
+                BiquadFilterParameter2 parameter = new()
                {
                    Enable = true,
                };
@@ -683,7 +685,7 @@ namespace Ryujinx.Audio.Renderer.Server

            ulong workBuffer = effect.GetWorkBuffer(-1);

-            if (_rendererContext.BehaviourContext.IsEffectInfoVersion2Supported())
+            if (_rendererContext.BehaviourInfo.IsEffectInfoVersion2Supported())
            {
                Memory<EffectResultState> dspResultState;

@@ -777,13 +779,13 @@ namespace Ryujinx.Audio.Renderer.Server
                nodeId);
        }

-        private void GenerateEffect(ref MixState mix, int effectId, BaseEffect effect)
+        private void GenerateEffect(ref MixInfo mix, int effectId, BaseEffect effect)
        {
            int nodeId = mix.NodeId;

            bool isFinalMix = mix.MixId == Constants.FinalMixId;

-            PerformanceEntryAddresses performanceEntry = new();
+            PerformanceEntryAddresses performanceEntry = null;

            bool performanceInitialized = false;

@@ -807,13 +809,13 @@ namespace Ryujinx.Audio.Renderer.Server
                    GenerateAuxEffect(mix.BufferOffset, (AuxiliaryBufferEffect)effect, nodeId);
                    break;
                case EffectType.Delay:
-                    GenerateDelayEffect(mix.BufferOffset, (DelayEffect)effect, nodeId, _rendererContext.BehaviourContext.IsNewEffectChannelMappingSupported());
+                    GenerateDelayEffect(mix.BufferOffset, (DelayEffect)effect, nodeId, _rendererContext.BehaviourInfo.IsNewEffectChannelMappingSupported());
                    break;
                case EffectType.Reverb:
-                    GenerateReverbEffect(mix.BufferOffset, (ReverbEffect)effect, nodeId, mix.IsLongSizePreDelaySupported, _rendererContext.BehaviourContext.IsNewEffectChannelMappingSupported());
+                    GenerateReverbEffect(mix.BufferOffset, (ReverbEffect)effect, nodeId, mix.IsLongSizePreDelaySupported, _rendererContext.BehaviourInfo.IsNewEffectChannelMappingSupported());
                    break;
                case EffectType.Reverb3d:
-                    GenerateReverb3dEffect(mix.BufferOffset, (Reverb3dEffect)effect, nodeId, _rendererContext.BehaviourContext.IsNewEffectChannelMappingSupported());
+                    GenerateReverb3dEffect(mix.BufferOffset, (Reverb3dEffect)effect, nodeId, _rendererContext.BehaviourInfo.IsNewEffectChannelMappingSupported());
                    break;
                case EffectType.BiquadFilter:
                    GenerateBiquadFilterEffect(mix.BufferOffset, (BiquadFilterEffect)effect, nodeId);
@@ -839,7 +841,7 @@ namespace Ryujinx.Audio.Renderer.Server
            effect.UpdateForCommandGeneration();
        }

-        private void GenerateEffects(ref MixState mix)
+        private void GenerateEffects(ref MixInfo mix)
        {
            ReadOnlySpan<int> effectProcessingOrderArray = mix.EffectProcessingOrderArray;

@@ -875,8 +877,8 @@ namespace Ryujinx.Audio.Renderer.Server
            ref bool isFirstMixBuffer,
            int nodeId)
        {
-            ref BiquadFilterParameter bqf0 = ref destination.GetBiquadFilterParameter(0);
-            ref BiquadFilterParameter bqf1 = ref destination.GetBiquadFilterParameter(1);
+            ref BiquadFilterParameter2 bqf0 = ref destination.GetBiquadFilterParameter(0);
+            ref BiquadFilterParameter2 bqf1 = ref destination.GetBiquadFilterParameter(1);

            Memory<BiquadFilterState> bqfState = _splitterContext.GetBiquadFilterState(destination);

@@ -888,7 +890,7 @@ namespace Ryujinx.Audio.Renderer.Server
                    inputBufferIndex,
                    outputBufferIndex,
                    0,
-                    Memory<VoiceUpdateState>.Empty,
+                    Memory<VoiceState>.Empty,
                    ref bqf0,
                    ref bqf1,
                    bqfState[..1],
@@ -912,7 +914,7 @@ namespace Ryujinx.Audio.Renderer.Server
                    inputBufferIndex,
                    outputBufferIndex,
                    0,
-                    Memory<VoiceUpdateState>.Empty,
+                    Memory<VoiceState>.Empty,
                    ref bqf0,
                    bqfState[..1],
                    bqfState.Slice(1, 1),
@@ -931,7 +933,7 @@ namespace Ryujinx.Audio.Renderer.Server
                    inputBufferIndex,
                    outputBufferIndex,
                    0,
-                    Memory<VoiceUpdateState>.Empty,
+                    Memory<VoiceState>.Empty,
                    ref bqf1,
                    bqfState[..1],
                    bqfState.Slice(1, 1),
@@ -946,7 +948,7 @@ namespace Ryujinx.Audio.Renderer.Server
            isFirstMixBuffer = false;
        }

-        private void GenerateMix(ref MixState mix)
+        private void GenerateMix(ref MixInfo mix)
        {
            if (mix.HasAnyDestination())
            {
@@ -975,7 +977,7 @@ namespace Ryujinx.Audio.Renderer.Server

                                if (mixId < _mixContext.GetCount() && mixId != Constants.UnusedSplitterIdInt)
                                {
-                                    ref MixState destinationMix = ref _mixContext.GetState(mixId);
+                                    ref MixInfo destinationMix = ref _mixContext.GetState(mixId);

                                    uint inputBufferIndex = mix.BufferOffset + ((uint)destinationIndex % mix.BufferCount);

@@ -1014,7 +1016,7 @@ namespace Ryujinx.Audio.Renderer.Server
                }
                else
                {
-                    ref MixState destinationMix = ref _mixContext.GetState(mix.DestinationMixId);
+                    ref MixInfo destinationMix = ref _mixContext.GetState(mix.DestinationMixId);

                    for (uint bufferIndex = 0; bufferIndex < mix.BufferCount; bufferIndex++)
                    {
@@ -1036,7 +1038,7 @@ namespace Ryujinx.Audio.Renderer.Server
            }
        }

-        private void GenerateSubMix(ref MixState subMix)
+        private void GenerateSubMix(ref MixInfo subMix)
        {
            _commandBuffer.GenerateDepopForMixBuffers(
                _rendererContext.DepopBuffer,
@@ -1047,7 +1049,7 @@ namespace Ryujinx.Audio.Renderer.Server

            GenerateEffects(ref subMix);

-            PerformanceEntryAddresses performanceEntry = new();
+            PerformanceEntryAddresses performanceEntry = null;

            int nodeId = subMix.NodeId;

@@ -1072,13 +1074,13 @@ namespace Ryujinx.Audio.Renderer.Server
        {
            for (int id = 0; id < _mixContext.GetCount(); id++)
            {
-                ref MixState sortedState = ref _mixContext.GetSortedState(id);
+                ref MixInfo sortedInfo = ref _mixContext.GetSortedState(id);

-                if (sortedState.IsUsed && sortedState.MixId != Constants.FinalMixId)
+                if (sortedInfo.IsUsed && sortedInfo.MixId != Constants.FinalMixId)
                {
-                    int nodeId = sortedState.NodeId;
+                    int nodeId = sortedInfo.NodeId;

-                    PerformanceEntryAddresses performanceEntry = new();
+                    PerformanceEntryAddresses performanceEntry = null;

                    bool performanceInitialized = false;

@@ -1089,7 +1091,7 @@ namespace Ryujinx.Audio.Renderer.Server
                        GeneratePerformance(ref performanceEntry, PerformanceCommand.Type.Start, nodeId);
                    }

-                    GenerateSubMix(ref sortedState);
+                    GenerateSubMix(ref sortedInfo);

                    if (performanceInitialized)
                    {
@@ -1101,7 +1103,7 @@ namespace Ryujinx.Audio.Renderer.Server

        private void GenerateFinalMix()
        {
-            ref MixState finalMix = ref _mixContext.GetFinalState();
+            ref MixInfo finalMix = ref _mixContext.GetFinalState();

            _commandBuffer.GenerateDepopForMixBuffers(
                _rendererContext.DepopBuffer,
@@ -1112,7 +1114,7 @@ namespace Ryujinx.Audio.Renderer.Server

            GenerateEffects(ref finalMix);

-            PerformanceEntryAddresses performanceEntry = new();
+            PerformanceEntryAddresses performanceEntry = null;

            int nodeId = finalMix.NodeId;

@@ -1161,7 +1163,7 @@ namespace Ryujinx.Audio.Renderer.Server
        {
            int nodeId = _mixContext.GetFinalState().NodeId;

-            PerformanceEntryAddresses performanceEntry = new();
+            PerformanceEntryAddresses performanceEntry = null;

            bool performanceInitialized = false;

@@ -1180,16 +1182,16 @@ namespace Ryujinx.Audio.Renderer.Server
            }
        }

-        private void GenerateCircularBuffer(CircularBufferSink sink, ref MixState finalMix)
+        private void GenerateCircularBuffer(CircularBufferSink sink, ref MixInfo finalMix)
        {
            _commandBuffer.GenerateCircularBuffer(finalMix.BufferOffset, sink, Constants.InvalidNodeId);
        }

-        private void GenerateDevice(DeviceSink sink, ref MixState finalMix)
+        private void GenerateDevice(DeviceSink sink, ref MixInfo finalMix)
        {
-            if (_commandBuffer.CommandList.SampleRate != 48000 && sink.UpsamplerState == null)
+            if (_commandBuffer.CommandList.SampleRate != 48000 && sink.UpsamplerInfo == null)
            {
-                sink.UpsamplerState = _rendererContext.UpsamplerManager.Allocate();
+                sink.UpsamplerInfo = _rendererContext.UpsamplerManager.Allocate();
            }

            bool useCustomDownMixingCommand = _rendererContext.ChannelCount == 2 && sink.Parameter.DownMixParameterEnabled;
@@ -1216,11 +1218,11 @@ namespace Ryujinx.Audio.Renderer.Server

            CommandList commandList = _commandBuffer.CommandList;

-            if (sink.UpsamplerState != null)
+            if (sink.UpsamplerInfo != null)
            {
                _commandBuffer.GenerateUpsample(
                    finalMix.BufferOffset,
-                    sink.UpsamplerState,
+                    sink.UpsamplerInfo,
                    sink.Parameter.InputCount,
                    sink.Parameter.Input.AsSpan(),
                    commandList.BufferCount,
@@ -1237,11 +1239,11 @@ namespace Ryujinx.Audio.Renderer.Server
                Constants.InvalidNodeId);
        }

-        private void GenerateSink(BaseSink sink, ref MixState finalMix)
+        private void GenerateSink(BaseSink sink, ref MixInfo finalMix)
        {
            bool performanceInitialized = false;

-            PerformanceEntryAddresses performanceEntry = new();
+            PerformanceEntryAddresses performanceEntry = null;

            if (_performanceManager != null && _performanceManager.GetNextEntry(out performanceEntry, PerformanceEntryType.Sink, sink.NodeId))
            {
@@ -1275,7 +1277,7 @@ namespace Ryujinx.Audio.Renderer.Server

        public void GenerateSinks()
        {
-            ref MixState finalMix = ref _mixContext.GetFinalState();
+            ref MixInfo finalMix = ref _mixContext.GetFinalState();

            for (int i = 0; i < _sinkContext.GetCount(); i++)
            {
--- a/src/Ryujinx.Audio/Renderer/Server/CommandProcessingTimeEstimatorVersion1.cs
+++ b/src/Ryujinx.Audio/Renderer/Server/CommandProcessingTimeEstimatorVersion1.cs
@@ -194,5 +194,10 @@ namespace Ryujinx.Audio.Renderer.Server
        {
            return 0;
        }
+
+        public uint Estimate(FillBufferCommand command)
+        {
+            return 0;
+        }
    }
 }
--- a/src/Ryujinx.Audio/Renderer/Server/CommandProcessingTimeEstimatorVersion2.cs
+++ b/src/Ryujinx.Audio/Renderer/Server/CommandProcessingTimeEstimatorVersion2.cs
@@ -486,5 +486,10 @@ namespace Ryujinx.Audio.Renderer.Server
        {
            return 0;
        }
+
+        public uint Estimate(FillBufferCommand command)
+        {
+            return 0;
+        }
    }
 }
--- a/src/Ryujinx.Audio/Renderer/Server/CommandProcessingTimeEstimatorVersion3.cs
+++ b/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 static Ryujinx.Audio.Renderer.Parameter.VoiceInParameter;
+using Ryujinx.Audio.Renderer.Parameter;

 namespace Ryujinx.Audio.Renderer.Server
 {
@@ -656,5 +656,10 @@ namespace Ryujinx.Audio.Renderer.Server
        {
            return 0;
        }
+
+        public virtual uint Estimate(FillBufferCommand command)
+        {
+            return 0;
+        }
    }
 }
--- a/src/Ryujinx.Audio/Renderer/Server/CommandProcessingTimeEstimatorVersion5.cs
+++ b/src/Ryujinx.Audio/Renderer/Server/CommandProcessingTimeEstimatorVersion5.cs
@@ -286,5 +286,10 @@ namespace Ryujinx.Audio.Renderer.Server
                return 8683;
            }
        }
+
+        public override uint Estimate(FillBufferCommand command)
+        {
+            return 0;
+        }
    }
 }
--- a/src/Ryujinx.Audio/Renderer/Server/Effect/BiquadFilterEffect.cs
+++ b/src/Ryujinx.Audio/Renderer/Server/Effect/BiquadFilterEffect.cs
@@ -1,4 +1,5 @@
 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;
@@ -17,20 +18,26 @@ namespace Ryujinx.Audio.Renderer.Server.Effect
        /// <summary>
        /// The biquad filter parameter.
        /// </summary>
-        public BiquadFilterEffectParameter Parameter;
+        public BiquadFilterEffectParameter2 Parameter;

        /// <summary>
        /// The biquad filter state.
        /// </summary>
        public Memory<BiquadFilterState> State { get; }

+        /// <summary>
+        /// The biquad filter effect version.
+        /// </summary>
+        public int BiquadFilterEffectVersion;
+
        /// <summary>
        /// Create a new <see cref="BiquadFilterEffect"/>.
        /// </summary>
-        public BiquadFilterEffect()
+        public BiquadFilterEffect(int version)
        {
-            Parameter = new BiquadFilterEffectParameter();
+            Parameter = new BiquadFilterEffectParameter2();
            State = new BiquadFilterState[Constants.ChannelCountMax];
+            BiquadFilterEffectVersion = version;
        }

        public override EffectType TargetEffectType => EffectType.BiquadFilter;
@@ -51,7 +58,17 @@ namespace Ryujinx.Audio.Renderer.Server.Effect

            UpdateParameterBase(in parameter);

-            Parameter = MemoryMarshal.Cast<byte, BiquadFilterEffectParameter>(parameter.SpecificData)[0];
+            if (BiquadFilterEffectVersion == 2)
+            {
+                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();
--- a/src/Ryujinx.Audio/Renderer/Server/ICommandProcessingTimeEstimator.cs
+++ b/src/Ryujinx.Audio/Renderer/Server/ICommandProcessingTimeEstimator.cs
@@ -38,5 +38,6 @@ namespace Ryujinx.Audio.Renderer.Server
        uint Estimate(CompressorCommand command);
        uint Estimate(BiquadFilterAndMixCommand command);
        uint Estimate(MultiTapBiquadFilterAndMixCommand command);
+        uint Estimate(FillBufferCommand command);
    }
 }
--- a/src/Ryujinx.Audio/Renderer/Server/MemoryPool/AddressInfo.cs
+++ b/src/Ryujinx.Audio/Renderer/Server/MemoryPool/AddressInfo.cs
@@ -20,14 +20,14 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
        /// </summary>
        public ulong Size;

-        private unsafe MemoryPoolState* _memoryPools;
+        private unsafe MemoryPoolInfo* _memoryPools;

        /// <summary>
        /// The forced DSP address of the region.
        /// </summary>
        public DspAddress ForceMappedDspAddress;

-        private readonly unsafe ref MemoryPoolState MemoryPoolState => ref *_memoryPools;
+        private readonly unsafe ref MemoryPoolInfo MemoryPoolInfo => 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 = MemoryPoolState.Null,
+                    _memoryPools = MemoryPoolInfo.Null,
                    Size = size,
                    ForceMappedDspAddress = 0,
                };
@@ -73,19 +73,19 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool

            unsafe
            {
-                _memoryPools = MemoryPoolState.Null;
+                _memoryPools = MemoryPoolInfo.Null;
            }
        }

        /// <summary>
-        /// Set the <see cref="MemoryPoolState"/> associated.
+        /// Set the <see cref="MemoryPoolInfo"/> associated.
        /// </summary>
-        /// <param name="memoryPoolState">The <see cref="MemoryPoolState"/> associated.</param>
-        public void SetupMemoryPool(Span<MemoryPoolState> memoryPoolState)
+        /// <param name="memoryPoolState">The <see cref="MemoryPoolInfo"/> associated.</param>
+        public void SetupMemoryPool(Span<MemoryPoolInfo> memoryPoolState)
        {
            unsafe
            {
-                fixed (MemoryPoolState* ptr = &MemoryMarshal.GetReference(memoryPoolState))
+                fixed (MemoryPoolInfo* ptr = &MemoryMarshal.GetReference(memoryPoolState))
                {
                    SetupMemoryPool(ptr);
                }
@@ -93,27 +93,27 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
        }

        /// <summary>
-        /// Set the <see cref="MemoryPoolState"/> associated.
+        /// Set the <see cref="MemoryPoolInfo"/> associated.
        /// </summary>
-        /// <param name="memoryPoolState">The <see cref="MemoryPoolState"/> associated.</param>
-        public unsafe void SetupMemoryPool(MemoryPoolState* memoryPoolState)
+        /// <param name="memoryPoolState">The <see cref="MemoryPoolInfo"/> associated.</param>
+        public unsafe void SetupMemoryPool(MemoryPoolInfo* memoryPoolState)
        {
            _memoryPools = memoryPoolState;
        }

        /// <summary>
-        /// Check if the <see cref="MemoryPoolState"/> is mapped.
+        /// Check if the <see cref="MemoryPoolInfo"/> is mapped.
        /// </summary>
-        /// <returns>Returns true if the <see cref="MemoryPoolState"/> is mapped.</returns>
+        /// <returns>Returns true if the <see cref="MemoryPoolInfo"/> is mapped.</returns>
        public readonly bool HasMappedMemoryPool()
        {
-            return HasMemoryPoolState && MemoryPoolState.IsMapped();
+            return HasMemoryPoolState && MemoryPoolInfo.IsMapped();
        }

        /// <summary>
        /// Get the DSP address associated to the <see cref="AddressInfo"/>.
        /// </summary>
-        /// <param name="markUsed">If true, mark the <see cref="MemoryPoolState"/> as used.</param>
+        /// <param name="markUsed">If true, mark the <see cref="MemoryPoolInfo"/> 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)
            {
-                MemoryPoolState.IsUsed = true;
+                MemoryPoolInfo.IsUsed = true;
            }

-            return MemoryPoolState.Translate(CpuAddress, Size);
+            return MemoryPoolInfo.Translate(CpuAddress, Size);
        }
    }
 }
--- a/src/Ryujinx.Audio/Renderer/Server/MemoryPool/MemoryPoolState.cs
+++ b/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 MemoryPoolState
+    public struct MemoryPoolInfo
    {
        public const int Alignment = 0x10;

        /// <summary>
-        /// The location of the <see cref="MemoryPoolState"/>.
+        /// The location of the <see cref="MemoryPoolInfo"/>.
        /// </summary>
        public enum LocationType : uint
        {
            /// <summary>
-            /// <see cref="MemoryPoolState"/> located on the CPU side for user use.
+            /// <see cref="MemoryPoolInfo"/> located on the CPU side for user use.
            /// </summary>
            Cpu,

            /// <summary>
-            /// <see cref="MemoryPoolState"/> located on the DSP side for system use.
+            /// <see cref="MemoryPoolInfo"/> located on the DSP side for system use.
            /// </summary>
            Dsp,
        }

        /// <summary>
-        /// The CPU address associated to the <see cref="MemoryPoolState"/>.
+        /// The CPU address associated to the <see cref="MemoryPoolInfo"/>.
        /// </summary>
        public CpuAddress CpuAddress;

        /// <summary>
-        /// The DSP address associated to the <see cref="MemoryPoolState"/>.
+        /// The DSP address associated to the <see cref="MemoryPoolInfo"/>.
        /// </summary>
        public DspAddress DspAddress;

        /// <summary>
-        /// The size associated to the <see cref="MemoryPoolState"/>.
+        /// The size associated to the <see cref="MemoryPoolInfo"/>.
        /// </summary>
        public ulong Size;

        /// <summary>
-        /// The <see cref="LocationType"/> associated to the <see cref="MemoryPoolState"/>.
+        /// The <see cref="LocationType"/> associated to the <see cref="MemoryPoolInfo"/>.
        /// </summary>
        public LocationType Location;

        /// <summary>
-        /// Set to true if the <see cref="MemoryPoolState"/> is used.
+        /// Set to true if the <see cref="MemoryPoolInfo"/> is used.
        /// </summary>
        [MarshalAs(UnmanagedType.I1)]
        public bool IsUsed;

-        public static unsafe MemoryPoolState* Null => (MemoryPoolState*)nint.Zero.ToPointer();
+        public static unsafe MemoryPoolInfo* Null => (MemoryPoolInfo*)nint.Zero.ToPointer();

        /// <summary>
-        /// Create a new <see cref="MemoryPoolState"/> with the given <see cref="LocationType"/>.
+        /// Create a new <see cref="MemoryPoolInfo"/> with the given <see cref="LocationType"/>.
        /// </summary>
        /// <param name="location">The location type to use.</param>
-        /// <returns>A new <see cref="MemoryPoolState"/> with the given <see cref="LocationType"/>.</returns>
-        public static MemoryPoolState Create(LocationType location)
+        /// <returns>A new <see cref="MemoryPoolInfo"/> with the given <see cref="LocationType"/>.</returns>
+        public static MemoryPoolInfo Create(LocationType location)
        {
-            return new MemoryPoolState
+            return new MemoryPoolInfo
            {
                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="MemoryPoolState"/>.
+        /// Set the <see cref="CpuAddress"/> and size of the <see cref="MemoryPoolInfo"/>.
        /// </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="MemoryPoolState"/>.
+        /// Check if the given <see cref="CpuAddress"/> and size is contains in the <see cref="MemoryPoolInfo"/>.
        /// </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="MemoryPoolState"/>.</returns>
+        /// <returns>True if the <see cref="CpuAddress"/> is contained inside the <see cref="MemoryPoolInfo"/>.</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="MemoryPoolState"/> mapped on the DSP?
+        /// Is the <see cref="MemoryPoolInfo"/> mapped on the DSP?
        /// </summary>
-        /// <returns>Returns true if the <see cref="MemoryPoolState"/> is mapped on the DSP.</returns>
+        /// <returns>Returns true if the <see cref="MemoryPoolInfo"/> is mapped on the DSP.</returns>
        public readonly bool IsMapped()
        {
            return DspAddress != 0;
--- a/src/Ryujinx.Audio/Renderer/Server/MemoryPool/PoolMapper.cs
+++ b/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 MemoryPoolState, ref MemoryPoolInParameter, ref MemoryPoolOutStatus)"/>.
+        /// The result of <see cref="Update(ref MemoryPoolInfo, 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{MemoryPoolState}"/> that will be manipulated.
+        /// The <see cref="Memory{MemoryPoolInfo}"/> that will be manipulated.
        /// </summary>
-        private readonly Memory<MemoryPoolState> _memoryPools;
+        private readonly Memory<MemoryPoolInfo> _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<MemoryPoolState>.Empty;
+            _memoryPools = Memory<MemoryPoolInfo>.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<MemoryPoolState> memoryPool, bool isForceMapEnabled)
+        public PoolMapper(uint processHandle, Memory<MemoryPoolInfo> memoryPool, bool isForceMapEnabled)
        {
            _processHandle = processHandle;
            _memoryPools = memoryPool;
@@ -84,15 +84,15 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
        }

        /// <summary>
-        /// Initialize the <see cref="MemoryPoolState"/> for system use.
+        /// Initialize the <see cref="MemoryPoolInfo"/> for system use.
        /// </summary>
-        /// <param name="memoryPool">The <see cref="MemoryPoolState"/> for system use.</param>
+        /// <param name="memoryPool">The <see cref="MemoryPoolInfo"/> 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 MemoryPoolState memoryPool, CpuAddress cpuAddress, ulong size)
+        public bool InitializeSystemPool(ref MemoryPoolInfo memoryPool, CpuAddress cpuAddress, ulong size)
        {
-            if (memoryPool.Location != MemoryPoolState.LocationType.Dsp)
+            if (memoryPool.Location != MemoryPoolInfo.LocationType.Dsp)
            {
                return false;
            }
@@ -101,13 +101,13 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
        }

        /// <summary>
-        /// Initialize the <see cref="MemoryPoolState"/>.
+        /// Initialize the <see cref="MemoryPoolInfo"/>.
        /// </summary>
-        /// <param name="memoryPool">The <see cref="MemoryPoolState"/>.</param>
+        /// <param name="memoryPool">The <see cref="MemoryPoolInfo"/>.</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 MemoryPoolState memoryPool, CpuAddress cpuAddress, ulong size)
+        public bool InitializePool(ref MemoryPoolInfo 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="MemoryPoolState"/>.
+        /// Get the process handle associated to the <see cref="MemoryPoolInfo"/>.
        /// </summary>
-        /// <param name="memoryPool">The <see cref="MemoryPoolState"/>.</param>
-        /// <returns>Returns the process handle associated to the <see cref="MemoryPoolState"/>.</returns>
-        public uint GetProcessHandle(ref MemoryPoolState memoryPool)
+        /// <param name="memoryPool">The <see cref="MemoryPoolInfo"/>.</param>
+        /// <returns>Returns the process handle associated to the <see cref="MemoryPoolInfo"/>.</returns>
+        public uint GetProcessHandle(ref MemoryPoolInfo memoryPool)
        {
-            if (memoryPool.Location == MemoryPoolState.LocationType.Cpu)
+            if (memoryPool.Location == MemoryPoolInfo.LocationType.Cpu)
            {
                return CurrentProcessPseudoHandle;
            }

-            if (memoryPool.Location == MemoryPoolState.LocationType.Dsp)
+            if (memoryPool.Location == MemoryPoolInfo.LocationType.Dsp)
            {
                return _processHandle;
            }
@@ -135,11 +135,11 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
        }

        /// <summary>
-        /// Map the <see cref="MemoryPoolState"/> on the <see cref="Dsp.AudioProcessor"/>.
+        /// Map the <see cref="MemoryPoolInfo"/> on the <see cref="Dsp.AudioProcessor"/>.
        /// </summary>
-        /// <param name="memoryPool">The <see cref="MemoryPoolState"/> to map.</param>
+        /// <param name="memoryPool">The <see cref="MemoryPoolInfo"/> to map.</param>
        /// <returns>Returns the DSP address mapped.</returns>
-        public DspAddress Map(ref MemoryPoolState memoryPool)
+        public DspAddress Map(ref MemoryPoolInfo 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="MemoryPoolState"/> from the <see cref="Dsp.AudioProcessor"/>.
+        /// Unmap the <see cref="MemoryPoolInfo"/> from the <see cref="Dsp.AudioProcessor"/>.
        /// </summary>
-        /// <param name="memoryPool">The <see cref="MemoryPoolState"/> to unmap.</param>
+        /// <param name="memoryPool">The <see cref="MemoryPoolInfo"/> to unmap.</param>
        /// <returns>Returns true if unmapped.</returns>
-        public bool Unmap(ref MemoryPoolState memoryPool)
+        public bool Unmap(ref MemoryPoolInfo memoryPool)
        {
            if (memoryPool.IsUsed)
            {
@@ -172,12 +172,12 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
        }

        /// <summary>
-        /// Find a <see cref="MemoryPoolState"/> associated to the region given.
+        /// Find a <see cref="MemoryPoolInfo"/> 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="MemoryPoolState"/> found or <see cref="Memory{MemoryPoolState}.Empty"/> if not found.</returns>
-        private Span<MemoryPoolState> FindMemoryPool(CpuAddress cpuAddress, ulong size)
+        /// <returns>Returns the <see cref="MemoryPoolInfo"/> found or <see cref="Memory{MemoryPoolInfo}.Empty"/> if not found.</returns>
+        private Span<MemoryPoolInfo> FindMemoryPool(CpuAddress cpuAddress, ulong size)
        {
            if (!_memoryPools.IsEmpty && _memoryPools.Length > 0)
            {
@@ -190,7 +190,7 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
                }
            }

-            return Span<MemoryPoolState>.Empty;
+            return Span<MemoryPoolInfo>.Empty;
        }

        /// <summary>
@@ -201,7 +201,7 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
        {
            if (_isForceMapEnabled)
            {
-                Span<MemoryPoolState> memoryPool = FindMemoryPool(addressInfo.CpuAddress, addressInfo.Size);
+                Span<MemoryPoolInfo> memoryPool = FindMemoryPool(addressInfo.CpuAddress, addressInfo.Size);

                if (!memoryPool.IsEmpty)
                {
@@ -243,13 +243,13 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
        }

        /// <summary>
-        /// Update a <see cref="MemoryPoolState"/> using user parameters.
+        /// Update a <see cref="MemoryPoolInfo"/> using user parameters.
        /// </summary>
-        /// <param name="memoryPool">The <see cref="MemoryPoolState"/> to update.</param>
+        /// <param name="memoryPool">The <see cref="MemoryPoolInfo"/> 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 MemoryPoolState memoryPool, in MemoryPoolInParameter inParameter, ref MemoryPoolOutStatus outStatus)
+        public UpdateResult Update(ref MemoryPoolInfo 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<MemoryPoolState> memoryPool = FindMemoryPool(addressInfo.CpuAddress, addressInfo.Size);
+                Span<MemoryPoolInfo> memoryPool = FindMemoryPool(addressInfo.CpuAddress, addressInfo.Size);

                if (!memoryPool.IsEmpty)
                {
@@ -343,7 +343,7 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
            {
                unsafe
                {
-                    addressInfo.SetupMemoryPool(MemoryPoolState.Null);
+                    addressInfo.SetupMemoryPool(MemoryPoolInfo.Null);
                }
            }

@@ -351,12 +351,12 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
        }

        /// <summary>
-        /// Remove the usage flag from all the <see cref="MemoryPoolState"/>.
+        /// Remove the usage flag from all the <see cref="MemoryPoolInfo"/>.
        /// </summary>
-        /// <param name="memoryPool">The <see cref="Memory{MemoryPoolState}"/> to reset.</param>
-        public static void ClearUsageState(Memory<MemoryPoolState> memoryPool)
+        /// <param name="memoryPool">The <see cref="Memory{MemoryPoolInfo}"/> to reset.</param>
+        public static void ClearUsageState(Memory<MemoryPoolInfo> memoryPool)
        {
-            foreach (ref MemoryPoolState info in memoryPool.Span)
+            foreach (ref MemoryPoolInfo info in memoryPool.Span)
            {
                info.IsUsed = false;
            }
--- a/src/Ryujinx.Audio/Renderer/Server/Mix/MixContext.cs
+++ b/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="MixState"/>.
+        /// Storage for <see cref="MixInfo"/>.
        /// </summary>
-        private Memory<MixState> _mixes;
+        private Memory<MixInfo> _mixes;

        /// <summary>
-        /// Storage of the sorted indices to <see cref="MixState"/>.
+        /// Storage of the sorted indices to <see cref="MixInfo"/>.
        /// </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="MixState"/>.</param>
+        /// <param name="mixes">The storage of <see cref="MixInfo"/>.</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<MixState> mixes, Memory<byte> nodeStatesWorkBuffer, Memory<byte> edgeMatrixWorkBuffer)
+        public void Initialize(Memory<int> sortedMixes, Memory<MixInfo> 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="MixState"/>.
+        /// Get a reference to the final <see cref="MixInfo"/>.
        /// </summary>
-        /// <returns>A reference to the final <see cref="MixState"/>.</returns>
-        public ref MixState GetFinalState()
+        /// <returns>A reference to the final <see cref="MixInfo"/>.</returns>
+        public ref MixInfo GetFinalState()
        {
            return ref GetState(Constants.FinalMixId);
        }

        /// <summary>
-        /// Get a reference to a <see cref="MixState"/> at the given <paramref name="id"/>.
+        /// Get a reference to a <see cref="MixInfo"/> at the given <paramref name="id"/>.
        /// </summary>
        /// <param name="id">The index to use.</param>
-        /// <returns>A reference to a <see cref="MixState"/> at the given <paramref name="id"/>.</returns>
-        public ref MixState GetState(int id)
+        /// <returns>A reference to a <see cref="MixInfo"/> at the given <paramref name="id"/>.</returns>
+        public ref MixInfo GetState(int id)
        {
            return ref SpanIOHelper.GetFromMemory(_mixes, id, _mixesCount);
        }

        /// <summary>
-        /// Get a reference to a <see cref="MixState"/> at the given <paramref name="id"/> of the sorted mix info.
+        /// Get a reference to a <see cref="MixInfo"/> 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="MixState"/> at the given <paramref name="id"/>.</returns>
-        public ref MixState GetSortedState(int id)
+        /// <returns>A reference to a <see cref="MixInfo"/> at the given <paramref name="id"/>.</returns>
+        public ref MixInfo 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="MixState"/>.
+        /// Update the internal distance from the final mix value of every <see cref="MixInfo"/>.
        /// </summary>
        private void UpdateDistancesFromFinalMix()
        {
-            foreach (ref MixState mix in _mixes.Span)
+            foreach (ref MixInfo mix in _mixes.Span)
            {
                mix.ClearDistanceFromFinalMix();
            }

            for (int i = 0; i < GetCount(); i++)
            {
-                ref MixState mix = ref GetState(i);
+                ref MixInfo mix = ref GetState(i);

                SetSortedState(i, i);

@@ -149,13 +149,13 @@ namespace Ryujinx.Audio.Renderer.Server.Mix
                        {
                            if (mixId == Constants.UnusedMixId)
                            {
-                                distance = MixState.InvalidDistanceFromFinalMix;
+                                distance = MixInfo.InvalidDistanceFromFinalMix;
                                break;
                            }

-                            ref MixState distanceMix = ref GetState(mixId);
+                            ref MixInfo distanceMix = ref GetState(mixId);

-                            if (distanceMix.DistanceFromFinalMix != MixState.InvalidDistanceFromFinalMix)
+                            if (distanceMix.DistanceFromFinalMix != MixInfo.InvalidDistanceFromFinalMix)
                            {
                                distance = distanceMix.DistanceFromFinalMix + 1;
                                break;
@@ -171,12 +171,12 @@ namespace Ryujinx.Audio.Renderer.Server.Mix

                        if (distance > GetCount())
                        {
-                            distance = MixState.InvalidDistanceFromFinalMix;
+                            distance = MixInfo.InvalidDistanceFromFinalMix;
                        }
                    }
                    else
                    {
-                        distance = MixState.InvalidDistanceFromFinalMix;
+                        distance = MixInfo.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="MixState"/>.
+        /// Update the internal mix buffer offset of all <see cref="MixInfo"/>.
        /// </summary>
        private void UpdateMixBufferOffset()
        {
            uint offset = 0;

-            foreach (ref MixState mix in _mixes.Span)
+            foreach (ref MixInfo mix in _mixes.Span)
            {
                mix.BufferOffset = offset;

@@ -210,10 +210,10 @@ namespace Ryujinx.Audio.Renderer.Server.Mix

            Array.Sort(sortedMixesTemp, (a, b) =>
            {
-                ref MixState stateA = ref GetState(a);
-                ref MixState stateB = ref GetState(b);
+                ref MixInfo infoA = ref GetState(a);
+                ref MixInfo infoB = ref GetState(b);

-                return stateB.DistanceFromFinalMix.CompareTo(stateA.DistanceFromFinalMix);
+                return infoB.DistanceFromFinalMix.CompareTo(infoA.DistanceFromFinalMix);
            });

            sortedMixesTemp.AsSpan().CopyTo(_sortedMixes.Span);
--- a/src/Ryujinx.Audio/Renderer/Server/Mix/MixState.cs
+++ b/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 MixState
+    public struct MixInfo
    {
        public const uint InvalidDistanceFromFinalMix = 0x80000000;

@@ -136,11 +136,11 @@ namespace Ryujinx.Audio.Renderer.Server.Mix
        }

        /// <summary>
-        /// Create a new <see cref="MixState"/>
+        /// Create a new <see cref="MixInfo"/>
        /// </summary>
        /// <param name="effectProcessingOrderArray"></param>
-        /// <param name="behaviourContext"></param>
-        public MixState(Memory<int> effectProcessingOrderArray, ref BehaviourContext behaviourContext) : this()
+        /// <param name="behaviourInfo"></param>
+        public MixInfo(Memory<int> effectProcessingOrderArray, ref BehaviourInfo behaviourInfo) : this()
        {
            MixId = UnusedMixId;

@@ -158,7 +158,7 @@ namespace Ryujinx.Audio.Renderer.Server.Mix

            EffectProcessingOrderArrayMaxCount = (uint)effectProcessingOrderArray.Length;

-            IsLongSizePreDelaySupported = behaviourContext.IsLongSizePreDelaySupported();
+            IsLongSizePreDelaySupported = behaviourInfo.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="behaviourContext">The behaviour context.</param>
+        /// <param name="behaviourInfo">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, BehaviourContext behaviourContext)
+        public bool Update(EdgeMatrix edgeMatrix, in MixParameter parameter, EffectContext effectContext, SplitterContext splitterContext, BehaviourInfo behaviourInfo)
        {
            bool isDirty;

@@ -271,7 +271,7 @@ namespace Ryujinx.Audio.Renderer.Server.Mix
            NodeId = parameter.NodeId;
            parameter.MixBufferVolume.CopyTo(MixBufferVolume);

-            if (behaviourContext.IsSplitterSupported())
+            if (behaviourInfo.IsSplitterSupported())
            {
                isDirty = UpdateConnection(edgeMatrix, in parameter, ref splitterContext);
            }
@@ -279,10 +279,7 @@ namespace Ryujinx.Audio.Renderer.Server.Mix
            {
                isDirty = DestinationMixId != parameter.DestinationMixId;

-                if (DestinationMixId != parameter.DestinationMixId)
-                {
-                    DestinationMixId = parameter.DestinationMixId;
-                }
+                DestinationMixId = parameter.DestinationMixId;

                DestinationSplitterId = UnusedSplitterId;
            }
--- a/src/Ryujinx.Audio/Renderer/Server/Performance/PerformanceEntryAddresses.cs
+++ b/src/Ryujinx.Audio/Renderer/Server/Performance/PerformanceEntryAddresses.cs
@@ -1,3 +1,4 @@
+using Ryujinx.Common;
 using System;

 namespace Ryujinx.Audio.Renderer.Server.Performance
@@ -7,6 +8,8 @@ namespace Ryujinx.Audio.Renderer.Server.Performance
    /// </summary>
    public class PerformanceEntryAddresses
    {
+        public static readonly ObjectPool<PerformanceEntryAddresses> PerformanceEntryAddressesPool = new(() => new PerformanceEntryAddresses());
+        
        /// <summary>
        /// The memory storing the performance entry.
        /// </summary>
@@ -52,5 +55,10 @@ namespace Ryujinx.Audio.Renderer.Server.Performance
        {
            BaseMemory.Span[(int)ProcessingTimeOffset / 4] = (int)(endTimeNano / 1000) - BaseMemory.Span[(int)StartTimeOffset / 4];
        }
+
+        public void Clear()
+        {
+            
+        }
    }
 }
--- a/src/Ryujinx.Audio/Renderer/Server/Performance/PerformanceManager.cs
+++ b/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="behaviourContext">The behaviour context.</param>
+        /// <param name="behaviourInfo">The behaviour context.</param>
        /// <returns>The required size for a single performance frame.</returns>
-        public static ulong GetRequiredBufferSizeForPerformanceMetricsPerFrame(ref AudioRendererConfiguration parameter, ref BehaviourContext behaviourContext)
+        public static ulong GetRequiredBufferSizeForPerformanceMetricsPerFrame(ref AudioRendererConfiguration parameter, ref BehaviourInfo behaviourInfo)
        {
-            uint version = behaviourContext.GetPerformanceMetricsDataFormat();
+            uint version = behaviourInfo.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="behaviourContext">The behaviour context;</param>
+        /// <param name="behaviourInfo">The behaviour context;</param>
        /// <returns>A new <see cref="PerformanceManager"/>.</returns>
-        public static PerformanceManager Create(Memory<byte> performanceBuffer, ref AudioRendererConfiguration parameter, BehaviourContext behaviourContext)
+        public static PerformanceManager Create(Memory<byte> performanceBuffer, ref AudioRendererConfiguration parameter, BehaviourInfo behaviourInfo)
        {
-            uint version = behaviourContext.GetPerformanceMetricsDataFormat();
+            uint version = behaviourInfo.GetPerformanceMetricsDataFormat();

            return version switch
            {
--- a/src/Ryujinx.Audio/Renderer/Server/Performance/PerformanceManagerGeneric.cs
+++ b/src/Ryujinx.Audio/Renderer/Server/Performance/PerformanceManagerGeneric.cs
@@ -208,11 +208,9 @@ namespace Ryujinx.Audio.Renderer.Server.Performance

        public override bool GetNextEntry(out PerformanceEntryAddresses performanceEntry, PerformanceEntryType entryType, int nodeId)
        {
-            performanceEntry = new PerformanceEntryAddresses
-            {
-                BaseMemory = SpanMemoryManager<int>.Cast(CurrentBuffer),
-                EntryCountOffset = (uint)CurrentHeader.GetEntryCountOffset(),
-            };
+            performanceEntry = PerformanceEntryAddresses.PerformanceEntryAddressesPool.Allocate();
+            performanceEntry.BaseMemory = SpanMemoryManager<int>.Cast(CurrentBuffer);
+            performanceEntry.EntryCountOffset = (uint)CurrentHeader.GetEntryCountOffset();

            uint baseEntryOffset = (uint)(Unsafe.SizeOf<THeader>() + Unsafe.SizeOf<TEntry>() * _entryIndex);

@@ -238,12 +236,10 @@ namespace Ryujinx.Audio.Renderer.Server.Performance
            {
                return false;
            }
-
-            performanceEntry = new PerformanceEntryAddresses
-            {
-                BaseMemory = SpanMemoryManager<int>.Cast(CurrentBuffer),
-                EntryCountOffset = (uint)CurrentHeader.GetEntryCountOffset(),
-            };
+            
+            performanceEntry = PerformanceEntryAddresses.PerformanceEntryAddressesPool.Allocate();
+            performanceEntry.BaseMemory = SpanMemoryManager<int>.Cast(CurrentBuffer);
+            performanceEntry.EntryCountOffset = (uint)CurrentHeader.GetEntryCountOffset();

            uint baseEntryOffset = (uint)(Unsafe.SizeOf<THeader>() + GetEntriesSize() + Unsafe.SizeOf<TEntryDetail>() * _entryDetailIndex);

--- a/src/Ryujinx.Audio/Renderer/Server/RendererSystemContext.cs
+++ b/src/Ryujinx.Audio/Renderer/Server/RendererSystemContext.cs
@@ -1,3 +1,4 @@
+using Ryujinx.Audio.Renderer.Server.Mix;
 using Ryujinx.Audio.Renderer.Server.Upsampler;
 using System;

@@ -19,7 +20,7 @@ namespace Ryujinx.Audio.Renderer.Server
        /// <summary>
        /// The target channel count for sink.
        /// </summary>
-        /// <remarks>See <see cref="CommandGenerator.GenerateDevice(Sink.DeviceSink, ref Mix.MixState)"/> for usage.</remarks>
+        /// <remarks>See <see cref="CommandGenerator.GenerateDevice(Sink.DeviceSink, ref MixInfo)"/> for usage.</remarks>
        public uint ChannelCount;

        /// <summary>
@@ -28,12 +29,12 @@ namespace Ryujinx.Audio.Renderer.Server
        public uint MixBufferCount;

        /// <summary>
-        /// Instance of the <see cref="BehaviourContext"/> used to derive bug fixes and features of the current audio renderer revision.
+        /// Instance of the <see cref="BehaviourInfo"/> used to derive bug fixes and features of the current audio renderer revision.
        /// </summary>
-        public BehaviourContext BehaviourContext;
+        public BehaviourInfo BehaviourInfo;

        /// <summary>
-        /// Instance of the <see cref="UpsamplerManager"/> used for upsampling (see <see cref="UpsamplerState"/>)
+        /// Instance of the <see cref="UpsamplerManager"/> used for upsampling (see <see cref="UpsamplerInfo"/>)
        /// </summary>
        public UpsamplerManager UpsamplerManager;

--- a/src/Ryujinx.Audio/Renderer/Server/Sink/DeviceSink.cs
+++ b/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 UpsamplerState UpsamplerState;
+        public UpsamplerInfo UpsamplerInfo;

        /// <summary>
        /// Create a new <see cref="DeviceSink"/>.
@@ -40,9 +40,9 @@ namespace Ryujinx.Audio.Renderer.Server.Sink

        public override void CleanUp()
        {
-            UpsamplerState?.Release();
+            UpsamplerInfo?.Release();

-            UpsamplerState = null;
+            UpsamplerInfo = null;

            base.CleanUp();
        }
--- a/src/Ryujinx.Audio/Renderer/Server/Splitter/SplitterContext.cs
+++ b/src/Ryujinx.Audio/Renderer/Server/Splitter/SplitterContext.cs
@@ -55,22 +55,27 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
        /// If set to true, the previous mix volume is explicitly resetted using the input parameter, instead of implicitly on first use.
        /// </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="behaviourContext">The behaviour context.</param>
+        /// <param name="behaviourInfo">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 BehaviourContext behaviourContext,
+            ref BehaviourInfo behaviourInfo,
            ref AudioRendererConfiguration parameter,
            WorkBufferAllocator workBufferAllocator,
            Memory<BiquadFilterState> splitterBqfStates)
        {
-            if (!behaviourContext.IsSplitterSupported() || parameter.SplitterCount <= 0 || parameter.SplitterDestinationCount <= 0)
+            if (!behaviourInfo.IsSplitterSupported() || parameter.SplitterCount <= 0 || parameter.SplitterDestinationCount <= 0)
            {
                Setup(Memory<SplitterState>.Empty, Memory<SplitterDestinationVersion1>.Empty, Memory<SplitterDestinationVersion2>.Empty, false);

@@ -94,7 +99,7 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
            Memory<SplitterDestinationVersion1> splitterDestinationsV1 = Memory<SplitterDestinationVersion1>.Empty;
            Memory<SplitterDestinationVersion2> splitterDestinationsV2 = Memory<SplitterDestinationVersion2>.Empty;

-            if (!behaviourContext.IsBiquadFilterParameterForSplitterEnabled())
+            if (!behaviourInfo.IsBiquadFilterParameterForSplitterEnabled())
            {
                Version = 1;

@@ -144,11 +149,12 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
                }
            }

-            IsSplitterPrevVolumeResetSupported = behaviourContext.IsSplitterPrevVolumeResetSupported();
+            IsSplitterPrevVolumeResetSupported = behaviourInfo.IsSplitterPrevVolumeResetSupported();
+            IsBiquadFilterParameterFloatSupported = behaviourInfo.IsBiquadFilterParameterFloatSupported();

            SplitterState.InitializeSplitters(splitters.Span);

-            Setup(splitters, splitterDestinationsV1, splitterDestinationsV2, behaviourContext.IsSplitterBugFixed());
+            Setup(splitters, splitterDestinationsV1, splitterDestinationsV2, behaviourInfo.IsSplitterBugFixed());

            return true;
        }
@@ -157,16 +163,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="behaviourContext">The behaviour context.</param>
+        /// <param name="behaviourInfo">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 BehaviourContext behaviourContext, ref AudioRendererConfiguration parameter)
+        public static ulong GetWorkBufferSize(ulong size, ref BehaviourInfo behaviourInfo, ref AudioRendererConfiguration parameter)
        {
-            if (behaviourContext.IsSplitterSupported())
+            if (behaviourInfo.IsSplitterSupported())
            {
                size = WorkBufferAllocator.GetTargetSize<SplitterState>(size, parameter.SplitterCount, SplitterState.Alignment);

-                if (behaviourContext.IsBiquadFilterParameterForSplitterEnabled())
+                if (behaviourInfo.IsBiquadFilterParameterForSplitterEnabled())
                {
                    size = WorkBufferAllocator.GetTargetSize<SplitterDestinationVersion2>(size, parameter.SplitterDestinationCount, SplitterDestinationVersion2.Alignment);
                }
@@ -175,12 +181,10 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
                    size = WorkBufferAllocator.GetTargetSize<SplitterDestinationVersion1>(size, parameter.SplitterDestinationCount, SplitterDestinationVersion1.Alignment);
                }

-                if (behaviourContext.IsSplitterBugFixed())
+                if (behaviourInfo.IsSplitterBugFixed())
                {
                    size = WorkBufferAllocator.GetTargetSize<int>(size, parameter.SplitterDestinationCount, 0x10);
                }
-
-                return size;
            }

            return size;
@@ -227,7 +231,16 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
                return 0;
            }

-            int length = _splitterDestinationsV2.IsEmpty ? _splitterDestinationsV1.Length : _splitterDestinationsV2.Length;
+            int length;
+
+            if (_splitterDestinationsV2.IsEmpty)
+            {
+                length = _splitterDestinationsV1.Length;
+            }
+            else
+            {
+                length = _splitterDestinationsV2.Length;
+            }

            return length / _splitters.Length;
        }
@@ -278,8 +291,17 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter

            if (parameter.IsMagicValid())
            {
-                int length = _splitterDestinationsV2.IsEmpty ? _splitterDestinationsV1.Length : _splitterDestinationsV2.Length;
+                int length;

+                if (_splitterDestinationsV2.IsEmpty)
+                {
+                    length = _splitterDestinationsV1.Length;
+                }
+                else
+                {
+                    length = _splitterDestinationsV2.Length;
+                }
+                
                if (parameter.Id >= 0 && parameter.Id < length)
                {
                    SplitterDestination destination = GetDestination(parameter.Id);
@@ -315,9 +337,19 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
                }
                else if (Version == 2)
                {
-                    if (!UpdateData<SplitterDestinationInParameterVersion2>(ref input))
+                    if (IsBiquadFilterParameterFloatSupported)
                    {
-                        break;
+                        if (!UpdateData<SplitterDestinationInParameterVersion2b>(ref input))
+                        {
+                            break;
+                        }
+                    }
+                    else
+                    {
+                        if (!UpdateData<SplitterDestinationInParameterVersion2a>(ref input))
+                        {
+                            break;
+                        }
                    }
                }
                else
@@ -381,10 +413,8 @@ 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));
-            }
+                
+            return new SplitterDestination(ref SpanIOHelper.GetFromMemory(_splitterDestinationsV2, id, (uint)_splitterDestinationsV2.Length));
        }

        /// <summary>
--- a/src/Ryujinx.Audio/Renderer/Server/Splitter/SplitterDestination.cs
+++ b/src/Ryujinx.Audio/Renderer/Server/Splitter/SplitterDestination.cs
@@ -31,15 +31,11 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
                    {
                        return 0;
                    }
-                    else
-                    {
-                        return _v1.Id;
-                    }
-                }
-                else
-                {
-                    return _v2.Id;
+                    
+                    return _v1.Id;
                }
+                
+                return _v2.Id;
            }
        }

@@ -56,15 +52,11 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
                    {
                        return 0;
                    }
-                    else
-                    {
-                        return _v1.DestinationId;
-                    }
-                }
-                else
-                {
-                    return _v2.DestinationId;
+                    
+                    return _v1.DestinationId;
                }
+                
+                return _v2.DestinationId;
            }
        }

@@ -82,15 +74,11 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
                    {
                        return Span<float>.Empty;
                    }
-                    else
-                    {
-                        return _v1.MixBufferVolume;
-                    }
-                }
-                else
-                {
-                    return _v2.MixBufferVolume;
+                    
+                    return _v1.MixBufferVolume;
                }
+                
+                return _v2.MixBufferVolume;
            }
        }

@@ -108,15 +96,11 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
                    {
                        return Span<float>.Empty;
                    }
-                    else
-                    {
-                        return _v1.PreviousMixBufferVolume;
-                    }
-                }
-                else
-                {
-                    return _v2.PreviousMixBufferVolume;
+                    
+                    return _v1.PreviousMixBufferVolume;
                }
+                
+                return _v2.PreviousMixBufferVolume;
            }
        }

@@ -135,15 +119,11 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
                        {
                            return new SplitterDestination();
                        }
-                        else
-                        {
-                            return new SplitterDestination(ref _v1.Next);
-                        }
-                    }
-                    else
-                    {
-                        return new SplitterDestination(ref _v2.Next);
+                        
+                        return new SplitterDestination(ref _v1.Next);
                    }
+                    
+                    return new SplitterDestination(ref _v2.Next);
                }
            }
        }
@@ -169,6 +149,7 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
            _v2 = ref v2;
        }

+
        /// <summary>
        /// Creates a new splitter destination wrapper for the splitter destination data.
        /// </summary>
@@ -233,7 +214,12 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
        /// <returns>True if the splitter destination is used and has a destination.</returns>
        public readonly bool IsConfigured()
        {
-            return Unsafe.IsNullRef(ref _v2) ? _v1.IsConfigured() : _v2.IsConfigured();
+            if (Unsafe.IsNullRef(ref _v2))
+            {
+                return _v1.IsConfigured();
+            }
+                
+            return _v2.IsConfigured();
        }

        /// <summary>
@@ -243,7 +229,12 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
        /// <returns>The volume for the given destination.</returns>
        public float GetMixVolume(int destinationIndex)
        {
-            return Unsafe.IsNullRef(ref _v2) ? _v1.GetMixVolume(destinationIndex) : _v2.GetMixVolume(destinationIndex);
+            if (Unsafe.IsNullRef(ref _v2))
+            {
+                return _v1.GetMixVolume(destinationIndex);
+            }
+                
+            return _v2.GetMixVolume(destinationIndex);
        }

        /// <summary>
@@ -253,7 +244,12 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
        /// <returns>The volume for the given destination.</returns>
        public float GetMixVolumePrev(int destinationIndex)
        {
-            return Unsafe.IsNullRef(ref _v2) ? _v1.GetMixVolumePrev(destinationIndex) : _v2.GetMixVolumePrev(destinationIndex);
+            if (Unsafe.IsNullRef(ref _v2))
+            {
+                return _v1.GetMixVolumePrev(destinationIndex);
+            }
+                
+            return _v2.GetMixVolumePrev(destinationIndex);
        }

        /// <summary>
@@ -280,13 +276,13 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
            if (Unsafe.IsNullRef(ref _v2))
            {
                Debug.Assert(!Unsafe.IsNullRef(ref next._v1));
-
+                    
                _v1.Link(ref next._v1);
            }
            else
            {
                Debug.Assert(!Unsafe.IsNullRef(ref next._v2));
-
+                    
                _v2.Link(ref next._v2);
            }
        }
@@ -308,6 +304,7 @@ 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()
@@ -326,13 +323,14 @@ 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 BiquadFilterParameter GetBiquadFilterParameter(int index)
+        public ref BiquadFilterParameter2 GetBiquadFilterParameter(int index)
        {
            Debug.Assert(!Unsafe.IsNullRef(ref _v2));
-
+                
            return ref _v2.GetBiquadFilterParameter(index);
        }

--- a/src/Ryujinx.Audio/Renderer/Server/Splitter/SplitterDestinationVersion2.cs
+++ b/src/Ryujinx.Audio/Renderer/Server/Splitter/SplitterDestinationVersion2.cs
@@ -11,7 +11,7 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
    /// <summary>
    /// Server state for a splitter destination (version 2).
    /// </summary>
-    [StructLayout(LayoutKind.Sequential, Size = 0x110, Pack = Alignment)]
+    [StructLayout(LayoutKind.Sequential, Size = 0x128, Pack = Alignment)]
    public struct SplitterDestinationVersion2
    {
        public const int Alignment = 0x10;
@@ -78,7 +78,7 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
            }
        }

-        private Array2<BiquadFilterParameter> _biquadFilters;
+        private Array2<BiquadFilterParameter2> _biquadFilters;

        private Array2<bool> _isPreviousBiquadFilterEnabled;

@@ -109,7 +109,7 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter

                parameter.MixBufferVolume.CopyTo(MixBufferVolume);

-                _biquadFilters = parameter.BiquadFilters;
+                _biquadFilters = parameter.BiquadFilters2;

                bool resetPrevVolume = isPrevVolumeResetSupported ? parameter.ResetPrevVolume : !IsUsed && parameter.IsUsed;
                if (resetPrevVolume)
@@ -218,7 +218,7 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
        /// <returns>True if any biquad filter is enabled.</returns>
        public bool IsBiquadFilterEnabled()
        {
-            Span<BiquadFilterParameter> biquadFiltersSpan = _biquadFilters.AsSpan();
+            Span<BiquadFilterParameter2> biquadFiltersSpan = _biquadFilters.AsSpan();
            return biquadFiltersSpan[0].Enable || biquadFiltersSpan[1].Enable;
        }

@@ -236,7 +236,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 BiquadFilterParameter GetBiquadFilterParameter(int index)
+        public ref BiquadFilterParameter2 GetBiquadFilterParameter(int index)
        {
            return ref _biquadFilters[index];
        }
--- a/src/Ryujinx.Audio/Renderer/Server/StateUpdater.cs
+++ b/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 BehaviourContext _behaviourContext;
+        private BehaviourInfo _behaviourInfo;

        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, BehaviourContext behaviourContext)
+        public StateUpdater(ReadOnlySequence<byte> input, Memory<byte> output, uint processHandle, BehaviourInfo behaviourInfo)
        {
            _inputReader = new SequenceReader<byte>(input);
            _output = output;
            _outputOrigin = _output;
            _processHandle = processHandle;
-            _behaviourContext = behaviourContext;
+            _behaviourInfo = behaviourInfo;

            _inputHeader = ref _inputReader.GetRefOrRefToCopy<UpdateDataHeader>(out _);

            _outputHeader = SpanMemoryManager<UpdateDataHeader>.Cast(_output[..Unsafe.SizeOf<UpdateDataHeader>()]);
-            OutputHeader.Initialize(_behaviourContext.UserRevision);
+            OutputHeader.Initialize(_behaviourInfo.UserRevision);
            _output = _output[Unsafe.SizeOf<UpdateDataHeader>()..];
        }

-        public ResultCode UpdateBehaviourContext()
+        public ResultCode UpdateBehaviourInfo()
        {
            ref readonly BehaviourParameter parameter = ref _inputReader.GetRefOrRefToCopy<BehaviourParameter>(out _);

-            if (!BehaviourContext.CheckValidRevision(parameter.UserRevision) || parameter.UserRevision != _behaviourContext.UserRevision)
+            if (!BehaviourInfo.CheckValidRevision(parameter.UserRevision) || parameter.UserRevision != _behaviourInfo.UserRevision)
            {
                return ResultCode.InvalidUpdateInfo;
            }

-            _behaviourContext.ClearError();
-            _behaviourContext.UpdateFlags(parameter.Flags);
+            _behaviourInfo.ClearError();
+            _behaviourInfo.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<MemoryPoolState> memoryPools)
+        public ResultCode UpdateMemoryPools(Span<MemoryPoolInfo> memoryPools)
        {
-            PoolMapper mapper = new(_processHandle, _behaviourContext.IsMemoryPoolForceMappingEnabled());
+            PoolMapper mapper = new(_processHandle, _behaviourInfo.IsMemoryPoolForceMappingEnabled());

            if (memoryPools.Length * Unsafe.SizeOf<MemoryPoolInParameter>() != _inputHeader.MemoryPoolsSize)
            {
                return ResultCode.InvalidUpdateInfo;
            }

-            foreach (ref MemoryPoolState memoryPool in memoryPools)
+            foreach (ref MemoryPoolInfo memoryPool in memoryPools)
            {
                ref readonly MemoryPoolInParameter parameter = ref _inputReader.GetRefOrRefToCopy<MemoryPoolInParameter>(out _);

@@ -125,10 +125,10 @@ namespace Ryujinx.Audio.Renderer.Server

            return ResultCode.Success;
        }
-
-        public ResultCode UpdateVoices(VoiceContext context, PoolMapper mapper)
+        
+        public ResultCode UpdateVoices2(VoiceContext context, PoolMapper mapper)
        {
-            if (context.GetCount() * Unsafe.SizeOf<VoiceInParameter>() != _inputHeader.VoicesSize)
+            if (context.GetCount() * Unsafe.SizeOf<VoiceInParameter2>() != _inputHeader.VoicesSize)
            {
                return ResultCode.InvalidUpdateInfo;
            }
@@ -140,27 +140,27 @@ namespace Ryujinx.Audio.Renderer.Server
            // First make everything not in use.
            for (int i = 0; i < context.GetCount(); i++)
            {
-                ref VoiceState state = ref context.GetState(i);
+                ref VoiceInfo info = ref context.GetState(i);

-                state.InUse = false;
+                info.InUse = false;
            }

-            Memory<VoiceUpdateState>[] voiceUpdateStatesArray = ArrayPool<Memory<VoiceUpdateState>>.Shared.Rent(Constants.VoiceChannelCountMax);
+            Memory<VoiceState>[] voiceStatesArray = ArrayPool<Memory<VoiceState>>.Shared.Rent(Constants.VoiceChannelCountMax);

-            Span<Memory<VoiceUpdateState>> voiceUpdateStates = voiceUpdateStatesArray.AsSpan(0, Constants.VoiceChannelCountMax);
+            Span<Memory<VoiceState>> voiceStates = voiceStatesArray.AsSpan(0, Constants.VoiceChannelCountMax);

            // Start processing
            for (int i = 0; i < context.GetCount(); i++)
            {
-                ref readonly VoiceInParameter parameter = ref _inputReader.GetRefOrRefToCopy<VoiceInParameter>(out _);
+                ref readonly VoiceInParameter2 parameter = ref _inputReader.GetRefOrRefToCopy<VoiceInParameter2>(out _);

-                voiceUpdateStates.Fill(Memory<VoiceUpdateState>.Empty);
+                voiceStates.Fill(Memory<VoiceState>.Empty);

                ref VoiceOutStatus outStatus = ref SpanIOHelper.GetWriteRef<VoiceOutStatus>(ref _output)[0];

                if (parameter.InUse)
                {
-                    ref VoiceState currentVoiceState = ref context.GetState(i);
+                    ref VoiceInfo currentVoiceInfo = ref context.GetState(i);

                    Span<int> channelResourceIdsSpan = parameter.ChannelResourceIds.AsSpan();

@@ -170,36 +170,36 @@ namespace Ryujinx.Audio.Renderer.Server

                        Debug.Assert(channelId >= 0 && channelId < context.GetCount());

-                        voiceUpdateStates[channelResourceIndex] = context.GetUpdateStateForCpu(channelId);
+                        voiceStates[channelResourceIndex] = context.GetUpdateStateForCpu(channelId);
                    }

                    if (parameter.IsNew)
                    {
-                        currentVoiceState.Initialize();
+                        currentVoiceInfo.Initialize();
                    }

-                    currentVoiceState.UpdateParameters(out ErrorInfo updateParameterError, in parameter, mapper, ref _behaviourContext);
+                    currentVoiceInfo.UpdateParameters2(out ErrorInfo updateParameterError, in parameter, mapper, ref _behaviourInfo);

                    if (updateParameterError.ErrorCode != ResultCode.Success)
                    {
-                        _behaviourContext.AppendError(ref updateParameterError);
+                        _behaviourInfo.AppendError(ref updateParameterError);
                    }

-                    currentVoiceState.UpdateWaveBuffers(out ErrorInfo[] waveBufferUpdateErrorInfos, in parameter, voiceUpdateStates, mapper, ref _behaviourContext);
+                    currentVoiceInfo.UpdateWaveBuffers2(out ErrorInfo[] waveBufferUpdateErrorInfos, in parameter, voiceStates, mapper, ref _behaviourInfo);

                    foreach (ref ErrorInfo errorInfo in waveBufferUpdateErrorInfos.AsSpan())
                    {
                        if (errorInfo.ErrorCode != ResultCode.Success)
                        {
-                            _behaviourContext.AppendError(ref errorInfo);
+                            _behaviourInfo.AppendError(ref errorInfo);
                        }
                    }

-                    currentVoiceState.WriteOutStatus(ref outStatus, in parameter, voiceUpdateStates);
+                    currentVoiceInfo.WriteOutStatus2(ref outStatus, in parameter, voiceStates);
                }
            }

-            ArrayPool<Memory<VoiceUpdateState>>.Shared.Return(voiceUpdateStatesArray);
+            ArrayPool<Memory<VoiceState>>.Shared.Return(voiceStatesArray);

            int currentOutputSize = _output.Length;

@@ -213,7 +213,94 @@ namespace Ryujinx.Audio.Renderer.Server
            return ResultCode.Success;
        }

-        private static void ResetEffect<T>(ref BaseEffect effect, in T parameter, PoolMapper mapper) where T : unmanaged, IEffectInParameter
+        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;
+
+            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;
+        }
+
+        private void ResetEffect<T>(ref BaseEffect effect, in T parameter, PoolMapper mapper) where T : unmanaged, IEffectInParameter
        {
            effect.ForceUnmapBuffers(mapper);

@@ -225,7 +312,8 @@ namespace Ryujinx.Audio.Renderer.Server
                EffectType.Delay => new DelayEffect(),
                EffectType.Reverb => new ReverbEffect(),
                EffectType.Reverb3d => new Reverb3dEffect(),
-                EffectType.BiquadFilter => new BiquadFilterEffect(),
+                EffectType.BiquadFilter when _behaviourInfo.IsBiquadFilterParameterFloatSupported() => new BiquadFilterEffect(2),
+                EffectType.BiquadFilter => new BiquadFilterEffect(1),
                EffectType.Limiter => new LimiterEffect(),
                EffectType.CaptureBuffer => new CaptureBufferEffect(),
                EffectType.Compressor => new CompressorEffect(),
@@ -235,14 +323,14 @@ namespace Ryujinx.Audio.Renderer.Server

        public ResultCode UpdateEffects(EffectContext context, bool isAudioRendererActive, PoolMapper mapper)
        {
-            if (_behaviourContext.IsEffectInfoVersion2Supported())
+            if (_behaviourInfo.IsEffectInfoVersion2Supported())
            {
                return UpdateEffectsVersion2(context, isAudioRendererActive, mapper);
            }

            return UpdateEffectsVersion1(context, isAudioRendererActive, mapper);
        }
-
+        
        public ResultCode UpdateEffectsVersion2(EffectContext context, bool isAudioRendererActive, PoolMapper mapper)
        {
            if (context.GetCount() * Unsafe.SizeOf<EffectInParameterVersion2>() != _inputHeader.EffectsSize)
@@ -271,7 +359,7 @@ namespace Ryujinx.Audio.Renderer.Server

                if (updateErrorInfo.ErrorCode != ResultCode.Success)
                {
-                    _behaviourContext.AppendError(ref updateErrorInfo);
+                    _behaviourInfo.AppendError(ref updateErrorInfo);
                }

                effect.StoreStatus(ref outStatus, isAudioRendererActive);
@@ -325,7 +413,7 @@ namespace Ryujinx.Audio.Renderer.Server

                if (updateErrorInfo.ErrorCode != ResultCode.Success)
                {
-                    _behaviourContext.AppendError(ref updateErrorInfo);
+                    _behaviourInfo.AppendError(ref updateErrorInfo);
                }

                effect.StoreStatus(ref outStatus, isAudioRendererActive);
@@ -384,7 +472,7 @@ namespace Ryujinx.Audio.Renderer.Server
            uint inputMixSize;
            uint inputSize = 0;

-            if (_behaviourContext.IsMixInParameterDirtyOnlyUpdateSupported())
+            if (_behaviourInfo.IsMixInParameterDirtyOnlyUpdateSupported())
            {
                ref readonly MixInParameterDirtyOnlyUpdate parameter = ref _inputReader.GetRefOrRefToCopy<MixInParameterDirtyOnlyUpdate>(out _);

@@ -423,12 +511,12 @@ namespace Ryujinx.Audio.Renderer.Server

                int mixId = i;

-                if (_behaviourContext.IsMixInParameterDirtyOnlyUpdateSupported())
+                if (_behaviourInfo.IsMixInParameterDirtyOnlyUpdateSupported())
                {
                    mixId = parameter.MixId;
                }

-                ref MixState mix = ref mixContext.GetState(mixId);
+                ref MixInfo mix = ref mixContext.GetState(mixId);

                if (parameter.IsUsed != mix.IsUsed)
                {
@@ -444,13 +532,13 @@ namespace Ryujinx.Audio.Renderer.Server

                if (mix.IsUsed)
                {
-                    isMixContextDirty |= mix.Update(mixContext.EdgeMatrix, in parameter, effectContext, splitterContext, _behaviourContext);
+                    isMixContextDirty |= mix.Update(mixContext.EdgeMatrix, in parameter, effectContext, splitterContext, _behaviourInfo);
                }
            }

            if (isMixContextDirty)
            {
-                if (_behaviourContext.IsSplitterSupported() && splitterContext.UsingSplitter())
+                if (_behaviourInfo.IsSplitterSupported() && splitterContext.UsingSplitter())
                {
                    if (!mixContext.Sort(splitterContext))
                    {
@@ -507,7 +595,7 @@ namespace Ryujinx.Audio.Renderer.Server

                if (updateErrorInfo.ErrorCode != ResultCode.Success)
                {
-                    _behaviourContext.AppendError(ref updateErrorInfo);
+                    _behaviourInfo.AppendError(ref updateErrorInfo);
                }
            }

@@ -555,7 +643,7 @@ namespace Ryujinx.Audio.Renderer.Server
        {
            ref BehaviourErrorInfoOutStatus outStatus = ref SpanIOHelper.GetWriteRef<BehaviourErrorInfoOutStatus>(ref _output)[0];

-            _behaviourContext.CopyErrorInfo(outStatus.ErrorInfos.AsSpan(), out outStatus.ErrorInfosCount);
+            _behaviourInfo.CopyErrorInfo(outStatus.ErrorInfos.AsSpan(), out outStatus.ErrorInfosCount);

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

--- a/src/Ryujinx.Audio/Renderer/Server/Upsampler/UpsamplerState.cs
+++ b/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 UpsamplerState
+    public class UpsamplerInfo
    {
        /// <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="UpsamplerState"/>. (used to free it)
+        /// The index of the <see cref="UpsamplerInfo"/>. (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="UpsamplerState"/>.
+        /// Create a new <see cref="UpsamplerInfo"/>.
        /// </summary>
        /// <param name="manager">The upsampler manager.</param>
-        /// <param name="index">The index of the <see cref="UpsamplerState"/>. (used to free it)</param>
+        /// <param name="index">The index of the <see cref="UpsamplerInfo"/>. (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 UpsamplerState(UpsamplerManager manager, int index, Memory<float> outputBuffer, uint sampleCount)
+        public UpsamplerInfo(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="UpsamplerState"/>.
+        /// Release the <see cref="UpsamplerInfo"/>.
        /// </summary>
        public void Release()
        {
--- a/src/Ryujinx.Audio/Renderer/Server/Upsampler/UpsamplerManager.cs
+++ b/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 UpsamplerState[] _upsamplers;
+        private readonly UpsamplerInfo[] _upsamplers;

        /// <summary>
        /// The count of upsamplers.
@@ -39,14 +39,14 @@ namespace Ryujinx.Audio.Renderer.Server.Upsampler
            _upSamplerWorkBuffer = upSamplerWorkBuffer;
            _count = count;

-            _upsamplers = new UpsamplerState[_count];
+            _upsamplers = new UpsamplerInfo[_count];
        }

        /// <summary>
-        /// Allocate a new <see cref="UpsamplerState"/>.
+        /// Allocate a new <see cref="UpsamplerInfo"/>.
        /// </summary>
-        /// <returns>A new <see cref="UpsamplerState"/> or null if out of memory.</returns>
-        public UpsamplerState Allocate()
+        /// <returns>A new <see cref="UpsamplerInfo"/> or null if out of memory.</returns>
+        public UpsamplerInfo Allocate()
        {
            int workBufferOffset = 0;

@@ -56,7 +56,7 @@ namespace Ryujinx.Audio.Renderer.Server.Upsampler
                {
                    if (_upsamplers[i] == null)
                    {
-                        _upsamplers[i] = new UpsamplerState(this, i, _upSamplerWorkBuffer.Slice(workBufferOffset, Constants.UpSampleEntrySize), Constants.TargetSampleCount);
+                        _upsamplers[i] = new UpsamplerInfo(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="UpsamplerState"/> at the given index.
+        /// Free a <see cref="UpsamplerInfo"/> at the given index.
        /// </summary>
-        /// <param name="index">The index of the <see cref="UpsamplerState"/> to free.</param>
+        /// <param name="index">The index of the <see cref="UpsamplerInfo"/> to free.</param>
        public void Free(int index)
        {
            lock (_lock)
--- a/src/Ryujinx.Audio/Renderer/Server/Voice/VoiceContext.cs
+++ b/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="VoiceState"/>.
+        /// Storage of the sorted indices to <see cref="VoiceInfo"/>.
        /// </summary>
        private Memory<int> _sortedVoices;

        /// <summary>
-        /// Storage for <see cref="VoiceState"/>.
+        /// Storage for <see cref="VoiceInfo"/>.
        /// </summary>
-        private Memory<VoiceState> _voices;
+        private Memory<VoiceInfo> _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="VoiceUpdateState"/> that are used during audio renderer server updates.
+        /// Storage for <see cref="VoiceState"/> that are used during audio renderer server updates.
        /// </summary>
-        private Memory<VoiceUpdateState> _voiceUpdateStatesCpu;
+        private Memory<VoiceState> _voiceStatesCpu;

        /// <summary>
-        /// Storage for <see cref="VoiceUpdateState"/> for the <see cref="Dsp.AudioProcessor"/>.
+        /// Storage for <see cref="VoiceState"/> for the <see cref="Dsp.AudioProcessor"/>.
        /// </summary>
-        private Memory<VoiceUpdateState> _voiceUpdateStatesDsp;
+        private Memory<VoiceState> _voiceStatesDsp;

        /// <summary>
        /// The total voice count.
        /// </summary>
        private uint _voiceCount;

-        public void Initialize(Memory<int> sortedVoices, Memory<VoiceState> voices, Memory<VoiceChannelResource> voiceChannelResources, Memory<VoiceUpdateState> voiceUpdateStatesCpu, Memory<VoiceUpdateState> voiceUpdateStatesDsp, uint voiceCount)
+        public void Initialize(Memory<int> sortedVoices, Memory<VoiceInfo> voices, Memory<VoiceChannelResource> voiceChannelResources, Memory<VoiceState> voiceStatesCpu, Memory<VoiceState> voiceStatesDsp, uint voiceCount)
        {
            _sortedVoices = sortedVoices;
            _voices = voices;
            _voiceChannelResources = voiceChannelResources;
-            _voiceUpdateStatesCpu = voiceUpdateStatesCpu;
-            _voiceUpdateStatesDsp = voiceUpdateStatesDsp;
+            _voiceStatesCpu = voiceStatesCpu;
+            _voiceStatesDsp = voiceStatesDsp;
            _voiceCount = voiceCount;
        }

@@ -70,38 +70,38 @@ namespace Ryujinx.Audio.Renderer.Server.Voice
        }

        /// <summary>
-        /// Get a <see cref="Memory{VoiceUpdateState}"/> at the given <paramref name="id"/>.
+        /// Get a <see cref="Memory{VoiceState}"/> at the given <paramref name="id"/>.
        /// </summary>
        /// <param name="id">The index to use.</param>
-        /// <returns>A <see cref="Memory{VoiceUpdateState}"/> at the given <paramref name="id"/>.</returns>
-        /// <remarks>The returned <see cref="Memory{VoiceUpdateState}"/> should only be used when updating the server state.</remarks>
-        public Memory<VoiceUpdateState> GetUpdateStateForCpu(int id)
+        /// <returns>A <see cref="Memory{VoiceState}"/> at the given <paramref name="id"/>.</returns>
+        /// <remarks>The returned <see cref="Memory{VoiceState}"/> should only be used when updating the server state.</remarks>
+        public Memory<VoiceState> GetUpdateStateForCpu(int id)
        {
-            return SpanIOHelper.GetMemory(_voiceUpdateStatesCpu, id, _voiceCount);
+            return SpanIOHelper.GetMemory(_voiceStatesCpu, id, _voiceCount);
        }

        /// <summary>
-        /// Get a <see cref="Memory{VoiceUpdateState}"/> at the given <paramref name="id"/>.
+        /// Get a <see cref="Memory{VoiceState}"/> at the given <paramref name="id"/>.
        /// </summary>
        /// <param name="id">The index to use.</param>
-        /// <returns>A <see cref="Memory{VoiceUpdateState}"/> at the given <paramref name="id"/>.</returns>
-        /// <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<VoiceUpdateState> GetUpdateStateForDsp(int id)
+        /// <returns>A <see cref="Memory{VoiceState}"/> 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>
+        public Memory<VoiceState> GetUpdateStateForDsp(int id)
        {
-            return SpanIOHelper.GetMemory(_voiceUpdateStatesDsp, id, _voiceCount);
+            return SpanIOHelper.GetMemory(_voiceStatesDsp, id, _voiceCount);
        }

        /// <summary>
-        /// Get a reference to a <see cref="VoiceState"/> at the given <paramref name="id"/>.
+        /// Get a reference to a <see cref="VoiceInfo"/> at the given <paramref name="id"/>.
        /// </summary>
        /// <param name="id">The index to use.</param>
-        /// <returns>A reference to a <see cref="VoiceState"/> at the given <paramref name="id"/>.</returns>
-        public ref VoiceState GetState(int id)
+        /// <returns>A reference to a <see cref="VoiceInfo"/> at the given <paramref name="id"/>.</returns>
+        public ref VoiceInfo GetState(int id)
        {
            return ref SpanIOHelper.GetFromMemory(_voices, id, _voiceCount);
        }

-        public ref VoiceState GetSortedState(int id)
+        public ref VoiceInfo GetSortedState(int id)
        {
            Debug.Assert(id >= 0 && id < _voiceCount);

@@ -113,7 +113,7 @@ namespace Ryujinx.Audio.Renderer.Server.Voice
        /// </summary>
        public void UpdateForCommandGeneration()
        {
-            _voiceUpdateStatesDsp.CopyTo(_voiceUpdateStatesCpu);
+            _voiceStatesDsp.CopyTo(_voiceStatesCpu);
        }

        /// <summary>
@@ -130,14 +130,14 @@ namespace Ryujinx.Audio.Renderer.Server.Voice

            sortedVoicesTemp.Sort((a, b) =>
            {
-                ref VoiceState aState = ref GetState(a);
-                ref VoiceState bState = ref GetState(b);
+                ref VoiceInfo aInfo = ref GetState(a);
+                ref VoiceInfo bInfo = ref GetState(b);

-                int result = aState.Priority.CompareTo(bState.Priority);
+                int result = aInfo.Priority.CompareTo(bInfo.Priority);

                if (result == 0)
                {
-                    return aState.SortingOrder.CompareTo(bState.SortingOrder);
+                    return aInfo.SortingOrder.CompareTo(bInfo.SortingOrder);
                }

                return result;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
GreemDev	bbad867319	add back the SDL2 enum for back compatibility so existing configs are not entirely reset upon loading the version with SDL3	2025-11-07 15:02:29 -06:00
Maki	a8ace3d23c	chore: SDL3 (ryubing/ryujinx!207 ) See merge request ryubing/ryujinx!207	2025-11-07 14:43:48 -06:00
GreemDev	13b69aedfe	idea: Catch HorizonResultExceptions of result type ResultFsNonRealDataVerificationFailed - log a more clear error message as to what 2002-4604 means for the user - and return the result from the FileSystemProxy IStorage to pass the invalid data handling to the game instead of stopping emulation there and then. - this may be changed. i'm pretty sure this error is only thrown when you actually have integrity checking enabled in settings, so maybe it crashing with a friendler message is more desired than potentially continuing execution. we will see	2025-11-06 23:40:16 -06:00
GreemDev	234f7ca298	Fix socket closing on shutdown Previously, sockets were only ever closed when the game specifically requested it. Thanks @comex on GitHub for the patch submitted via the issues page. Co-Authored-By: comex <47517+comex@users.noreply.github.com>	2025-11-04 20:48:36 -06:00
LotP	2c9b193018	Fix compiler warning (ryubing/ryujinx!203 ) See merge request ryubing/ryujinx!203	2025-10-30 21:09:24 -05:00
LotP	92b61f9d73	Memory changes 3 (ryubing/ryujinx!202 ) See merge request ryubing/ryujinx!202	2025-10-30 20:55:58 -05:00
WilliamWsyHK	ab7aeee67b	Add newly translated items for zh-TW (ryubing/ryujinx!200 ) See merge request ryubing/ryujinx!200	2025-10-29 18:02:54 -05:00
Hack茶ん	b991fe05d9	Update Korean translation (ryubing/ryujinx!201 ) See merge request ryubing/ryujinx!201	2025-10-29 18:01:07 -05:00
GreemDev	3140ec5f05	misc: Also show an error message box and quit if the process was launched with administrator rights.	2025-10-28 20:57:03 -05:00
GreemDev	40f709ff55	misc: Add a launch guard for program files (the emulator does not work properly when put here as it does not require admin)	2025-10-28 19:04:25 -05:00
GreemDev	53aae9b584	hle: Throw a ServiceNotImplementedException instead of ArgumentException if any number arguments provided to ILibraryAppletAccessor are nonzero	2025-10-28 15:37:59 -05:00
LotP	ff9a75f895	ILibraryAppletAccessor:90 tweak (ryubing/ryujinx!199 ) See merge request ryubing/ryujinx!199	2025-10-28 13:37:20 -05:00
sh0inx	3394736b07	HLE: Stub ILibraryAppletAccessor Unknown90 (ryubing/ryujinx!197 ) See merge request ryubing/ryujinx!197	2025-10-27 12:48:17 -05:00
yeager	b06846aa5e	Updated Swedish translation (with updated branch) (ryubing/ryujinx!156 ) See merge request ryubing/ryujinx!156	2025-10-27 02:47:59 -05:00
LotP	c94ffaa00a	gpu allocation optimizations (ryubing/ryujinx!195 ) See merge request ryubing/ryujinx!195	2025-10-26 14:14:51 -05:00
GreemDev	718652599d	UI: Prevent null ldn game model arrays from entering the SetEntries method	2025-10-26 12:51:08 -05:00
GreemDev	c8959afa3d	chore: Overall code cleanup Update NuGet packages, fix version string in plist for macOS	2025-10-26 01:22:20 -05:00
Coxxs	7175da8621	UI: [ci skip] Show notifications for options that may cause side effects (ryubing/ryujinx!193 ) See merge request ryubing/ryujinx!193	2025-10-26 00:29:38 -05:00
LotP	fd07453887	audio effects fix and audio object pooling (ryubing/ryujinx!192 ) See merge request ryubing/ryujinx!192	2025-10-25 21:07:10 -05:00
KeatonTheBot	c6bc77e4bf	UI: Update Avalonia to 11.3.6, FluentAvalonia to 2.4.0 (ryubing/ryujinx!118 ) See merge request ryubing/ryujinx!118	2025-10-25 00:29:51 -05:00
GreemDev	49cbe4b328	UI: fix "Enable UI logs" not being persisted upon relaunch Closes ryujinx#5 (it was saved, just not loaded back)	2025-10-24 18:25:29 -05:00
Coxxs	6fd67cdcb7	Fix application list loads slowly when RyuLDN is enabled (ryubing/ryujinx!191 ) See merge request ryubing/ryujinx!191	2025-10-24 10:29:33 -05:00
LotP	5ced2bf764	fix wrong bit value (ryubing/ryujinx!190 ) See merge request ryubing/ryujinx!190	2025-10-24 10:10:31 -05:00
GreemDev	67e97d1a1a	gdb: YACC (yet another cleanup commit)	2025-10-23 19:11:58 -05:00
Coxxs	09d8a411c8	Do not RecurseSubdirectories when finding the icon fallback (ryubing/ryujinx!189 ) See merge request ryubing/ryujinx!189	2025-10-23 15:17:29 -05:00
Coxxs	93516df7e6	Skip directories when finding the icon fallback (ryubing/ryujinx!188 ) See merge request ryubing/ryujinx!188	2025-10-23 14:56:39 -05:00
Coxxs	0c165c3f62	Move ProcessInfo and Minidump to HleProcessDebugger (ryubing/ryujinx!187 ) See merge request ryubing/ryujinx!187	2025-10-22 16:20:13 -05:00
GreemDev	91da244c02	gdb: some more cleanups	2025-10-22 15:04:03 -05:00
GreemDev	904d4a7eb0	gdb: Make waiting for a process to start more forgiving (200ms per poll 10x -> 500ms)	2025-10-22 01:07:19 -05:00
Coxxs	1248a054de	gdb: Abort if unable to start GDB server (ryubing/ryujinx!186 ) See merge request ryubing/ryujinx!186	2025-10-21 23:16:18 -05:00
GreemDev	1bb2af84ce	gdb: Catch SocketException from TcpListener#Start	2025-10-21 22:15:14 -05:00
GreemDev	886981004d	chore: I thought I removed these months ago lol	2025-10-21 20:33:35 -05:00
Coxxs	e551dda17e	gdb: fix IsProcess32Bit throws exception if called too early (ryubing/ryujinx!185 ) See merge request ryubing/ryujinx!185	2025-10-20 21:35:55 -05:00
GreemDev	ed67535227	chore: [si skip] fix in-code typos	2025-10-20 21:32:23 -05:00
GreemDev	7d65611b96	gdb: [ci skip] just had a brain wave	2025-10-20 21:20:41 -05:00
GreemDev	71eb844dd8	gdb: dynamic rcmd system & more cleanups	2025-10-20 21:18:16 -05:00
Coxxs	a0e5edf8ba	gdb: Support qAttached; Add missing ReplyOK when detach (ryubing/ryujinx!184 ) See merge request ryubing/ryujinx!184	2025-10-20 21:12:16 -05:00
Coxxs	6541ad0726	Implement IUserServiceCreator: 1 (CreateClientProcessMonitor) (ryubing/ryujinx!181 ) See merge request ryubing/ryujinx!181	2025-10-20 19:14:42 -05:00
Coxxs	1c084373c9	Update LoadIdTokenCache for 19.0.0+ (ryubing/ryujinx!182 ) See merge request ryubing/ryujinx!182	2025-10-20 17:37:16 -05:00
GreemDev	5b3b907fd2	[ci skip] chore: Fix usage of var	2025-10-20 02:42:57 -05:00
Hack茶ん	f46577af58	[ci skip] Update Korean translation (ryubing/ryujinx!174 ) See merge request ryubing/ryujinx!174	2025-10-19 17:43:34 -05:00
Xam	0e218754f5	Fix duplicate volume and mode change events in AppHost (ryubing/ryujinx!176 ) See merge request ryubing/ryujinx!176	2025-10-19 17:41:21 -05:00
Xam	0c6d4a07b9	Input: AvaloniaMouseDriver: fix native touch inputs (ryubing/ryujinx!178 ) See merge request ryubing/ryujinx!178	2025-10-19 17:33:24 -05:00
Xam	8714b010f6	Horizon: Audio: HwopusIpcServer: fix random crashes regression in Pokemon Quest (ryubing/ryujinx!175 ) See merge request ryubing/ryujinx!175	2025-10-19 17:17:46 -05:00
GreemDev	d1d4a735a6	docs: use the real repo in COMPILING.md	2025-10-19 14:48:41 -05:00
GreemDev	247e2e03d6	gdb: More cleanup changes - Move the message handler into its debugger class part, - Move all message types into one file and collapse 3 of the ones with no data into a generic, stateless message with a single property being its type, - Add an Fpscr helper property on IExecutionContext along with a comment about what Fpscr is (similar to the other registers in there) - Moved the Rcmd helpers (such as GetRegisters, GetMinidump, etc) into a dedicated Debugger class part, - Fixed the double-collection (ToArray being called twice) in GetThreadUids & GetThread in KProcess	2025-10-19 04:26:12 -05:00
GreemDev	6058af5119	chore: cleanup unused usings in Ryujinx.HLE	2025-10-19 04:17:02 -05:00
GreemDev	e11eff0f41	gdb: more cleanups - convert GdbRegisters utilities into extensions on IExecutionContext - add a Write/Read Register helper on Debugger that handles 32/64 bit instead of doing that for every usage of register reading/writing	2025-10-18 03:01:21 -05:00
GreemDev	2a2ab523cb	gdb: Code cleanup pass #2 Moved the reply functionality into the command processor, move the main debugger thread into a dedicated class part, and more	2025-10-17 00:09:51 -05:00
Coxxs	8e941e4a8f	gdb: Cleanup (ryubing/ryujinx!171 ) See merge request ryubing/ryujinx!171	2025-10-16 19:53:51 -05:00
Hack茶ん	9aacf9b37b	Update Korean translation (ryubing/ryujinx!168 ) See merge request ryubing/ryujinx!168	2025-10-16 19:45:14 -05:00
Bluey Enjoyer	2b159dbca8	AHHHHHHHHHHHHHH (ryubing/ryujinx!170 ) See merge request ryubing/ryujinx!170	2025-10-16 19:43:56 -05:00
GreemDev	c33a97f01c	gdb: Cleanup Debugger.cs by moving the GDB command handlers and command processor out of the class and into their own	2025-10-16 17:32:04 -05:00
GreemDev	fdbdb05cb5	misc: Update Ryujinx.LibHac	2025-10-16 12:23:15 -05:00
Coxxs	7268acbfb4	gdb: Do not skip CheckInterrupt when gdb stub is enabled (ryubing/ryujinx!169 ) See merge request ryubing/ryujinx!169	2025-10-16 07:49:41 -05:00
GreemDev	d4107ac05f	UI: Add a startup flag to ignore new Amiibo file updates, useful for testing changes you intend on committing to Ryubing/Nfc. Flag is `--local-only-amiibo`	2025-10-15 21:51:13 -05:00
LotP	1d409f7127	12 GiB heap support (ryubing/ryujinx!166 ) See merge request ryubing/ryujinx!166	2025-10-15 15:37:13 -05:00
GreemDev	2434c55266	UI: Updater: Fix "No" opening the changelog and "Show Changelog" doing nothing (aka doing what "No" should be doing)	2025-10-14 18:38:56 -05:00
GreemDev	99126603ba	UI: swap the UI reset checkbox text back to a sentence instead of title cased	2025-10-14 16:12:11 -05:00
GreemDev	a62716002e	chore: move HasPtcCacheFiles & HasShaderCacheFiles into ApplicationData, instead of having the weird static dependency helpers	2025-10-14 16:09:51 -05:00
GreemDev	47559cd311	Revert game list rounding The selected highlight was bugged https://fs.ryujinx.app/40cl4Ih9RiOWLVi7e4lJsw.png	2025-10-14 15:59:02 -05:00
Coxxs	51584a083b	Flush the error log before exit (ryubing/ryujinx!163 ) See merge request ryubing/ryujinx!163	2025-10-13 17:40:15 -05:00
Coxxs	ceec9617ef	gdb: Fix the crash that occurs when GDB is connected early (ryubing/ryujinx!159 ) See merge request ryubing/ryujinx!159	2025-10-11 19:06:14 -05:00
Coxxs	1865be47cf	gdb: Add `monitor minidump` command (ryubing/ryujinx!158 ) See merge request ryubing/ryujinx!158	2025-10-11 10:01:30 -05:00
LotP	ef9810582a	Sync thread name on Schedule (ryubing/ryujinx!157 ) See merge request ryubing/ryujinx!157	2025-10-11 07:47:45 -05:00
KeatonTheBot	13878acdb2	Avoid lookup of invalid textures if pool did not change (ryubing/ryujinx!113 ) See merge request ryubing/ryujinx!113	2025-10-11 02:56:13 -05:00
LotP	e2143d43bc	SDK20 and REV15 support (ryubing/ryujinx!50 ) See merge request ryubing/ryujinx!50	2025-10-11 02:11:39 -05:00