Fix fetch failure when iterating over PRs

Bumps [actions/github-script](https://github.com/actions/github-script) from 6 to 7.
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](https://github.com/actions/github-script/compare/v6...v7)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,7 +1,6 @@
 name: Feature Request
 description: Suggest a new feature for Ryujinx.
 title: "[Feature Request]"
-labels: enhancement
 body:
   - type: textarea
     id: overview

.github/workflows/nightly_pr_comment.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: ${{ fromJSON(vars.JOB_TIMEOUT) }}
     steps:
-      - uses: actions/github-script@v6
+      - uses: actions/github-script@v7
         with:
           script: |
             const {owner, repo} = context.repo;
@@ -19,7 +19,7 @@ jobs:
             const pull_head_sha = '${{github.event.workflow_run.head_sha}}';
 
             const issue_number = await (async () => {
-              const pulls = await github.rest.pulls.list({owner, repo});
+              const pulls = await github.rest.pulls.list.endpoint.merge({owner, repo});
               for await (const {data} of github.paginate.iterator(pulls)) {
                 for (const pull of data) {
                   if (pull.head.sha === pull_head_sha) {
@@ -68,4 +68,4 @@ jobs:
             } else {
               core.info(`Creating a comment`);
               await github.rest.issues.createComment({repo, owner, issue_number, body});
-            }
+            }

.github/workflows/release.yml

@@ -34,7 +34,7 @@ jobs:
         shell: bash
 
       - name: Create tag
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           script: |
             github.rest.git.createRef({

Directory.Packages.props

@@ -8,10 +8,10 @@
     <PackageVersion Include="Avalonia.Desktop" Version="11.0.10" />
     <PackageVersion Include="Avalonia.Diagnostics" Version="11.0.10" />
     <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.0.10" />
-    <PackageVersion Include="Avalonia.Svg" Version="11.0.0.18" />
-    <PackageVersion Include="Avalonia.Svg.Skia" Version="11.0.0.18" />
+    <PackageVersion Include="Avalonia.Svg" Version="11.0.0.16" />
+    <PackageVersion Include="Avalonia.Svg.Skia" Version="11.0.0.16" />
     <PackageVersion Include="CommandLineParser" Version="2.9.1" />
-    <PackageVersion Include="Concentus" Version="2.2.0" />
+    <PackageVersion Include="Concentus" Version="1.1.7" />
     <PackageVersion Include="DiscordRichPresence" Version="1.2.1.24" />
     <PackageVersion Include="DynamicData" Version="8.4.1" />
     <PackageVersion Include="FluentAvaloniaUI" Version="2.0.5" />
@@ -49,4 +49,4 @@
     <PackageVersion Include="System.Management" Version="8.0.0" />
     <PackageVersion Include="UnicornEngine.Unicorn" Version="2.0.2-rc1-fb78016" />
   </ItemGroup>
-</Project>
+</Project>

README.md

@@ -36,8 +36,8 @@
 
 ## Compatibility
 
-As of May 2024, Ryujinx has been tested on approximately 4,300 titles;
-over 4,100 boot past menus and into gameplay, with roughly 3,550 of those being considered playable.
+As of October 2023, Ryujinx has been tested on approximately 4,200 titles;
+over 4,150 boot past menus and into gameplay, with roughly 3,500 of those being considered playable.
 
 You can check out the compatibility list [here](https://github.com/Ryujinx/Ryujinx-Games-List/issues).
 

Ryujinx.sln.DotSettings

@@ -4,8 +4,6 @@
 	<s:String x:Key="/Default/CodeStyle/CSharpVarKeywordUsage/ForOtherTypes/@EntryValue">UseExplicitType</s:String>
 	<s:String x:Key="/Default/CodeStyle/CSharpVarKeywordUsage/ForSimpleTypes/@EntryValue">UseExplicitType</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=TypesAndNamespaces/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb"&gt;&lt;ExtraRule Prefix="I" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=a0b4bc4d_002Dd13b_002D4a37_002Db37e_002Dc9c6864e4302/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Any" AccessRightKinds="Any" Description="Types and namespaces"&gt;&lt;ElementKinds&gt;&lt;Kind Name="NAMESPACE" /&gt;&lt;Kind Name="CLASS" /&gt;&lt;Kind Name="STRUCT" /&gt;&lt;Kind Name="ENUM" /&gt;&lt;Kind Name="DELEGATE" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb"&gt;&lt;ExtraRule Prefix="I" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;&lt;/Policy&gt;</s:String>
-	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EPredefinedNamingRulesToUserRulesUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=ASET/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Astc/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Luma/@EntryIndexedValue">True</s:Boolean>

src/ARMeilleure/Translation/PTC/Ptc.cs

@@ -857,14 +857,8 @@ namespace ARMeilleure.Translation.PTC
 
             Stopwatch sw = Stopwatch.StartNew();
 
-            foreach (var thread in threads)
-            {
-                thread.Start();
-            }
-            foreach (var thread in threads)
-            {
-                thread.Join();
-            }
+            threads.ForEach((thread) => thread.Start());
+            threads.ForEach((thread) => thread.Join());
 
             threads.Clear();
 

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

@@ -15,6 +15,7 @@ namespace Ryujinx.Audio.Renderer.Common
     {
         public const int Align = 0x10;
         public const int BiquadStateOffset = 0x0;
+        public const int BiquadStateSize = 0x10;
 
         /// <summary>
         /// The state of the biquad filters of this voice.

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

@@ -16,15 +16,10 @@ namespace Ryujinx.Audio.Renderer.Dsp
         /// <param name="parameter">The biquad filter parameter</param>
         /// <param name="state">The biquad filter state</param>
         /// <param name="outputBuffer">The output buffer to write the result</param>
-        /// <param name="inputBuffer">The input buffer to read the samples from</param>
+        /// <param name="inputBuffer">The input buffer to write the result</param>
         /// <param name="sampleCount">The count of samples to process</param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void ProcessBiquadFilter(
-            ref BiquadFilterParameter parameter,
-            ref BiquadFilterState state,
-            Span<float> outputBuffer,
-            ReadOnlySpan<float> inputBuffer,
-            uint sampleCount)
+        public static void ProcessBiquadFilter(ref BiquadFilterParameter parameter, ref BiquadFilterState state, Span<float> outputBuffer, ReadOnlySpan<float> inputBuffer, uint sampleCount)
         {
             float a0 = FixedPointHelper.ToFloat(parameter.Numerator[0], FixedPointPrecisionForParameter);
             float a1 = FixedPointHelper.ToFloat(parameter.Numerator[1], FixedPointPrecisionForParameter);
@@ -45,96 +40,6 @@ namespace Ryujinx.Audio.Renderer.Dsp
             }
         }
 
-        /// <summary>
-        /// Apply a single biquad filter and mix the result into the output buffer.
-        /// </summary>
-        /// <remarks>This is implemented with a direct form 1.</remarks>
-        /// <param name="parameter">The biquad filter parameter</param>
-        /// <param name="state">The biquad filter state</param>
-        /// <param name="outputBuffer">The output buffer to write the result</param>
-        /// <param name="inputBuffer">The input buffer to read the samples from</param>
-        /// <param name="sampleCount">The count of samples to process</param>
-        /// <param name="volume">Mix volume</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void ProcessBiquadFilterAndMix(
-            ref BiquadFilterParameter parameter,
-            ref BiquadFilterState state,
-            Span<float> outputBuffer,
-            ReadOnlySpan<float> inputBuffer,
-            uint sampleCount,
-            float volume)
-        {
-            float a0 = FixedPointHelper.ToFloat(parameter.Numerator[0], FixedPointPrecisionForParameter);
-            float a1 = FixedPointHelper.ToFloat(parameter.Numerator[1], FixedPointPrecisionForParameter);
-            float a2 = FixedPointHelper.ToFloat(parameter.Numerator[2], FixedPointPrecisionForParameter);
-
-            float b1 = FixedPointHelper.ToFloat(parameter.Denominator[0], FixedPointPrecisionForParameter);
-            float b2 = FixedPointHelper.ToFloat(parameter.Denominator[1], FixedPointPrecisionForParameter);
-
-            for (int i = 0; i < sampleCount; i++)
-            {
-                float input = inputBuffer[i];
-                float output = input * a0 + state.State0 * a1 + state.State1 * a2 + state.State2 * b1 + state.State3 * b2;
-
-                state.State1 = state.State0;
-                state.State0 = input;
-                state.State3 = state.State2;
-                state.State2 = output;
-
-                outputBuffer[i] += FloatingPointHelper.MultiplyRoundUp(output, volume);
-            }
-        }
-
-        /// <summary>
-        /// Apply a single biquad filter and mix the result into the output buffer with volume ramp.
-        /// </summary>
-        /// <remarks>This is implemented with a direct form 1.</remarks>
-        /// <param name="parameter">The biquad filter parameter</param>
-        /// <param name="state">The biquad filter state</param>
-        /// <param name="outputBuffer">The output buffer to write the result</param>
-        /// <param name="inputBuffer">The input buffer to read the samples from</param>
-        /// <param name="sampleCount">The count of samples to process</param>
-        /// <param name="volume">Initial mix volume</param>
-        /// <param name="ramp">Volume increment step</param>
-        /// <returns>Last filtered sample value</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static float ProcessBiquadFilterAndMixRamp(
-            ref BiquadFilterParameter parameter,
-            ref BiquadFilterState state,
-            Span<float> outputBuffer,
-            ReadOnlySpan<float> inputBuffer,
-            uint sampleCount,
-            float volume,
-            float ramp)
-        {
-            float a0 = FixedPointHelper.ToFloat(parameter.Numerator[0], FixedPointPrecisionForParameter);
-            float a1 = FixedPointHelper.ToFloat(parameter.Numerator[1], FixedPointPrecisionForParameter);
-            float a2 = FixedPointHelper.ToFloat(parameter.Numerator[2], FixedPointPrecisionForParameter);
-
-            float b1 = FixedPointHelper.ToFloat(parameter.Denominator[0], FixedPointPrecisionForParameter);
-            float b2 = FixedPointHelper.ToFloat(parameter.Denominator[1], FixedPointPrecisionForParameter);
-
-            float mixState = 0f;
-
-            for (int i = 0; i < sampleCount; i++)
-            {
-                float input = inputBuffer[i];
-                float output = input * a0 + state.State0 * a1 + state.State1 * a2 + state.State2 * b1 + state.State3 * b2;
-
-                state.State1 = state.State0;
-                state.State0 = input;
-                state.State3 = state.State2;
-                state.State2 = output;
-
-                mixState = FloatingPointHelper.MultiplyRoundUp(output, volume);
-
-                outputBuffer[i] += mixState;
-                volume += ramp;
-            }
-
-            return mixState;
-        }
-
         /// <summary>
         /// Apply multiple biquad filter.
         /// </summary>
@@ -142,15 +47,10 @@ namespace Ryujinx.Audio.Renderer.Dsp
         /// <param name="parameters">The biquad filter parameter</param>
         /// <param name="states">The biquad filter state</param>
         /// <param name="outputBuffer">The output buffer to write the result</param>
-        /// <param name="inputBuffer">The input buffer to read the samples from</param>
+        /// <param name="inputBuffer">The input buffer to write the result</param>
         /// <param name="sampleCount">The count of samples to process</param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void ProcessBiquadFilter(
-            ReadOnlySpan<BiquadFilterParameter> parameters,
-            Span<BiquadFilterState> states,
-            Span<float> outputBuffer,
-            ReadOnlySpan<float> inputBuffer,
-            uint sampleCount)
+        public static void ProcessBiquadFilter(ReadOnlySpan<BiquadFilterParameter> parameters, Span<BiquadFilterState> states, Span<float> outputBuffer, ReadOnlySpan<float> inputBuffer, uint sampleCount)
         {
             for (int stageIndex = 0; stageIndex < parameters.Length; stageIndex++)
             {
@@ -167,7 +67,7 @@ namespace Ryujinx.Audio.Renderer.Dsp
 
                 for (int i = 0; i < sampleCount; i++)
                 {
-                    float input = stageIndex != 0 ? outputBuffer[i] : inputBuffer[i];
+                    float input = inputBuffer[i];
                     float output = input * a0 + state.State0 * a1 + state.State1 * a2 + state.State2 * b1 + state.State3 * b2;
 
                     state.State1 = state.State0;
@@ -179,129 +79,5 @@ namespace Ryujinx.Audio.Renderer.Dsp
                 }
             }
         }
-
-        /// <summary>
-        /// Apply double biquad filter and mix the result into the output buffer.
-        /// </summary>
-        /// <remarks>This is implemented with a direct form 1.</remarks>
-        /// <param name="parameters">The biquad filter parameter</param>
-        /// <param name="states">The biquad filter state</param>
-        /// <param name="outputBuffer">The output buffer to write the result</param>
-        /// <param name="inputBuffer">The input buffer to read the samples from</param>
-        /// <param name="sampleCount">The count of samples to process</param>
-        /// <param name="volume">Mix volume</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void ProcessDoubleBiquadFilterAndMix(
-            ref BiquadFilterParameter parameter0,
-            ref BiquadFilterParameter parameter1,
-            ref BiquadFilterState state0,
-            ref BiquadFilterState state1,
-            Span<float> outputBuffer,
-            ReadOnlySpan<float> inputBuffer,
-            uint sampleCount,
-            float volume)
-        {
-            float a00 = FixedPointHelper.ToFloat(parameter0.Numerator[0], FixedPointPrecisionForParameter);
-            float a10 = FixedPointHelper.ToFloat(parameter0.Numerator[1], FixedPointPrecisionForParameter);
-            float a20 = FixedPointHelper.ToFloat(parameter0.Numerator[2], FixedPointPrecisionForParameter);
-
-            float b10 = FixedPointHelper.ToFloat(parameter0.Denominator[0], FixedPointPrecisionForParameter);
-            float b20 = FixedPointHelper.ToFloat(parameter0.Denominator[1], FixedPointPrecisionForParameter);
-
-            float a01 = FixedPointHelper.ToFloat(parameter1.Numerator[0], FixedPointPrecisionForParameter);
-            float a11 = FixedPointHelper.ToFloat(parameter1.Numerator[1], FixedPointPrecisionForParameter);
-            float a21 = FixedPointHelper.ToFloat(parameter1.Numerator[2], FixedPointPrecisionForParameter);
-
-            float b11 = FixedPointHelper.ToFloat(parameter1.Denominator[0], FixedPointPrecisionForParameter);
-            float b21 = FixedPointHelper.ToFloat(parameter1.Denominator[1], FixedPointPrecisionForParameter);
-
-            for (int i = 0; i < sampleCount; i++)
-            {
-                float input = inputBuffer[i];
-                float output = input * a00 + state0.State0 * a10 + state0.State1 * a20 + state0.State2 * b10 + state0.State3 * b20;
-
-                state0.State1 = state0.State0;
-                state0.State0 = input;
-                state0.State3 = state0.State2;
-                state0.State2 = output;
-
-                input = output;
-                output = input * a01 + state1.State0 * a11 + state1.State1 * a21 + state1.State2 * b11 + state1.State3 * b21;
-
-                state1.State1 = state1.State0;
-                state1.State0 = input;
-                state1.State3 = state1.State2;
-                state1.State2 = output;
-
-                outputBuffer[i] += FloatingPointHelper.MultiplyRoundUp(output, volume);
-            }
-        }
-
-        /// <summary>
-        /// Apply double biquad filter and mix the result into the output buffer with volume ramp.
-        /// </summary>
-        /// <remarks>This is implemented with a direct form 1.</remarks>
-        /// <param name="parameters">The biquad filter parameter</param>
-        /// <param name="states">The biquad filter state</param>
-        /// <param name="outputBuffer">The output buffer to write the result</param>
-        /// <param name="inputBuffer">The input buffer to read the samples from</param>
-        /// <param name="sampleCount">The count of samples to process</param>
-        /// <param name="volume">Initial mix volume</param>
-        /// <param name="ramp">Volume increment step</param>
-        /// <returns>Last filtered sample value</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static float ProcessDoubleBiquadFilterAndMixRamp(
-            ref BiquadFilterParameter parameter0,
-            ref BiquadFilterParameter parameter1,
-            ref BiquadFilterState state0,
-            ref BiquadFilterState state1,
-            Span<float> outputBuffer,
-            ReadOnlySpan<float> inputBuffer,
-            uint sampleCount,
-            float volume,
-            float ramp)
-        {
-            float a00 = FixedPointHelper.ToFloat(parameter0.Numerator[0], FixedPointPrecisionForParameter);
-            float a10 = FixedPointHelper.ToFloat(parameter0.Numerator[1], FixedPointPrecisionForParameter);
-            float a20 = FixedPointHelper.ToFloat(parameter0.Numerator[2], FixedPointPrecisionForParameter);
-
-            float b10 = FixedPointHelper.ToFloat(parameter0.Denominator[0], FixedPointPrecisionForParameter);
-            float b20 = FixedPointHelper.ToFloat(parameter0.Denominator[1], FixedPointPrecisionForParameter);
-
-            float a01 = FixedPointHelper.ToFloat(parameter1.Numerator[0], FixedPointPrecisionForParameter);
-            float a11 = FixedPointHelper.ToFloat(parameter1.Numerator[1], FixedPointPrecisionForParameter);
-            float a21 = FixedPointHelper.ToFloat(parameter1.Numerator[2], FixedPointPrecisionForParameter);
-
-            float b11 = FixedPointHelper.ToFloat(parameter1.Denominator[0], FixedPointPrecisionForParameter);
-            float b21 = FixedPointHelper.ToFloat(parameter1.Denominator[1], FixedPointPrecisionForParameter);
-
-            float mixState = 0f;
-
-            for (int i = 0; i < sampleCount; i++)
-            {
-                float input = inputBuffer[i];
-                float output = input * a00 + state0.State0 * a10 + state0.State1 * a20 + state0.State2 * b10 + state0.State3 * b20;
-
-                state0.State1 = state0.State0;
-                state0.State0 = input;
-                state0.State3 = state0.State2;
-                state0.State2 = output;
-
-                input = output;
-                output = input * a01 + state1.State0 * a11 + state1.State1 * a21 + state1.State2 * b11 + state1.State3 * b21;
-
-                state1.State1 = state1.State0;
-                state1.State0 = input;
-                state1.State3 = state1.State2;
-                state1.State2 = output;
-
-                mixState = FloatingPointHelper.MultiplyRoundUp(output, volume);
-
-                outputBuffer[i] += mixState;
-                volume += ramp;
-            }
-
-            return mixState;
-        }
     }
 }

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

@@ -1,123 +0,0 @@
-using Ryujinx.Audio.Renderer.Common;
-using Ryujinx.Audio.Renderer.Dsp.State;
-using Ryujinx.Audio.Renderer.Parameter;
-using System;
-
-namespace Ryujinx.Audio.Renderer.Dsp.Command
-{
-    public class BiquadFilterAndMixCommand : ICommand
-    {
-        public bool Enabled { get; set; }
-
-        public int NodeId { get; }
-
-        public CommandType CommandType => CommandType.BiquadFilterAndMix;
-
-        public uint EstimatedProcessingTime { get; set; }
-
-        public ushort InputBufferIndex { get; }
-        public ushort OutputBufferIndex { get; }
-
-        private BiquadFilterParameter _parameter;
-
-        public Memory<BiquadFilterState> BiquadFilterState { get; }
-        public Memory<BiquadFilterState> PreviousBiquadFilterState { get; }
-
-        public Memory<VoiceUpdateState> State { get; }
-
-        public int LastSampleIndex { get; }
-
-        public float Volume0 { get; }
-        public float Volume1 { get; }
-
-        public bool NeedInitialization { get; }
-        public bool HasVolumeRamp { get; }
-        public bool IsFirstMixBuffer { get; }
-
-        public BiquadFilterAndMixCommand(
-            float volume0,
-            float volume1,
-            uint inputBufferIndex,
-            uint outputBufferIndex,
-            int lastSampleIndex,
-            Memory<VoiceUpdateState> state,
-            ref BiquadFilterParameter filter,
-            Memory<BiquadFilterState> biquadFilterState,
-            Memory<BiquadFilterState> previousBiquadFilterState,
-            bool needInitialization,
-            bool hasVolumeRamp,
-            bool isFirstMixBuffer,
-            int nodeId)
-        {
-            Enabled = true;
-            NodeId = nodeId;
-
-            InputBufferIndex = (ushort)inputBufferIndex;
-            OutputBufferIndex = (ushort)outputBufferIndex;
-
-            _parameter = filter;
-            BiquadFilterState = biquadFilterState;
-            PreviousBiquadFilterState = previousBiquadFilterState;
-
-            State = state;
-            LastSampleIndex = lastSampleIndex;
-
-            Volume0 = volume0;
-            Volume1 = volume1;
-
-            NeedInitialization = needInitialization;
-            HasVolumeRamp = hasVolumeRamp;
-            IsFirstMixBuffer = isFirstMixBuffer;
-        }
-
-        public void Process(CommandList context)
-        {
-            ReadOnlySpan<float> inputBuffer = context.GetBuffer(InputBufferIndex);
-            Span<float> outputBuffer = context.GetBuffer(OutputBufferIndex);
-
-            if (NeedInitialization)
-            {
-                // If there is no previous state, initialize to zero.
-
-                BiquadFilterState.Span[0] = new BiquadFilterState();
-            }
-            else if (IsFirstMixBuffer)
-            {
-                // This is the first buffer, set previous state to current state.
-
-                PreviousBiquadFilterState.Span[0] = BiquadFilterState.Span[0];
-            }
-            else
-            {
-                // Rewind the current state by copying back the previous state.
-
-                BiquadFilterState.Span[0] = PreviousBiquadFilterState.Span[0];
-            }
-
-            if (HasVolumeRamp)
-            {
-                float volume = Volume0;
-                float ramp = (Volume1 - Volume0) / (int)context.SampleCount;
-
-                State.Span[0].LastSamples[LastSampleIndex] = BiquadFilterHelper.ProcessBiquadFilterAndMixRamp(
-                    ref _parameter,
-                    ref BiquadFilterState.Span[0],
-                    outputBuffer,
-                    inputBuffer,
-                    context.SampleCount,
-                    volume,
-                    ramp);
-            }
-            else
-            {
-                BiquadFilterHelper.ProcessBiquadFilterAndMix(
-                    ref _parameter,
-                    ref BiquadFilterState.Span[0],
-                    outputBuffer,
-                    inputBuffer,
-                    context.SampleCount,
-                    Volume1);
-            }
-        }
-    }
-}

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

@@ -30,10 +30,8 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
         CopyMixBuffer,
         LimiterVersion1,
         LimiterVersion2,
-        MultiTapBiquadFilter,
+        GroupedBiquadFilter,
         CaptureBuffer,
         Compressor,
-        BiquadFilterAndMix,
-        MultiTapBiquadFilterAndMix,
     }
 }

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

@@ -4,13 +4,13 @@ using System;
 
 namespace Ryujinx.Audio.Renderer.Dsp.Command
 {
-    public class MultiTapBiquadFilterCommand : ICommand
+    public class GroupedBiquadFilterCommand : ICommand
     {
         public bool Enabled { get; set; }
 
         public int NodeId { get; }
 
-        public CommandType CommandType => CommandType.MultiTapBiquadFilter;
+        public CommandType CommandType => CommandType.GroupedBiquadFilter;
 
         public uint EstimatedProcessingTime { get; set; }
 
@@ -20,7 +20,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
         private readonly int _outputBufferIndex;
         private readonly bool[] _isInitialized;
 
-        public MultiTapBiquadFilterCommand(int baseIndex, ReadOnlySpan<BiquadFilterParameter> filters, Memory<BiquadFilterState> biquadFilterStateMemory, int inputBufferOffset, int outputBufferOffset, ReadOnlySpan<bool> isInitialized, int nodeId)
+        public GroupedBiquadFilterCommand(int baseIndex, ReadOnlySpan<BiquadFilterParameter> filters, Memory<BiquadFilterState> biquadFilterStateMemory, int inputBufferOffset, int outputBufferOffset, ReadOnlySpan<bool> isInitialized, int nodeId)
         {
             _parameters = filters.ToArray();
             _biquadFilterStates = biquadFilterStateMemory;

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

@@ -24,14 +24,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
 
         public Memory<VoiceUpdateState> State { get; }
 
-        public MixRampGroupedCommand(
-            uint mixBufferCount,
-            uint inputBufferIndex,
-            uint outputBufferIndex,
-            ReadOnlySpan<float> volume0,
-            ReadOnlySpan<float> volume1,
-            Memory<VoiceUpdateState> state,
-            int nodeId)
+        public MixRampGroupedCommand(uint mixBufferCount, uint inputBufferIndex, uint outputBufferIndex, Span<float> volume0, Span<float> volume1, Memory<VoiceUpdateState> state, int nodeId)
         {
             Enabled = true;
             MixBufferCount = mixBufferCount;
@@ -55,12 +48,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static float ProcessMixRampGrouped(
-            Span<float> outputBuffer,
-            ReadOnlySpan<float> inputBuffer,
-            float volume0,
-            float volume1,
-            int sampleCount)
+        private static float ProcessMixRampGrouped(Span<float> outputBuffer, ReadOnlySpan<float> inputBuffer, float volume0, float volume1, int sampleCount)
         {
             float ramp = (volume1 - volume0) / sampleCount;
             float volume = volume0;

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

@@ -1,145 +0,0 @@
-using Ryujinx.Audio.Renderer.Common;
-using Ryujinx.Audio.Renderer.Dsp.State;
-using Ryujinx.Audio.Renderer.Parameter;
-using System;
-
-namespace Ryujinx.Audio.Renderer.Dsp.Command
-{
-    public class MultiTapBiquadFilterAndMixCommand : ICommand
-    {
-        public bool Enabled { get; set; }
-
-        public int NodeId { get; }
-
-        public CommandType CommandType => CommandType.MultiTapBiquadFilterAndMix;
-
-        public uint EstimatedProcessingTime { get; set; }
-
-        public ushort InputBufferIndex { get; }
-        public ushort OutputBufferIndex { get; }
-
-        private BiquadFilterParameter _parameter0;
-        private BiquadFilterParameter _parameter1;
-
-        public Memory<BiquadFilterState> BiquadFilterState0 { get; }
-        public Memory<BiquadFilterState> BiquadFilterState1 { get; }
-        public Memory<BiquadFilterState> PreviousBiquadFilterState0 { get; }
-        public Memory<BiquadFilterState> PreviousBiquadFilterState1 { get; }
-
-        public Memory<VoiceUpdateState> State { get; }
-
-        public int LastSampleIndex { get; }
-
-        public float Volume0 { get; }
-        public float Volume1 { get; }
-
-        public bool NeedInitialization0 { get; }
-        public bool NeedInitialization1 { get; }
-        public bool HasVolumeRamp { get; }
-        public bool IsFirstMixBuffer { get; }
-
-        public MultiTapBiquadFilterAndMixCommand(
-            float volume0,
-            float volume1,
-            uint inputBufferIndex,
-            uint outputBufferIndex,
-            int lastSampleIndex,
-            Memory<VoiceUpdateState> state,
-            ref BiquadFilterParameter filter0,
-            ref BiquadFilterParameter filter1,
-            Memory<BiquadFilterState> biquadFilterState0,
-            Memory<BiquadFilterState> biquadFilterState1,
-            Memory<BiquadFilterState> previousBiquadFilterState0,
-            Memory<BiquadFilterState> previousBiquadFilterState1,
-            bool needInitialization0,
-            bool needInitialization1,
-            bool hasVolumeRamp,
-            bool isFirstMixBuffer,
-            int nodeId)
-        {
-            Enabled = true;
-            NodeId = nodeId;
-
-            InputBufferIndex = (ushort)inputBufferIndex;
-            OutputBufferIndex = (ushort)outputBufferIndex;
-
-            _parameter0 = filter0;
-            _parameter1 = filter1;
-            BiquadFilterState0 = biquadFilterState0;
-            BiquadFilterState1 = biquadFilterState1;
-            PreviousBiquadFilterState0 = previousBiquadFilterState0;
-            PreviousBiquadFilterState1 = previousBiquadFilterState1;
-
-            State = state;
-            LastSampleIndex = lastSampleIndex;
-
-            Volume0 = volume0;
-            Volume1 = volume1;
-
-            NeedInitialization0 = needInitialization0;
-            NeedInitialization1 = needInitialization1;
-            HasVolumeRamp = hasVolumeRamp;
-            IsFirstMixBuffer = isFirstMixBuffer;
-        }
-
-        private void UpdateState(Memory<BiquadFilterState> state, Memory<BiquadFilterState> previousState, bool needInitialization)
-        {
-            if (needInitialization)
-            {
-                // If there is no previous state, initialize to zero.
-
-                state.Span[0] = new BiquadFilterState();
-            }
-            else if (IsFirstMixBuffer)
-            {
-                // This is the first buffer, set previous state to current state.
-
-                previousState.Span[0] = state.Span[0];
-            }
-            else
-            {
-                // Rewind the current state by copying back the previous state.
-
-                state.Span[0] = previousState.Span[0];
-            }
-        }
-
-        public void Process(CommandList context)
-        {
-            ReadOnlySpan<float> inputBuffer = context.GetBuffer(InputBufferIndex);
-            Span<float> outputBuffer = context.GetBuffer(OutputBufferIndex);
-
-            UpdateState(BiquadFilterState0, PreviousBiquadFilterState0, NeedInitialization0);
-            UpdateState(BiquadFilterState1, PreviousBiquadFilterState1, NeedInitialization1);
-
-            if (HasVolumeRamp)
-            {
-                float volume = Volume0;
-                float ramp = (Volume1 - Volume0) / (int)context.SampleCount;
-
-                State.Span[0].LastSamples[LastSampleIndex] = BiquadFilterHelper.ProcessDoubleBiquadFilterAndMixRamp(
-                    ref _parameter0,
-                    ref _parameter1,
-                    ref BiquadFilterState0.Span[0],
-                    ref BiquadFilterState1.Span[0],
-                    outputBuffer,
-                    inputBuffer,
-                    context.SampleCount,
-                    volume,
-                    ramp);
-            }
-            else
-            {
-                BiquadFilterHelper.ProcessDoubleBiquadFilterAndMix(
-                    ref _parameter0,
-                    ref _parameter1,
-                    ref BiquadFilterState0.Span[0],
-                    ref BiquadFilterState1.Span[0],
-                    outputBuffer,
-                    inputBuffer,
-                    context.SampleCount,
-                    Volume1);
-            }
-        }
-    }
-}

src/Ryujinx.Audio/Renderer/Dsp/State/BiquadFilterState.cs

@@ -2,16 +2,12 @@ using System.Runtime.InteropServices;
 
 namespace Ryujinx.Audio.Renderer.Dsp.State
 {
-    [StructLayout(LayoutKind.Sequential, Pack = 1, Size = 0x20)]
+    [StructLayout(LayoutKind.Sequential, Pack = 1, Size = 0x10)]
     public struct BiquadFilterState
     {
         public float State0;
         public float State1;
         public float State2;
         public float State3;
-        public float State4;
-        public float State5;
-        public float State6;
-        public float State7;
     }
 }

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

@@ -1,43 +0,0 @@
-using Ryujinx.Common.Memory;
-using System;
-
-namespace Ryujinx.Audio.Renderer.Parameter
-{
-    /// <summary>
-    /// Generic interface for the splitter destination parameters.
-    /// </summary>
-    public interface ISplitterDestinationInParameter
-    {
-        /// <summary>
-        /// Target splitter destination data id.
-        /// </summary>
-        int Id { get; }
-
-        /// <summary>
-        /// The mix to output the result of the splitter.
-        /// </summary>
-        int DestinationId { get; }
-
-        /// <summary>
-        /// Biquad filter parameters.
-        /// </summary>
-        Array2<BiquadFilterParameter> BiquadFilters { get; }
-
-        /// <summary>
-        /// Set to true if in use.
-        /// </summary>
-        bool IsUsed { get; }
-
-        /// <summary>
-        /// Mix buffer volumes.
-        /// </summary>
-        /// <remarks>Used when a splitter id is specified in the mix.</remarks>
-        Span<float> MixBufferVolume { get; }
-
-        /// <summary>
-        /// Check if the magic is valid.
-        /// </summary>
-        /// <returns>Returns true if the magic is valid.</returns>
-        bool IsMagicValid();
-    }
-}

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

@@ -1,4 +1,3 @@
-using Ryujinx.Common.Memory;
 using Ryujinx.Common.Utilities;
 using System;
 using System.Runtime.InteropServices;
@@ -6,10 +5,10 @@ using System.Runtime.InteropServices;
 namespace Ryujinx.Audio.Renderer.Parameter
 {
     /// <summary>
-    /// Input header for a splitter destination version 1 update.
+    /// Input header for a splitter destination update.
     /// </summary>
     [StructLayout(LayoutKind.Sequential, Pack = 1)]
-    public struct SplitterDestinationInParameterVersion1 : ISplitterDestinationInParameter
+    public struct SplitterDestinationInParameter
     {
         /// <summary>
         /// Magic of the input header.
@@ -42,7 +41,7 @@ namespace Ryujinx.Audio.Renderer.Parameter
         /// </summary>
         private unsafe fixed byte _reserved[3];
 
-        [StructLayout(LayoutKind.Sequential, Size = sizeof(float) * Constants.MixBufferCountMax, Pack = 1)]
+        [StructLayout(LayoutKind.Sequential, Size = 4 * Constants.MixBufferCountMax, Pack = 1)]
         private struct MixArray { }
 
         /// <summary>
@@ -51,14 +50,6 @@ namespace Ryujinx.Audio.Renderer.Parameter
         /// <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<BiquadFilterParameter> ISplitterDestinationInParameter.BiquadFilters => default;
-
-        readonly bool ISplitterDestinationInParameter.IsUsed => IsUsed;
-
         /// <summary>
         /// The expected constant of any input header.
         /// </summary>

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

@@ -1,81 +0,0 @@
-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 SplitterDestinationInParameterVersion2 : 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<BiquadFilterParameter> BiquadFilters;
-
-        /// <summary>
-        /// Set to true if in use.
-        /// </summary>
-        [MarshalAs(UnmanagedType.I1)]
-        public bool IsUsed;
-
-        /// <summary>
-        /// Reserved/padding.
-        /// </summary>
-        private unsafe fixed byte _reserved[11];
-
-        [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<BiquadFilterParameter> ISplitterDestinationInParameter.BiquadFilters => BiquadFilters;
-
-        readonly bool ISplitterDestinationInParameter.IsUsed => IsUsed;
-
-        /// <summary>
-        /// The expected constant of any input header.
-        /// </summary>
-        private const uint ValidMagic = 0x44444E53;
-
-        /// <summary>
-        /// Check if the magic is valid.
-        /// </summary>
-        /// <returns>Returns true if the magic is valid.</returns>
-        public readonly bool IsMagicValid()
-        {
-            return Magic == ValidMagic;
-        }
-    }
-}

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

@@ -1,7 +1,6 @@
 using Ryujinx.Audio.Integration;
 using Ryujinx.Audio.Renderer.Common;
 using Ryujinx.Audio.Renderer.Dsp.Command;
-using Ryujinx.Audio.Renderer.Dsp.State;
 using Ryujinx.Audio.Renderer.Parameter;
 using Ryujinx.Audio.Renderer.Server.Effect;
 using Ryujinx.Audio.Renderer.Server.MemoryPool;
@@ -174,22 +173,6 @@ namespace Ryujinx.Audio.Renderer.Server
                 return ResultCode.WorkBufferTooSmall;
             }
 
-            Memory<BiquadFilterState> splitterBqfStates = Memory<BiquadFilterState>.Empty;
-
-            if (_behaviourContext.IsBiquadFilterParameterForSplitterEnabled() &&
-                parameter.SplitterCount > 0 &&
-                parameter.SplitterDestinationCount > 0)
-            {
-                splitterBqfStates = workBufferAllocator.Allocate<BiquadFilterState>(parameter.SplitterDestinationCount * SplitterContext.BqfStatesPerDestination, 0x10);
-
-                if (splitterBqfStates.IsEmpty)
-                {
-                    return ResultCode.WorkBufferTooSmall;
-                }
-
-                splitterBqfStates.Span.Clear();
-            }
-
             // Invalidate DSP cache on what was currently allocated with workBuffer.
             AudioProcessorMemoryManager.InvalidateDspCache(_dspMemoryPoolState.Translate(workBuffer, workBufferAllocator.Offset), workBufferAllocator.Offset);
 
@@ -309,7 +292,7 @@ namespace Ryujinx.Audio.Renderer.Server
                 state = MemoryPoolState.Create(MemoryPoolState.LocationType.Cpu);
             }
 
-            if (!_splitterContext.Initialize(ref _behaviourContext, ref parameter, workBufferAllocator, splitterBqfStates))
+            if (!_splitterContext.Initialize(ref _behaviourContext, ref parameter, workBufferAllocator))
             {
                 return ResultCode.WorkBufferTooSmall;
             }
@@ -792,13 +775,6 @@ namespace Ryujinx.Audio.Renderer.Server
             // Splitter
             size = SplitterContext.GetWorkBufferSize(size, ref behaviourContext, ref parameter);
 
-            if (behaviourContext.IsBiquadFilterParameterForSplitterEnabled() &&
-                parameter.SplitterCount > 0 &&
-                parameter.SplitterDestinationCount > 0)
-            {
-                size = WorkBufferAllocator.GetTargetSize<BiquadFilterState>(size, parameter.SplitterDestinationCount * SplitterContext.BqfStatesPerDestination, 0x10);
-            }
-
             // DSP Voice
             size = WorkBufferAllocator.GetTargetSize<VoiceUpdateState>(size, parameter.VoiceCount, VoiceUpdateState.Align);
 

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

@@ -45,6 +45,7 @@ namespace Ryujinx.Audio.Renderer.Server
         /// <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.
         /// Additionally, the rendering limit percent was incremented to 80%.
+        ///
         /// </summary>
         /// <remarks>This was added in system update 6.0.0</remarks>
         public const int Revision5 = 5 << 24;
@@ -100,18 +101,10 @@ namespace Ryujinx.Audio.Renderer.Server
         /// <remarks>This was added in system update 14.0.0 but some changes were made in 15.0.0</remarks>
         public const int Revision11 = 11 << 24;
 
-        /// <summary>
-        /// REV12:
-        /// Two new commands were added to for biquad filtering and mixing (with optinal volume ramp) on the same command.
-        /// Splitter destinations can now specify up to two biquad filtering parameters, used for filtering the buffer before mixing.
-        /// </summary>
-        /// <remarks>This was added in system update 17.0.0</remarks>
-        public const int Revision12 = 12 << 24;
-
         /// <summary>
         /// Last revision supported by the implementation.
         /// </summary>
-        public const int LastRevision = Revision12;
+        public const int LastRevision = Revision11;
 
         /// <summary>
         /// Target revision magic supported by the implementation.
@@ -361,7 +354,7 @@ namespace Ryujinx.Audio.Renderer.Server
         /// Check if the audio renderer should use an optimized Biquad Filter (Direct Form 1) in case of two biquad filters are defined on a voice.
         /// </summary>
         /// <returns>True if the audio renderer should use the optimization.</returns>
-        public bool UseMultiTapBiquadFilterProcessing()
+        public bool IsBiquadFilterGroupedOptimizationSupported()
         {
             return CheckFeatureSupported(UserRevision, BaseRevisionMagic + Revision10);
         }
@@ -375,15 +368,6 @@ namespace Ryujinx.Audio.Renderer.Server
             return CheckFeatureSupported(UserRevision, BaseRevisionMagic + Revision11);
         }
 
-        /// <summary>
-        /// Check if the audio renderer should support biquad filter on splitter.
-        /// </summary>
-        /// <returns>True if the audio renderer support biquad filter on splitter</returns>
-        public bool IsBiquadFilterParameterForSplitterEnabled()
-        {
-            return CheckFeatureSupported(UserRevision, BaseRevisionMagic + Revision12);
-        }
-
         /// <summary>
         /// Get the version of the <see cref="ICommandProcessingTimeEstimator"/>.
         /// </summary>

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

@@ -204,7 +204,7 @@ namespace Ryujinx.Audio.Renderer.Server
         }
 
         /// <summary>
-        /// Create a new <see cref="MultiTapBiquadFilterCommand"/>.
+        /// Create a new <see cref="GroupedBiquadFilterCommand"/>.
         /// </summary>
         /// <param name="baseIndex">The base index of the input and output buffer.</param>
         /// <param name="filters">The biquad filter parameters.</param>
@@ -213,9 +213,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 GenerateGroupedBiquadFilter(int baseIndex, ReadOnlySpan<BiquadFilterParameter> filters, Memory<BiquadFilterState> biquadFilterStatesMemory, int inputBufferOffset, int outputBufferOffset, ReadOnlySpan<bool> isInitialized, int nodeId)
         {
-            MultiTapBiquadFilterCommand command = new(baseIndex, filters, biquadFilterStatesMemory, inputBufferOffset, outputBufferOffset, isInitialized, nodeId);
+            GroupedBiquadFilterCommand command = new(baseIndex, filters, biquadFilterStatesMemory, inputBufferOffset, outputBufferOffset, isInitialized, nodeId);
 
             command.EstimatedProcessingTime = _commandProcessingTimeEstimator.Estimate(command);
 
@@ -232,7 +232,7 @@ namespace Ryujinx.Audio.Renderer.Server
         /// <param name="volume">The new volume.</param>
         /// <param name="state">The <see cref="VoiceUpdateState"/> to generate the command from.</param>
         /// <param name="nodeId">The node id associated to this command.</param>
-        public void GenerateMixRampGrouped(uint mixBufferCount, uint inputBufferIndex, uint outputBufferIndex, ReadOnlySpan<float> previousVolume, ReadOnlySpan<float> volume, Memory<VoiceUpdateState> state, int nodeId)
+        public void GenerateMixRampGrouped(uint mixBufferCount, uint inputBufferIndex, uint outputBufferIndex, Span<float> previousVolume, Span<float> volume, Memory<VoiceUpdateState> state, int nodeId)
         {
             MixRampGroupedCommand command = new(mixBufferCount, inputBufferIndex, outputBufferIndex, previousVolume, volume, state, nodeId);
 
@@ -260,120 +260,6 @@ namespace Ryujinx.Audio.Renderer.Server
             AddCommand(command);
         }
 
-        /// <summary>
-        /// Generate a new <see cref="BiquadFilterAndMixCommand"/>.
-        /// </summary>
-        /// <param name="previousVolume">The previous volume.</param>
-        /// <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="filter">The biquad filter parameter.</param>
-        /// <param name="biquadFilterState">The biquad state.</param>
-        /// <param name="previousBiquadFilterState">The previous biquad state.</param>
-        /// <param name="needInitialization">Set to true if the biquad filter state needs to be initialized.</param>
-        /// <param name="hasVolumeRamp">Set to true if the mix has volume ramp, and <paramref name="previousVolume"/> should be taken into account.</param>
-        /// <param name="isFirstMixBuffer">Set to true if the buffer is the first mix buffer.</param>
-        /// <param name="nodeId">The node id associated to this command.</param>
-        public void GenerateBiquadFilterAndMix(
-            float previousVolume,
-            float volume,
-            uint inputBufferIndex,
-            uint outputBufferIndex,
-            int lastSampleIndex,
-            Memory<VoiceUpdateState> state,
-            ref BiquadFilterParameter filter,
-            Memory<BiquadFilterState> biquadFilterState,
-            Memory<BiquadFilterState> previousBiquadFilterState,
-            bool needInitialization,
-            bool hasVolumeRamp,
-            bool isFirstMixBuffer,
-            int nodeId)
-        {
-            BiquadFilterAndMixCommand command = new(
-                previousVolume,
-                volume,
-                inputBufferIndex,
-                outputBufferIndex,
-                lastSampleIndex,
-                state,
-                ref filter,
-                biquadFilterState,
-                previousBiquadFilterState,
-                needInitialization,
-                hasVolumeRamp,
-                isFirstMixBuffer,
-                nodeId);
-
-            command.EstimatedProcessingTime = _commandProcessingTimeEstimator.Estimate(command);
-
-            AddCommand(command);
-        }
-
-        /// <summary>
-        /// Generate a new <see cref="MultiTapBiquadFilterAndMixCommand"/>.
-        /// </summary>
-        /// <param name="previousVolume">The previous volume.</param>
-        /// <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="filter0">First biquad filter parameter.</param>
-        /// <param name="filter1">Second biquad filter parameter.</param>
-        /// <param name="biquadFilterState0">First biquad state.</param>
-        /// <param name="biquadFilterState1">Second biquad state.</param>
-        /// <param name="previousBiquadFilterState0">First previous biquad state.</param>
-        /// <param name="previousBiquadFilterState1">Second previous biquad state.</param>
-        /// <param name="needInitialization0">Set to true if the first biquad filter state needs to be initialized.</param>
-        /// <param name="needInitialization1">Set to true if the second biquad filter state needs to be initialized.</param>
-        /// <param name="hasVolumeRamp">Set to true if the mix has volume ramp, and <paramref name="previousVolume"/> should be taken into account.</param>
-        /// <param name="isFirstMixBuffer">Set to true if the buffer is the first mix buffer.</param>
-        /// <param name="nodeId">The node id associated to this command.</param>
-        public void GenerateMultiTapBiquadFilterAndMix(
-            float previousVolume,
-            float volume,
-            uint inputBufferIndex,
-            uint outputBufferIndex,
-            int lastSampleIndex,
-            Memory<VoiceUpdateState> state,
-            ref BiquadFilterParameter filter0,
-            ref BiquadFilterParameter filter1,
-            Memory<BiquadFilterState> biquadFilterState0,
-            Memory<BiquadFilterState> biquadFilterState1,
-            Memory<BiquadFilterState> previousBiquadFilterState0,
-            Memory<BiquadFilterState> previousBiquadFilterState1,
-            bool needInitialization0,
-            bool needInitialization1,
-            bool hasVolumeRamp,
-            bool isFirstMixBuffer,
-            int nodeId)
-        {
-            MultiTapBiquadFilterAndMixCommand command = new(
-                previousVolume,
-                volume,
-                inputBufferIndex,
-                outputBufferIndex,
-                lastSampleIndex,
-                state,
-                ref filter0,
-                ref filter1,
-                biquadFilterState0,
-                biquadFilterState1,
-                previousBiquadFilterState0,
-                previousBiquadFilterState1,
-                needInitialization0,
-                needInitialization1,
-                hasVolumeRamp,
-                isFirstMixBuffer,
-                nodeId);
-
-            command.EstimatedProcessingTime = _commandProcessingTimeEstimator.Estimate(command);
-
-            AddCommand(command);
-        }
-
         /// <summary>
         /// Generate a new <see cref="DepopForMixBuffersCommand"/>.
         /// </summary>
@@ -382,7 +268,7 @@ namespace Ryujinx.Audio.Renderer.Server
         /// <param name="bufferCount">The buffer count.</param>
         /// <param name="nodeId">The node id associated to this command.</param>
         /// <param name="sampleRate">The target sample rate in use.</param>
-        public void GenerateDepopForMixBuffers(Memory<float> depopBuffer, uint bufferOffset, uint bufferCount, int nodeId, uint sampleRate)
+        public void GenerateDepopForMixBuffersCommand(Memory<float> depopBuffer, uint bufferOffset, uint bufferCount, int nodeId, uint sampleRate)
         {
             DepopForMixBuffersCommand command = new(depopBuffer, bufferOffset, bufferCount, nodeId, sampleRate);
 

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

@@ -12,7 +12,6 @@ using Ryujinx.Audio.Renderer.Server.Voice;
 using Ryujinx.Audio.Renderer.Utils;
 using System;
 using System.Diagnostics;
-using System.Runtime.CompilerServices;
 
 namespace Ryujinx.Audio.Renderer.Server
 {
@@ -47,13 +46,12 @@ namespace Ryujinx.Audio.Renderer.Server
             {
                 ref MixState mix = ref _mixContext.GetState(voiceState.MixId);
 
-                _commandBuffer.GenerateDepopPrepare(
-                    dspState,
-                    _rendererContext.DepopBuffer,
-                    mix.BufferCount,
-                    mix.BufferOffset,
-                    voiceState.NodeId,
-                    voiceState.WasPlaying);
+                _commandBuffer.GenerateDepopPrepare(dspState,
+                                                    _rendererContext.DepopBuffer,
+                                                    mix.BufferCount,
+                                                    mix.BufferOffset,
+                                                    voiceState.NodeId,
+                                                    voiceState.WasPlaying);
             }
             else if (voiceState.SplitterId != Constants.UnusedSplitterId)
             {
@@ -61,13 +59,15 @@ namespace Ryujinx.Audio.Renderer.Server
 
                 while (true)
                 {
-                    SplitterDestination destination = _splitterContext.GetDestination((int)voiceState.SplitterId, destinationId++);
+                    Span<SplitterDestination> destinationSpan = _splitterContext.GetDestination((int)voiceState.SplitterId, destinationId++);
 
-                    if (destination.IsNull)
+                    if (destinationSpan.IsEmpty)
                     {
                         break;
                     }
 
+                    ref SplitterDestination destination = ref destinationSpan[0];
+
                     if (destination.IsConfigured())
                     {
                         int mixId = destination.DestinationId;
@@ -76,13 +76,12 @@ namespace Ryujinx.Audio.Renderer.Server
                         {
                             ref MixState mix = ref _mixContext.GetState(mixId);
 
-                            _commandBuffer.GenerateDepopPrepare(
-                                dspState,
-                                _rendererContext.DepopBuffer,
-                                mix.BufferCount,
-                                mix.BufferOffset,
-                                voiceState.NodeId,
-                                voiceState.WasPlaying);
+                            _commandBuffer.GenerateDepopPrepare(dspState,
+                                                                _rendererContext.DepopBuffer,
+                                                                mix.BufferCount,
+                                                                mix.BufferOffset,
+                                                                voiceState.NodeId,
+                                                                voiceState.WasPlaying);
 
                             destination.MarkAsNeedToUpdateInternalState();
                         }
@@ -96,39 +95,35 @@ namespace Ryujinx.Audio.Renderer.Server
 
                 if (_rendererContext.BehaviourContext.IsWaveBufferVersion2Supported())
                 {
-                    _commandBuffer.GenerateDataSourceVersion2(
-                        ref voiceState,
-                        dspState,
-                        (ushort)_rendererContext.MixBufferCount,
-                        (ushort)channelIndex,
-                        voiceState.NodeId);
+                    _commandBuffer.GenerateDataSourceVersion2(ref voiceState,
+                                                              dspState,
+                                                              (ushort)_rendererContext.MixBufferCount,
+                                                              (ushort)channelIndex,
+                                                              voiceState.NodeId);
                 }
                 else
                 {
                     switch (voiceState.SampleFormat)
                     {
                         case SampleFormat.PcmInt16:
-                            _commandBuffer.GeneratePcmInt16DataSourceVersion1(
-                                ref voiceState,
-                                dspState,
-                                (ushort)_rendererContext.MixBufferCount,
-                                (ushort)channelIndex,
-                                voiceState.NodeId);
+                            _commandBuffer.GeneratePcmInt16DataSourceVersion1(ref voiceState,
+                                                                              dspState,
+                                                                              (ushort)_rendererContext.MixBufferCount,
+                                                                              (ushort)channelIndex,
+                                                                              voiceState.NodeId);
                             break;
                         case SampleFormat.PcmFloat:
-                            _commandBuffer.GeneratePcmFloatDataSourceVersion1(
-                                ref voiceState,
-                                dspState,
-                                (ushort)_rendererContext.MixBufferCount,
-                                (ushort)channelIndex,
-                                voiceState.NodeId);
+                            _commandBuffer.GeneratePcmFloatDataSourceVersion1(ref voiceState,
+                                                                              dspState,
+                                                                              (ushort)_rendererContext.MixBufferCount,
+                                                                              (ushort)channelIndex,
+                                                                              voiceState.NodeId);
                             break;
                         case SampleFormat.Adpcm:
-                            _commandBuffer.GenerateAdpcmDataSourceVersion1(
-                                ref voiceState,
-                                dspState,
-                                (ushort)_rendererContext.MixBufferCount,
-                                voiceState.NodeId);
+                            _commandBuffer.GenerateAdpcmDataSourceVersion1(ref voiceState,
+                                                                           dspState,
+                                                                           (ushort)_rendererContext.MixBufferCount,
+                                                                           voiceState.NodeId);
                             break;
                         default:
                             throw new NotImplementedException($"Unsupported data source {voiceState.SampleFormat}");
@@ -139,14 +134,14 @@ namespace Ryujinx.Audio.Renderer.Server
 
         private void GenerateBiquadFilterForVoice(ref VoiceState voiceState, Memory<VoiceUpdateState> state, int baseIndex, int bufferOffset, int nodeId)
         {
-            bool supportsOptimizedPath = _rendererContext.BehaviourContext.UseMultiTapBiquadFilterProcessing();
+            bool supportsOptimizedPath = _rendererContext.BehaviourContext.IsBiquadFilterGroupedOptimizationSupported();
 
             if (supportsOptimizedPath && voiceState.BiquadFilters[0].Enable && voiceState.BiquadFilters[1].Enable)
             {
-                Memory<byte> biquadStateRawMemory = SpanMemoryManager<byte>.Cast(state)[..(Unsafe.SizeOf<BiquadFilterState>() * Constants.VoiceBiquadFilterCount)];
+                Memory<byte> biquadStateRawMemory = SpanMemoryManager<byte>.Cast(state)[..(VoiceUpdateState.BiquadStateSize * Constants.VoiceBiquadFilterCount)];
                 Memory<BiquadFilterState> stateMemory = SpanMemoryManager<BiquadFilterState>.Cast(biquadStateRawMemory);
 
-                _commandBuffer.GenerateMultiTapBiquadFilter(baseIndex, voiceState.BiquadFilters.AsSpan(), stateMemory, bufferOffset, bufferOffset, voiceState.BiquadFilterNeedInitialization, nodeId);
+                _commandBuffer.GenerateGroupedBiquadFilter(baseIndex, voiceState.BiquadFilters.AsSpan(), stateMemory, bufferOffset, bufferOffset, voiceState.BiquadFilterNeedInitialization, nodeId);
             }
             else
             {
@@ -156,134 +151,33 @@ namespace Ryujinx.Audio.Renderer.Server
 
                     if (filter.Enable)
                     {
-                        Memory<byte> biquadStateRawMemory = SpanMemoryManager<byte>.Cast(state)[..(Unsafe.SizeOf<BiquadFilterState>() * Constants.VoiceBiquadFilterCount)];
+                        Memory<byte> biquadStateRawMemory = SpanMemoryManager<byte>.Cast(state)[..(VoiceUpdateState.BiquadStateSize * Constants.VoiceBiquadFilterCount)];
+
                         Memory<BiquadFilterState> stateMemory = SpanMemoryManager<BiquadFilterState>.Cast(biquadStateRawMemory);
 
-                        _commandBuffer.GenerateBiquadFilter(
-                            baseIndex,
-                            ref filter,
-                            stateMemory.Slice(i, 1),
-                            bufferOffset,
-                            bufferOffset,
-                            !voiceState.BiquadFilterNeedInitialization[i],
-                            nodeId);
+                        _commandBuffer.GenerateBiquadFilter(baseIndex,
+                                                            ref filter,
+                                                            stateMemory.Slice(i, 1),
+                                                            bufferOffset,
+                                                            bufferOffset,
+                                                            !voiceState.BiquadFilterNeedInitialization[i],
+                                                            nodeId);
                     }
                 }
             }
         }
 
-        private void GenerateVoiceMixWithSplitter(
-            SplitterDestination destination,
-            Memory<VoiceUpdateState> state,
-            uint bufferOffset,
-            uint bufferCount,
-            uint bufferIndex,
-            int nodeId)
-        {
-            ReadOnlySpan<float> mixVolumes = destination.MixBufferVolume;
-            ReadOnlySpan<float> previousMixVolumes = destination.PreviousMixBufferVolume;
-
-            ref BiquadFilterParameter bqf0 = ref destination.GetBiquadFilterParameter(0);
-            ref BiquadFilterParameter bqf1 = ref destination.GetBiquadFilterParameter(1);
-
-            Memory<BiquadFilterState> bqfState = _splitterContext.GetBiquadFilterState(destination);
-
-            bool isFirstMixBuffer = true;
-
-            for (int i = 0; i < bufferCount; i++)
-            {
-                float previousMixVolume = previousMixVolumes[i];
-                float mixVolume = mixVolumes[i];
-
-                if (mixVolume != 0.0f || previousMixVolume != 0.0f)
-                {
-                    if (bqf0.Enable && bqf1.Enable)
-                    {
-                        _commandBuffer.GenerateMultiTapBiquadFilterAndMix(
-                            previousMixVolume,
-                            mixVolume,
-                            bufferIndex,
-                            bufferOffset + (uint)i,
-                            i,
-                            state,
-                            ref bqf0,
-                            ref bqf1,
-                            bqfState[..1],
-                            bqfState.Slice(1, 1),
-                            bqfState.Slice(2, 1),
-                            bqfState.Slice(3, 1),
-                            !destination.IsBiquadFilterEnabledPrev(),
-                            !destination.IsBiquadFilterEnabledPrev(),
-                            true,
-                            isFirstMixBuffer,
-                            nodeId);
-
-                        destination.UpdateBiquadFilterEnabledPrev(0);
-                        destination.UpdateBiquadFilterEnabledPrev(1);
-                    }
-                    else if (bqf0.Enable)
-                    {
-                        _commandBuffer.GenerateBiquadFilterAndMix(
-                            previousMixVolume,
-                            mixVolume,
-                            bufferIndex,
-                            bufferOffset + (uint)i,
-                            i,
-                            state,
-                            ref bqf0,
-                            bqfState[..1],
-                            bqfState.Slice(1, 1),
-                            !destination.IsBiquadFilterEnabledPrev(),
-                            true,
-                            isFirstMixBuffer,
-                            nodeId);
-
-                        destination.UpdateBiquadFilterEnabledPrev(0);
-                    }
-                    else if (bqf1.Enable)
-                    {
-                        _commandBuffer.GenerateBiquadFilterAndMix(
-                            previousMixVolume,
-                            mixVolume,
-                            bufferIndex,
-                            bufferOffset + (uint)i,
-                            i,
-                            state,
-                            ref bqf1,
-                            bqfState[..1],
-                            bqfState.Slice(1, 1),
-                            !destination.IsBiquadFilterEnabledPrev(),
-                            true,
-                            isFirstMixBuffer,
-                            nodeId);
-
-                        destination.UpdateBiquadFilterEnabledPrev(1);
-                    }
-
-                    isFirstMixBuffer = false;
-                }
-            }
-        }
-
-        private void GenerateVoiceMix(
-            ReadOnlySpan<float> mixVolumes,
-            ReadOnlySpan<float> previousMixVolumes,
-            Memory<VoiceUpdateState> state,
-            uint bufferOffset,
-            uint bufferCount,
-            uint bufferIndex,
-            int nodeId)
+        private void GenerateVoiceMix(Span<float> mixVolumes, Span<float> previousMixVolumes, Memory<VoiceUpdateState> state, uint bufferOffset, uint bufferCount, uint bufferIndex, int nodeId)
         {
             if (bufferCount > Constants.VoiceChannelCountMax)
             {
-                _commandBuffer.GenerateMixRampGrouped(
-                    bufferCount,
-                    bufferIndex,
-                    bufferOffset,
-                    previousMixVolumes,
-                    mixVolumes,
-                    state,
-                    nodeId);
+                _commandBuffer.GenerateMixRampGrouped(bufferCount,
+                                                      bufferIndex,
+                                                      bufferOffset,
+                                                      previousMixVolumes,
+                                                      mixVolumes,
+                                                      state,
+                                                      nodeId);
             }
             else
             {
@@ -294,14 +188,13 @@ namespace Ryujinx.Audio.Renderer.Server
 
                     if (mixVolume != 0.0f || previousMixVolume != 0.0f)
                     {
-                        _commandBuffer.GenerateMixRamp(
-                            previousMixVolume,
-                            mixVolume,
-                            bufferIndex,
-                            bufferOffset + (uint)i,
-                            i,
-                            state,
-                            nodeId);
+                        _commandBuffer.GenerateMixRamp(previousMixVolume,
+                                                       mixVolume,
+                                                       bufferIndex,
+                                                       bufferOffset + (uint)i,
+                                                       i,
+                                                       state,
+                                                       nodeId);
                     }
                 }
             }
@@ -378,11 +271,10 @@ namespace Ryujinx.Audio.Renderer.Server
                         GeneratePerformance(ref performanceEntry, PerformanceCommand.Type.Start, nodeId);
                     }
 
-                    _commandBuffer.GenerateVolumeRamp(
-                        voiceState.PreviousVolume,
-                        voiceState.Volume,
-                        _rendererContext.MixBufferCount + (uint)channelIndex,
-                        nodeId);
+                    _commandBuffer.GenerateVolumeRamp(voiceState.PreviousVolume,
+                                                      voiceState.Volume,
+                                                      _rendererContext.MixBufferCount + (uint)channelIndex,
+                                                      nodeId);
 
                     if (performanceInitialized)
                     {
@@ -399,13 +291,15 @@ namespace Ryujinx.Audio.Renderer.Server
 
                             while (true)
                             {
-                                SplitterDestination destination = _splitterContext.GetDestination((int)voiceState.SplitterId, destinationId);
+                                Span<SplitterDestination> destinationSpan = _splitterContext.GetDestination((int)voiceState.SplitterId, destinationId);
 
-                                if (destination.IsNull)
+                                if (destinationSpan.IsEmpty)
                                 {
                                     break;
                                 }
 
+                                ref SplitterDestination destination = ref destinationSpan[0];
+
                                 destinationId += (int)channelsCount;
 
                                 if (destination.IsConfigured())
@@ -416,27 +310,13 @@ namespace Ryujinx.Audio.Renderer.Server
                                     {
                                         ref MixState mix = ref _mixContext.GetState(mixId);
 
-                                        if (destination.IsBiquadFilterEnabled())
-                                        {
-                                            GenerateVoiceMixWithSplitter(
-                                                destination,
-                                                dspStateMemory,
-                                                mix.BufferOffset,
-                                                mix.BufferCount,
-                                                _rendererContext.MixBufferCount + (uint)channelIndex,
-                                                nodeId);
-                                        }
-                                        else
-                                        {
-                                            GenerateVoiceMix(
-                                                destination.MixBufferVolume,
-                                                destination.PreviousMixBufferVolume,
-                                                dspStateMemory,
-                                                mix.BufferOffset,
-                                                mix.BufferCount,
-                                                _rendererContext.MixBufferCount + (uint)channelIndex,
-                                                nodeId);
-                                        }
+                                        GenerateVoiceMix(destination.MixBufferVolume,
+                                                         destination.PreviousMixBufferVolume,
+                                                         dspStateMemory,
+                                                         mix.BufferOffset,
+                                                         mix.BufferCount,
+                                                         _rendererContext.MixBufferCount + (uint)channelIndex,
+                                                         nodeId);
 
                                         destination.MarkAsNeedToUpdateInternalState();
                                     }
@@ -457,14 +337,13 @@ namespace Ryujinx.Audio.Renderer.Server
                             GeneratePerformance(ref performanceEntry, PerformanceCommand.Type.Start, nodeId);
                         }
 
-                        GenerateVoiceMix(
-                            channelResource.Mix.AsSpan(),
-                            channelResource.PreviousMix.AsSpan(),
-                            dspStateMemory,
-                            mix.BufferOffset,
-                            mix.BufferCount,
-                            _rendererContext.MixBufferCount + (uint)channelIndex,
-                            nodeId);
+                        GenerateVoiceMix(channelResource.Mix.AsSpan(),
+                                         channelResource.PreviousMix.AsSpan(),
+                                         dspStateMemory,
+                                         mix.BufferOffset,
+                                         mix.BufferCount,
+                                         _rendererContext.MixBufferCount + (uint)channelIndex,
+                                         nodeId);
 
                         if (performanceInitialized)
                         {
@@ -530,11 +409,10 @@ namespace Ryujinx.Audio.Renderer.Server
                 {
                     if (effect.Parameter.Volumes[i] != 0.0f)
                     {
-                        _commandBuffer.GenerateMix(
-                            (uint)bufferOffset + effect.Parameter.Input[i],
-                            (uint)bufferOffset + effect.Parameter.Output[i],
-                            nodeId,
-                            effect.Parameter.Volumes[i]);
+                        _commandBuffer.GenerateMix((uint)bufferOffset + effect.Parameter.Input[i],
+                                                   (uint)bufferOffset + effect.Parameter.Output[i],
+                                                   nodeId,
+                                                   effect.Parameter.Volumes[i]);
                     }
                 }
             }
@@ -569,18 +447,17 @@ namespace Ryujinx.Audio.Renderer.Server
                         updateCount = newUpdateCount;
                     }
 
-                    _commandBuffer.GenerateAuxEffect(
-                        bufferOffset,
-                        effect.Parameter.Input[i],
-                        effect.Parameter.Output[i],
-                        ref effect.State,
-                        effect.IsEnabled,
-                        effect.Parameter.BufferStorageSize,
-                        effect.State.SendBufferInfoBase,
-                        effect.State.ReturnBufferInfoBase,
-                        updateCount,
-                        writeOffset,
-                        nodeId);
+                    _commandBuffer.GenerateAuxEffect(bufferOffset,
+                                                     effect.Parameter.Input[i],
+                                                     effect.Parameter.Output[i],
+                                                     ref effect.State,
+                                                     effect.IsEnabled,
+                                                     effect.Parameter.BufferStorageSize,
+                                                     effect.State.SendBufferInfoBase,
+                                                     effect.State.ReturnBufferInfoBase,
+                                                     updateCount,
+                                                     writeOffset,
+                                                     nodeId);
 
                     writeOffset = newUpdateCount;
 
@@ -623,7 +500,7 @@ 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.BehaviourContext.IsBiquadFilterEffectStateClearBugFixed());
 
                 BiquadFilterParameter parameter = new()
                 {
@@ -635,14 +512,11 @@ namespace Ryujinx.Audio.Renderer.Server
 
                 for (int i = 0; i < effect.Parameter.ChannelCount; i++)
                 {
-                    _commandBuffer.GenerateBiquadFilter(
-                        (int)bufferOffset,
-                        ref parameter,
-                        effect.State.Slice(i, 1),
-                        effect.Parameter.Input[i],
-                        effect.Parameter.Output[i],
-                        needInitialization,
-                        nodeId);
+                    _commandBuffer.GenerateBiquadFilter((int)bufferOffset, ref parameter, effect.State.Slice(i, 1),
+                                                        effect.Parameter.Input[i],
+                                                        effect.Parameter.Output[i],
+                                                        needInitialization,
+                                                        nodeId);
                 }
             }
             else
@@ -717,16 +591,15 @@ namespace Ryujinx.Audio.Renderer.Server
                         updateCount = newUpdateCount;
                     }
 
-                    _commandBuffer.GenerateCaptureEffect(
-                        bufferOffset,
-                        effect.Parameter.Input[i],
-                        effect.State.SendBufferInfo,
-                        effect.IsEnabled,
-                        effect.Parameter.BufferStorageSize,
-                        effect.State.SendBufferInfoBase,
-                        updateCount,
-                        writeOffset,
-                        nodeId);
+                    _commandBuffer.GenerateCaptureEffect(bufferOffset,
+                                                         effect.Parameter.Input[i],
+                                                         effect.State.SendBufferInfo,
+                                                         effect.IsEnabled,
+                                                         effect.Parameter.BufferStorageSize,
+                                                         effect.State.SendBufferInfoBase,
+                                                         updateCount,
+                                                         writeOffset,
+                                                         nodeId);
 
                     writeOffset = newUpdateCount;
 
@@ -739,12 +612,11 @@ namespace Ryujinx.Audio.Renderer.Server
         {
             Debug.Assert(effect.Type == EffectType.Compressor);
 
-            _commandBuffer.GenerateCompressorEffect(
-                bufferOffset,
-                effect.Parameter,
-                effect.State,
-                effect.IsEnabled,
-                nodeId);
+            _commandBuffer.GenerateCompressorEffect(bufferOffset,
+                                                    effect.Parameter,
+                                                    effect.State,
+                                                    effect.IsEnabled,
+                                                    nodeId);
         }
 
         private void GenerateEffect(ref MixState mix, int effectId, BaseEffect effect)
@@ -757,11 +629,8 @@ namespace Ryujinx.Audio.Renderer.Server
 
             bool performanceInitialized = false;
 
-            if (_performanceManager != null && _performanceManager.GetNextEntry(
-                out performanceEntry,
-                effect.GetPerformanceDetailType(),
-                isFinalMix ? PerformanceEntryType.FinalMix : PerformanceEntryType.SubMix,
-                nodeId))
+            if (_performanceManager != null && _performanceManager.GetNextEntry(out performanceEntry, effect.GetPerformanceDetailType(),
+                                                isFinalMix ? PerformanceEntryType.FinalMix : PerformanceEntryType.SubMix, nodeId))
             {
                 performanceInitialized = true;
 
@@ -837,85 +706,6 @@ namespace Ryujinx.Audio.Renderer.Server
             }
         }
 
-        private void GenerateMixWithSplitter(
-            uint inputBufferIndex,
-            uint outputBufferIndex,
-            float volume,
-            SplitterDestination destination,
-            ref bool isFirstMixBuffer,
-            int nodeId)
-        {
-            ref BiquadFilterParameter bqf0 = ref destination.GetBiquadFilterParameter(0);
-            ref BiquadFilterParameter bqf1 = ref destination.GetBiquadFilterParameter(1);
-
-            Memory<BiquadFilterState> bqfState = _splitterContext.GetBiquadFilterState(destination);
-
-            if (bqf0.Enable && bqf1.Enable)
-            {
-                _commandBuffer.GenerateMultiTapBiquadFilterAndMix(
-                    0f,
-                    volume,
-                    inputBufferIndex,
-                    outputBufferIndex,
-                    0,
-                    Memory<VoiceUpdateState>.Empty,
-                    ref bqf0,
-                    ref bqf1,
-                    bqfState[..1],
-                    bqfState.Slice(1, 1),
-                    bqfState.Slice(2, 1),
-                    bqfState.Slice(3, 1),
-                    !destination.IsBiquadFilterEnabledPrev(),
-                    !destination.IsBiquadFilterEnabledPrev(),
-                    false,
-                    isFirstMixBuffer,
-                    nodeId);
-
-                destination.UpdateBiquadFilterEnabledPrev(0);
-                destination.UpdateBiquadFilterEnabledPrev(1);
-            }
-            else if (bqf0.Enable)
-            {
-                _commandBuffer.GenerateBiquadFilterAndMix(
-                    0f,
-                    volume,
-                    inputBufferIndex,
-                    outputBufferIndex,
-                    0,
-                    Memory<VoiceUpdateState>.Empty,
-                    ref bqf0,
-                    bqfState[..1],
-                    bqfState.Slice(1, 1),
-                    !destination.IsBiquadFilterEnabledPrev(),
-                    false,
-                    isFirstMixBuffer,
-                    nodeId);
-
-                destination.UpdateBiquadFilterEnabledPrev(0);
-            }
-            else if (bqf1.Enable)
-            {
-                _commandBuffer.GenerateBiquadFilterAndMix(
-                    0f,
-                    volume,
-                    inputBufferIndex,
-                    outputBufferIndex,
-                    0,
-                    Memory<VoiceUpdateState>.Empty,
-                    ref bqf1,
-                    bqfState[..1],
-                    bqfState.Slice(1, 1),
-                    !destination.IsBiquadFilterEnabledPrev(),
-                    false,
-                    isFirstMixBuffer,
-                    nodeId);
-
-                destination.UpdateBiquadFilterEnabledPrev(1);
-            }
-
-            isFirstMixBuffer = false;
-        }
-
         private void GenerateMix(ref MixState mix)
         {
             if (mix.HasAnyDestination())
@@ -932,13 +722,15 @@ namespace Ryujinx.Audio.Renderer.Server
                         {
                             int destinationIndex = destinationId++;
 
-                            SplitterDestination destination = _splitterContext.GetDestination((int)mix.DestinationSplitterId, destinationIndex);
+                            Span<SplitterDestination> destinationSpan = _splitterContext.GetDestination((int)mix.DestinationSplitterId, destinationIndex);
 
-                            if (destination.IsNull)
+                            if (destinationSpan.IsEmpty)
                             {
                                 break;
                             }
 
+                            ref SplitterDestination destination = ref destinationSpan[0];
+
                             if (destination.IsConfigured())
                             {
                                 int mixId = destination.DestinationId;
@@ -949,32 +741,16 @@ namespace Ryujinx.Audio.Renderer.Server
 
                                     uint inputBufferIndex = mix.BufferOffset + ((uint)destinationIndex % mix.BufferCount);
 
-                                    bool isFirstMixBuffer = true;
-
                                     for (uint bufferDestinationIndex = 0; bufferDestinationIndex < destinationMix.BufferCount; bufferDestinationIndex++)
                                     {
                                         float volume = mix.Volume * destination.GetMixVolume((int)bufferDestinationIndex);
 
                                         if (volume != 0.0f)
                                         {
-                                            if (destination.IsBiquadFilterEnabled())
-                                            {
-                                                GenerateMixWithSplitter(
-                                                    inputBufferIndex,
-                                                    destinationMix.BufferOffset + bufferDestinationIndex,
-                                                    volume,
-                                                    destination,
-                                                    ref isFirstMixBuffer,
-                                                    mix.NodeId);
-                                            }
-                                            else
-                                            {
-                                                _commandBuffer.GenerateMix(
-                                                    inputBufferIndex,
-                                                    destinationMix.BufferOffset + bufferDestinationIndex,
-                                                    mix.NodeId,
-                                                    volume);
-                                            }
+                                            _commandBuffer.GenerateMix(inputBufferIndex,
+                                                                       destinationMix.BufferOffset + bufferDestinationIndex,
+                                                                       mix.NodeId,
+                                                                       volume);
                                         }
                                     }
                                 }
@@ -994,11 +770,10 @@ namespace Ryujinx.Audio.Renderer.Server
 
                             if (volume != 0.0f)
                             {
-                                _commandBuffer.GenerateMix(
-                                    mix.BufferOffset + bufferIndex,
-                                    destinationMix.BufferOffset + bufferDestinationIndex,
-                                    mix.NodeId,
-                                    volume);
+                                _commandBuffer.GenerateMix(mix.BufferOffset + bufferIndex,
+                                                           destinationMix.BufferOffset + bufferDestinationIndex,
+                                                           mix.NodeId,
+                                                           volume);
                             }
                         }
                     }
@@ -1008,12 +783,11 @@ namespace Ryujinx.Audio.Renderer.Server
 
         private void GenerateSubMix(ref MixState subMix)
         {
-            _commandBuffer.GenerateDepopForMixBuffers(
-                _rendererContext.DepopBuffer,
-                subMix.BufferOffset,
-                subMix.BufferCount,
-                subMix.NodeId,
-                subMix.SampleRate);
+            _commandBuffer.GenerateDepopForMixBuffersCommand(_rendererContext.DepopBuffer,
+                                                             subMix.BufferOffset,
+                                                             subMix.BufferCount,
+                                                             subMix.NodeId,
+                                                             subMix.SampleRate);
 
             GenerateEffects(ref subMix);
 
@@ -1073,12 +847,11 @@ namespace Ryujinx.Audio.Renderer.Server
         {
             ref MixState finalMix = ref _mixContext.GetFinalState();
 
-            _commandBuffer.GenerateDepopForMixBuffers(
-                _rendererContext.DepopBuffer,
-                finalMix.BufferOffset,
-                finalMix.BufferCount,
-                finalMix.NodeId,
-                finalMix.SampleRate);
+            _commandBuffer.GenerateDepopForMixBuffersCommand(_rendererContext.DepopBuffer,
+                                                             finalMix.BufferOffset,
+                                                             finalMix.BufferCount,
+                                                             finalMix.NodeId,
+                                                             finalMix.SampleRate);
 
             GenerateEffects(ref finalMix);
 
@@ -1109,10 +882,9 @@ namespace Ryujinx.Audio.Renderer.Server
                         GeneratePerformance(ref performanceEntry, PerformanceCommand.Type.Start, nodeId);
                     }
 
-                    _commandBuffer.GenerateVolume(
-                        finalMix.Volume,
-                        finalMix.BufferOffset + bufferIndex,
-                        nodeId);
+                    _commandBuffer.GenerateVolume(finalMix.Volume,
+                                                  finalMix.BufferOffset + bufferIndex,
+                                                  nodeId);
 
                     if (performanceSubInitialized)
                     {
@@ -1166,45 +938,41 @@ namespace Ryujinx.Audio.Renderer.Server
 
             if (useCustomDownMixingCommand)
             {
-                _commandBuffer.GenerateDownMixSurroundToStereo(
-                    finalMix.BufferOffset,
-                    sink.Parameter.Input.AsSpan(),
-                    sink.Parameter.Input.AsSpan(),
-                    sink.DownMixCoefficients,
-                    Constants.InvalidNodeId);
+                _commandBuffer.GenerateDownMixSurroundToStereo(finalMix.BufferOffset,
+                                                               sink.Parameter.Input.AsSpan(),
+                                                               sink.Parameter.Input.AsSpan(),
+                                                               sink.DownMixCoefficients,
+                                                               Constants.InvalidNodeId);
             }
             // NOTE: We do the downmixing at the DSP level as it's easier that way.
             else if (_rendererContext.ChannelCount == 2 && sink.Parameter.InputCount == 6)
             {
-                _commandBuffer.GenerateDownMixSurroundToStereo(
-                    finalMix.BufferOffset,
-                    sink.Parameter.Input.AsSpan(),
-                    sink.Parameter.Input.AsSpan(),
-                    Constants.DefaultSurroundToStereoCoefficients,
-                    Constants.InvalidNodeId);
+                _commandBuffer.GenerateDownMixSurroundToStereo(finalMix.BufferOffset,
+                                                               sink.Parameter.Input.AsSpan(),
+                                                               sink.Parameter.Input.AsSpan(),
+                                                               Constants.DefaultSurroundToStereoCoefficients,
+                                                               Constants.InvalidNodeId);
             }
 
             CommandList commandList = _commandBuffer.CommandList;
 
             if (sink.UpsamplerState != null)
             {
-                _commandBuffer.GenerateUpsample(
-                    finalMix.BufferOffset,
-                    sink.UpsamplerState,
-                    sink.Parameter.InputCount,
-                    sink.Parameter.Input.AsSpan(),
-                    commandList.BufferCount,
-                    commandList.SampleCount,
-                    commandList.SampleRate,
-                    Constants.InvalidNodeId);
+                _commandBuffer.GenerateUpsample(finalMix.BufferOffset,
+                                                sink.UpsamplerState,
+                                                sink.Parameter.InputCount,
+                                                sink.Parameter.Input.AsSpan(),
+                                                commandList.BufferCount,
+                                                commandList.SampleCount,
+                                                commandList.SampleRate,
+                                                Constants.InvalidNodeId);
             }
 
-            _commandBuffer.GenerateDeviceSink(
-                finalMix.BufferOffset,
-                sink,
-                _rendererContext.SessionId,
-                commandList.Buffers,
-                Constants.InvalidNodeId);
+            _commandBuffer.GenerateDeviceSink(finalMix.BufferOffset,
+                                              sink,
+                                              _rendererContext.SessionId,
+                                              commandList.Buffers,
+                                              Constants.InvalidNodeId);
         }
 
         private void GenerateSink(BaseSink sink, ref MixState finalMix)

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

@@ -170,7 +170,7 @@ namespace Ryujinx.Audio.Renderer.Server
             return 0;
         }
 
-        public uint Estimate(MultiTapBiquadFilterCommand command)
+        public uint Estimate(GroupedBiquadFilterCommand command)
         {
             return 0;
         }
@@ -184,15 +184,5 @@ namespace Ryujinx.Audio.Renderer.Server
         {
             return 0;
         }
-
-        public uint Estimate(BiquadFilterAndMixCommand command)
-        {
-            return 0;
-        }
-
-        public uint Estimate(MultiTapBiquadFilterAndMixCommand command)
-        {
-            return 0;
-        }
     }
 }

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

@@ -462,7 +462,7 @@ namespace Ryujinx.Audio.Renderer.Server
             return 0;
         }
 
-        public uint Estimate(MultiTapBiquadFilterCommand command)
+        public uint Estimate(GroupedBiquadFilterCommand command)
         {
             return 0;
         }
@@ -476,15 +476,5 @@ namespace Ryujinx.Audio.Renderer.Server
         {
             return 0;
         }
-
-        public uint Estimate(BiquadFilterAndMixCommand command)
-        {
-            return 0;
-        }
-
-        public uint Estimate(MultiTapBiquadFilterAndMixCommand command)
-        {
-            return 0;
-        }
     }
 }

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

@@ -632,7 +632,7 @@ namespace Ryujinx.Audio.Renderer.Server
             };
         }
 
-        public virtual uint Estimate(MultiTapBiquadFilterCommand command)
+        public virtual uint Estimate(GroupedBiquadFilterCommand command)
         {
             return 0;
         }
@@ -646,15 +646,5 @@ namespace Ryujinx.Audio.Renderer.Server
         {
             return 0;
         }
-
-        public virtual uint Estimate(BiquadFilterAndMixCommand command)
-        {
-            return 0;
-        }
-
-        public virtual uint Estimate(MultiTapBiquadFilterAndMixCommand command)
-        {
-            return 0;
-        }
     }
 }

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

@@ -10,7 +10,7 @@ namespace Ryujinx.Audio.Renderer.Server
     {
         public CommandProcessingTimeEstimatorVersion4(uint sampleCount, uint bufferCount) : base(sampleCount, bufferCount) { }
 
-        public override uint Estimate(MultiTapBiquadFilterCommand command)
+        public override uint Estimate(GroupedBiquadFilterCommand command)
         {
             Debug.Assert(SampleCount == 160 || SampleCount == 240);
 

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

@@ -210,53 +210,5 @@ namespace Ryujinx.Audio.Renderer.Server
                 _ => throw new NotImplementedException($"{command.Parameter.ChannelCount}"),
             };
         }
-
-        public override uint Estimate(BiquadFilterAndMixCommand command)
-        {
-            Debug.Assert(SampleCount == 160 || SampleCount == 240);
-
-            if (command.HasVolumeRamp)
-            {
-                if (SampleCount == 160)
-                {
-                    return 5204;
-                }
-
-                return 6683;
-            }
-            else
-            {
-                if (SampleCount == 160)
-                {
-                    return 3427;
-                }
-
-                return 4752;
-            }
-        }
-
-        public override uint Estimate(MultiTapBiquadFilterAndMixCommand command)
-        {
-            Debug.Assert(SampleCount == 160 || SampleCount == 240);
-
-            if (command.HasVolumeRamp)
-            {
-                if (SampleCount == 160)
-                {
-                    return 7939;
-                }
-
-                return 10669;
-            }
-            else
-            {
-                if (SampleCount == 160)
-                {
-                    return 6256;
-                }
-
-                return 8683;
-            }
-        }
     }
 }

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

@@ -33,10 +33,8 @@ namespace Ryujinx.Audio.Renderer.Server
         uint Estimate(UpsampleCommand command);
         uint Estimate(LimiterCommandVersion1 command);
         uint Estimate(LimiterCommandVersion2 command);
-        uint Estimate(MultiTapBiquadFilterCommand command);
+        uint Estimate(GroupedBiquadFilterCommand command);
         uint Estimate(CaptureBufferCommand command);
         uint Estimate(CompressorCommand command);
-        uint Estimate(BiquadFilterAndMixCommand command);
-        uint Estimate(MultiTapBiquadFilterAndMixCommand command);
     }
 }

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

@@ -225,11 +225,11 @@ namespace Ryujinx.Audio.Renderer.Server.Mix
 
                     for (int i = 0; i < splitter.DestinationCount; i++)
                     {
-                        SplitterDestination destination = splitter.GetData(i);
+                        Span<SplitterDestination> destination = splitter.GetData(i);
 
-                        if (!destination.IsNull)
+                        if (!destination.IsEmpty)
                         {
-                            int destinationMixId = destination.DestinationId;
+                            int destinationMixId = destination[0].DestinationId;
 
                             if (destinationMixId != UnusedMixId)
                             {

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

@@ -1,5 +1,4 @@
 using Ryujinx.Audio.Renderer.Common;
-using Ryujinx.Audio.Renderer.Dsp.State;
 using Ryujinx.Audio.Renderer.Parameter;
 using Ryujinx.Audio.Renderer.Utils;
 using Ryujinx.Common;
@@ -16,35 +15,15 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
     /// </summary>
     public class SplitterContext
     {
-        /// <summary>
-        /// Amount of biquad filter states per splitter destination.
-        /// </summary>
-        public const int BqfStatesPerDestination = 4;
-
         /// <summary>
         /// Storage for <see cref="SplitterState"/>.
         /// </summary>
         private Memory<SplitterState> _splitters;
 
         /// <summary>
-        /// Storage for <see cref="SplitterDestinationVersion1"/>.
+        /// Storage for <see cref="SplitterDestination"/>.
         /// </summary>
-        private Memory<SplitterDestinationVersion1> _splitterDestinationsV1;
-
-        /// <summary>
-        /// Storage for <see cref="SplitterDestinationVersion2"/>.
-        /// </summary>
-        private Memory<SplitterDestinationVersion2> _splitterDestinationsV2;
-
-        /// <summary>
-        /// Splitter biquad filtering states.
-        /// </summary>
-        private Memory<BiquadFilterState> _splitterBqfStates;
-
-        /// <summary>
-        /// Version of the splitter context that is being used, currently can be 1 or 2.
-        /// </summary>
-        public int Version { get; private set; }
+        private Memory<SplitterDestination> _splitterDestinations;
 
         /// <summary>
         /// If set to true, trust the user destination count in <see cref="SplitterState.Update(SplitterContext, in SplitterInParameter, ref SequenceReader{byte})"/>.
@@ -57,17 +36,12 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
         /// <param name="behaviourContext">The behaviour context.</param>
         /// <param name="parameter">The audio renderer configuration.</param>
         /// <param name="workBufferAllocator">The <see cref="WorkBufferAllocator"/>.</param>
-        /// <param name="splitterBqfStates">Memory to store the biquad filtering state for splitters during processing.</param>
         /// <returns>Return true if the initialization was successful.</returns>
-        public bool Initialize(
-            ref BehaviourContext behaviourContext,
-            ref AudioRendererConfiguration parameter,
-            WorkBufferAllocator workBufferAllocator,
-            Memory<BiquadFilterState> splitterBqfStates)
+        public bool Initialize(ref BehaviourContext behaviourContext, ref AudioRendererConfiguration parameter, WorkBufferAllocator workBufferAllocator)
         {
             if (!behaviourContext.IsSplitterSupported() || parameter.SplitterCount <= 0 || parameter.SplitterDestinationCount <= 0)
             {
-                Setup(Memory<SplitterState>.Empty, Memory<SplitterDestinationVersion1>.Empty, Memory<SplitterDestinationVersion2>.Empty, false);
+                Setup(Memory<SplitterState>.Empty, Memory<SplitterDestination>.Empty, false);
 
                 return true;
             }
@@ -86,62 +60,23 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
                 splitter = new SplitterState(splitterId++);
             }
 
-            Memory<SplitterDestinationVersion1> splitterDestinationsV1 = Memory<SplitterDestinationVersion1>.Empty;
-            Memory<SplitterDestinationVersion2> splitterDestinationsV2 = Memory<SplitterDestinationVersion2>.Empty;
+            Memory<SplitterDestination> splitterDestinations = workBufferAllocator.Allocate<SplitterDestination>(parameter.SplitterDestinationCount,
+                SplitterDestination.Alignment);
 
-            if (!behaviourContext.IsBiquadFilterParameterForSplitterEnabled())
+            if (splitterDestinations.IsEmpty)
             {
-                Version = 1;
-
-                splitterDestinationsV1 = workBufferAllocator.Allocate<SplitterDestinationVersion1>(parameter.SplitterDestinationCount,
-                    SplitterDestinationVersion1.Alignment);
-
-                if (splitterDestinationsV1.IsEmpty)
-                {
-                    return false;
-                }
-
-                int splitterDestinationId = 0;
-                foreach (ref SplitterDestinationVersion1 data in splitterDestinationsV1.Span)
-                {
-                    data = new SplitterDestinationVersion1(splitterDestinationId++);
-                }
+                return false;
             }
-            else
+
+            int splitterDestinationId = 0;
+            foreach (ref SplitterDestination data in splitterDestinations.Span)
             {
-                Version = 2;
-
-                splitterDestinationsV2 = workBufferAllocator.Allocate<SplitterDestinationVersion2>(parameter.SplitterDestinationCount,
-                    SplitterDestinationVersion2.Alignment);
-
-                if (splitterDestinationsV2.IsEmpty)
-                {
-                    return false;
-                }
-
-                int splitterDestinationId = 0;
-                foreach (ref SplitterDestinationVersion2 data in splitterDestinationsV2.Span)
-                {
-                    data = new SplitterDestinationVersion2(splitterDestinationId++);
-                }
-
-                if (parameter.SplitterDestinationCount > 0)
-                {
-                    // Official code stores it in the SplitterDestinationVersion2 struct,
-                    // but we don't to avoid using unsafe code.
-
-                    splitterBqfStates.Span.Clear();
-                    _splitterBqfStates = splitterBqfStates;
-                }
-                else
-                {
-                    _splitterBqfStates = Memory<BiquadFilterState>.Empty;
-                }
+                data = new SplitterDestination(splitterDestinationId++);
             }
 
             SplitterState.InitializeSplitters(splitters.Span);
 
-            Setup(splitters, splitterDestinationsV1, splitterDestinationsV2, behaviourContext.IsSplitterBugFixed());
+            Setup(splitters, splitterDestinations, behaviourContext.IsSplitterBugFixed());
 
             return true;
         }
@@ -158,15 +93,7 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
             if (behaviourContext.IsSplitterSupported())
             {
                 size = WorkBufferAllocator.GetTargetSize<SplitterState>(size, parameter.SplitterCount, SplitterState.Alignment);
-
-                if (behaviourContext.IsBiquadFilterParameterForSplitterEnabled())
-                {
-                    size = WorkBufferAllocator.GetTargetSize<SplitterDestinationVersion2>(size, parameter.SplitterDestinationCount, SplitterDestinationVersion2.Alignment);
-                }
-                else
-                {
-                    size = WorkBufferAllocator.GetTargetSize<SplitterDestinationVersion1>(size, parameter.SplitterDestinationCount, SplitterDestinationVersion1.Alignment);
-                }
+                size = WorkBufferAllocator.GetTargetSize<SplitterDestination>(size, parameter.SplitterDestinationCount, SplitterDestination.Alignment);
 
                 if (behaviourContext.IsSplitterBugFixed())
                 {
@@ -183,18 +110,12 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
         /// Setup the <see cref="SplitterContext"/> instance.
         /// </summary>
         /// <param name="splitters">The <see cref="SplitterState"/> storage.</param>
-        /// <param name="splitterDestinationsV1">The <see cref="SplitterDestinationVersion1"/> storage.</param>
-        /// <param name="splitterDestinationsV2">The <see cref="SplitterDestinationVersion2"/> storage.</param>
+        /// <param name="splitterDestinations">The <see cref="SplitterDestination"/> storage.</param>
         /// <param name="isBugFixed">If set to true, trust the user destination count in <see cref="SplitterState.Update(SplitterContext, in SplitterInParameter, ref SequenceReader{byte})"/>.</param>
-        private void Setup(
-            Memory<SplitterState> splitters,
-            Memory<SplitterDestinationVersion1> splitterDestinationsV1,
-            Memory<SplitterDestinationVersion2> splitterDestinationsV2,
-            bool isBugFixed)
+        private void Setup(Memory<SplitterState> splitters, Memory<SplitterDestination> splitterDestinations, bool isBugFixed)
         {
             _splitters = splitters;
-            _splitterDestinationsV1 = splitterDestinationsV1;
-            _splitterDestinationsV2 = splitterDestinationsV2;
+            _splitterDestinations = splitterDestinations;
             IsBugFixed = isBugFixed;
         }
 
@@ -220,9 +141,7 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
                 return 0;
             }
 
-            int length = _splitterDestinationsV2.IsEmpty ? _splitterDestinationsV1.Length : _splitterDestinationsV2.Length;
-
-            return length / _splitters.Length;
+            return _splitterDestinations.Length / _splitters.Length;
         }
 
         /// <summary>
@@ -259,39 +178,7 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
         }
 
         /// <summary>
-        /// Update one splitter destination data from user parameters.
-        /// </summary>
-        /// <param name="input">The raw data after the splitter header.</param>
-        /// <returns>True if the update was successful, false otherwise</returns>
-        private bool UpdateData<T>(ref SequenceReader<byte> input) where T : unmanaged, ISplitterDestinationInParameter
-        {
-            ref readonly T parameter = ref input.GetRefOrRefToCopy<T>(out _);
-
-            Debug.Assert(parameter.IsMagicValid());
-
-            if (parameter.IsMagicValid())
-            {
-                int length = _splitterDestinationsV2.IsEmpty ? _splitterDestinationsV1.Length : _splitterDestinationsV2.Length;
-
-                if (parameter.Id >= 0 && parameter.Id < length)
-                {
-                    SplitterDestination destination = GetDestination(parameter.Id);
-
-                    destination.Update(parameter);
-                }
-
-                return true;
-            }
-            else
-            {
-                input.Rewind(Unsafe.SizeOf<T>());
-
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Update one or multiple splitter destination data from user parameters.
+        /// Update one or multiple <see cref="SplitterDestination"/> from user parameters.
         /// </summary>
         /// <param name="inputHeader">The splitter header.</param>
         /// <param name="input">The raw data after the splitter header.</param>
@@ -299,23 +186,23 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
         {
             for (int i = 0; i < inputHeader.SplitterDestinationCount; i++)
             {
-                if (Version == 1)
+                ref readonly SplitterDestinationInParameter parameter = ref input.GetRefOrRefToCopy<SplitterDestinationInParameter>(out _);
+
+                Debug.Assert(parameter.IsMagicValid());
+
+                if (parameter.IsMagicValid())
                 {
-                    if (!UpdateData<SplitterDestinationInParameterVersion1>(ref input))
+                    if (parameter.Id >= 0 && parameter.Id < _splitterDestinations.Length)
                     {
-                        break;
-                    }
-                }
-                else if (Version == 2)
-                {
-                    if (!UpdateData<SplitterDestinationInParameterVersion2>(ref input))
-                    {
-                        break;
+                        ref SplitterDestination destination = ref GetDestination(parameter.Id);
+
+                        destination.Update(parameter);
                     }
                 }
                 else
                 {
-                    Debug.Fail($"Invalid splitter context version {Version}.");
+                    input.Rewind(Unsafe.SizeOf<SplitterDestinationInParameter>());
+                    break;
                 }
             }
         }
@@ -327,7 +214,7 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
         /// <returns>Return true if the update was successful.</returns>
         public bool Update(ref SequenceReader<byte> input)
         {
-            if (!UsingSplitter())
+            if (_splitterDestinations.IsEmpty || _splitters.IsEmpty)
             {
                 return true;
             }
@@ -364,52 +251,45 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
         }
 
         /// <summary>
-        /// Get a reference to the splitter destination data at the given <paramref name="id"/>.
+        /// Get a reference to a <see cref="SplitterDestination"/> at the given <paramref name="id"/>.
         /// </summary>
         /// <param name="id">The index to use.</param>
-        /// <returns>A reference to the splitter destination data at the given <paramref name="id"/>.</returns>
-        public SplitterDestination GetDestination(int id)
+        /// <returns>A reference to a <see cref="SplitterDestination"/> at the given <paramref name="id"/>.</returns>
+        public ref SplitterDestination GetDestination(int id)
         {
-            if (_splitterDestinationsV2.IsEmpty)
-            {
-                return new SplitterDestination(ref SpanIOHelper.GetFromMemory(_splitterDestinationsV1, id, (uint)_splitterDestinationsV1.Length));
-            }
-            else
-            {
-                return new SplitterDestination(ref SpanIOHelper.GetFromMemory(_splitterDestinationsV2, id, (uint)_splitterDestinationsV2.Length));
-            }
+            return ref SpanIOHelper.GetFromMemory(_splitterDestinations, id, (uint)_splitterDestinations.Length);
         }
 
         /// <summary>
-        /// Get a <see cref="SplitterDestination"/> in the <see cref="SplitterState"/> at <paramref name="id"/> and pass <paramref name="destinationId"/> to <see cref="SplitterState.GetData(int)"/>.
+        /// Get a <see cref="Memory{SplitterDestination}"/> at the given <paramref name="id"/>.
+        /// </summary>
+        /// <param name="id">The index to use.</param>
+        /// <returns>A <see cref="Memory{SplitterDestination}"/> at the given <paramref name="id"/>.</returns>
+        public Memory<SplitterDestination> GetDestinationMemory(int id)
+        {
+            return SpanIOHelper.GetMemory(_splitterDestinations, id, (uint)_splitterDestinations.Length);
+        }
+
+        /// <summary>
+        /// Get a <see cref="Span{SplitterDestination}"/> in the <see cref="SplitterState"/> at <paramref name="id"/> and pass <paramref name="destinationId"/> to <see cref="SplitterState.GetData(int)"/>.
         /// </summary>
         /// <param name="id">The index to use to get the <see cref="SplitterState"/>.</param>
         /// <param name="destinationId">The index of the <see cref="SplitterDestination"/>.</param>
-        /// <returns>A <see cref="SplitterDestination"/>.</returns>
-        public SplitterDestination GetDestination(int id, int destinationId)
+        /// <returns>A <see cref="Span{SplitterDestination}"/>.</returns>
+        public Span<SplitterDestination> GetDestination(int id, int destinationId)
         {
             ref SplitterState splitter = ref GetState(id);
 
             return splitter.GetData(destinationId);
         }
 
-        /// <summary>
-        /// Gets the biquad filter state for a given splitter destination.
-        /// </summary>
-        /// <param name="destination">The splitter destination.</param>
-        /// <returns>Biquad filter state for the specified destination.</returns>
-        public Memory<BiquadFilterState> GetBiquadFilterState(SplitterDestination destination)
-        {
-            return _splitterBqfStates.Slice(destination.Id * BqfStatesPerDestination, BqfStatesPerDestination);
-        }
-
         /// <summary>
         /// Return true if the audio renderer has any splitters.
         /// </summary>
         /// <returns>True if the audio renderer has any splitters.</returns>
         public bool UsingSplitter()
         {
-            return !_splitters.IsEmpty && (!_splitterDestinationsV1.IsEmpty || !_splitterDestinationsV2.IsEmpty);
+            return !_splitters.IsEmpty && !_splitterDestinations.IsEmpty;
         }
 
         /// <summary>

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

@@ -1,198 +1,115 @@
 using Ryujinx.Audio.Renderer.Parameter;
+using Ryujinx.Common.Utilities;
 using System;
 using System.Diagnostics;
-using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
 
 namespace Ryujinx.Audio.Renderer.Server.Splitter
 {
     /// <summary>
     /// Server state for a splitter destination.
     /// </summary>
-    public ref struct SplitterDestination
+    [StructLayout(LayoutKind.Sequential, Size = 0xE0, Pack = Alignment)]
+    public struct SplitterDestination
     {
-        private ref SplitterDestinationVersion1 _v1;
-        private ref SplitterDestinationVersion2 _v2;
+        public const int Alignment = 0x10;
 
         /// <summary>
-        /// Checks if the splitter destination data reference is null.
+        /// The unique id of this <see cref="SplitterDestination"/>.
         /// </summary>
-        public bool IsNull => Unsafe.IsNullRef(ref _v1) && Unsafe.IsNullRef(ref _v2);
-
-        /// <summary>
-        /// The splitter unique id.
-        /// </summary>
-        public int Id
-        {
-            get
-            {
-                if (Unsafe.IsNullRef(ref _v2))
-                {
-                    if (Unsafe.IsNullRef(ref _v1))
-                    {
-                        return 0;
-                    }
-                    else
-                    {
-                        return _v1.Id;
-                    }
-                }
-                else
-                {
-                    return _v2.Id;
-                }
-            }
-        }
+        public int Id;
 
         /// <summary>
         /// The mix to output the result of the splitter.
         /// </summary>
-        public int DestinationId
-        {
-            get
-            {
-                if (Unsafe.IsNullRef(ref _v2))
-                {
-                    if (Unsafe.IsNullRef(ref _v1))
-                    {
-                        return 0;
-                    }
-                    else
-                    {
-                        return _v1.DestinationId;
-                    }
-                }
-                else
-                {
-                    return _v2.DestinationId;
-                }
-            }
-        }
+        public int DestinationId;
+
+        /// <summary>
+        /// Mix buffer volumes storage.
+        /// </summary>
+        private MixArray _mix;
+        private MixArray _previousMix;
+
+        /// <summary>
+        /// Pointer to the next linked element.
+        /// </summary>
+        private unsafe SplitterDestination* _next;
+
+        /// <summary>
+        /// Set to true if in use.
+        /// </summary>
+        [MarshalAs(UnmanagedType.I1)]
+        public bool IsUsed;
+
+        /// <summary>
+        /// Set to true if the internal state need to be updated.
+        /// </summary>
+        [MarshalAs(UnmanagedType.I1)]
+        public bool NeedToUpdateInternalState;
+
+        [StructLayout(LayoutKind.Sequential, Size = 4 * 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
-        {
-            get
-            {
-                if (Unsafe.IsNullRef(ref _v2))
-                {
-                    if (Unsafe.IsNullRef(ref _v1))
-                    {
-                        return Span<float>.Empty;
-                    }
-                    else
-                    {
-                        return _v1.MixBufferVolume;
-                    }
-                }
-                else
-                {
-                    return _v2.MixBufferVolume;
-                }
-            }
-        }
+        public Span<float> MixBufferVolume => SpanHelpers.AsSpan<MixArray, float>(ref _mix);
 
         /// <summary>
         /// Previous mix buffer volumes.
         /// </summary>
         /// <remarks>Used when a splitter id is specified in the mix.</remarks>
-        public Span<float> PreviousMixBufferVolume
-        {
-            get
-            {
-                if (Unsafe.IsNullRef(ref _v2))
-                {
-                    if (Unsafe.IsNullRef(ref _v1))
-                    {
-                        return Span<float>.Empty;
-                    }
-                    else
-                    {
-                        return _v1.PreviousMixBufferVolume;
-                    }
-                }
-                else
-                {
-                    return _v2.PreviousMixBufferVolume;
-                }
-            }
-        }
+        public Span<float> PreviousMixBufferVolume => SpanHelpers.AsSpan<MixArray, float>(ref _previousMix);
 
         /// <summary>
-        /// Get the <see cref="SplitterDestination"/> of the next element or null if not present.
+        /// Get the  <see cref="Span{SplitterDestination}"/> of the next element or <see cref="Span{SplitterDestination}.Empty"/> if not present.
         /// </summary>
-        public readonly SplitterDestination Next
+        public readonly Span<SplitterDestination> Next
         {
             get
             {
                 unsafe
                 {
-                    if (Unsafe.IsNullRef(ref _v2))
-                    {
-                        if (Unsafe.IsNullRef(ref _v1))
-                        {
-                            return new SplitterDestination();
-                        }
-                        else
-                        {
-                            return new SplitterDestination(ref _v1.Next);
-                        }
-                    }
-                    else
-                    {
-                        return new SplitterDestination(ref _v2.Next);
-                    }
+                    return _next != null ? new Span<SplitterDestination>(_next, 1) : Span<SplitterDestination>.Empty;
                 }
             }
         }
 
         /// <summary>
-        /// Creates a new splitter destination wrapper for the version 1 splitter destination data.
+        /// Create a new <see cref="SplitterDestination"/>.
         /// </summary>
-        /// <param name="v1">Version 1 splitter destination data</param>
-        public SplitterDestination(ref SplitterDestinationVersion1 v1)
+        /// <param name="id">The unique id of this <see cref="SplitterDestination"/>.</param>
+        public SplitterDestination(int id) : this()
         {
-            _v1 = ref v1;
-            _v2 = ref Unsafe.NullRef<SplitterDestinationVersion2>();
+            Id = id;
+            DestinationId = Constants.UnusedMixId;
+
+            ClearVolumes();
         }
 
         /// <summary>
-        /// Creates a new splitter destination wrapper for the version 2 splitter destination data.
-        /// </summary>
-        /// <param name="v2">Version 2 splitter destination data</param>
-        public SplitterDestination(ref SplitterDestinationVersion2 v2)
-        {
-
-            _v1 = ref Unsafe.NullRef<SplitterDestinationVersion1>();
-            _v2 = ref v2;
-        }
-
-        /// <summary>
-        /// Creates a new splitter destination wrapper for the splitter destination data.
-        /// </summary>
-        /// <param name="v1">Version 1 splitter destination data</param>
-        /// <param name="v2">Version 2 splitter destination data</param>
-        public unsafe SplitterDestination(SplitterDestinationVersion1* v1, SplitterDestinationVersion2* v2)
-        {
-            _v1 = ref Unsafe.AsRef<SplitterDestinationVersion1>(v1);
-            _v2 = ref Unsafe.AsRef<SplitterDestinationVersion2>(v2);
-        }
-
-        /// <summary>
-        /// Update the splitter destination data from user parameter.
+        /// Update the <see cref="SplitterDestination"/> from user parameter.
         /// </summary>
         /// <param name="parameter">The user parameter.</param>
-        public void Update<T>(in T parameter) where T : ISplitterDestinationInParameter
+        public void Update(SplitterDestinationInParameter parameter)
         {
-            if (Unsafe.IsNullRef(ref _v2))
+            Debug.Assert(Id == parameter.Id);
+
+            if (parameter.IsMagicValid() && Id == parameter.Id)
             {
-                _v1.Update(parameter);
-            }
-            else
-            {
-                _v2.Update(parameter);
+                DestinationId = parameter.DestinationId;
+
+                parameter.MixBufferVolume.CopyTo(MixBufferVolume);
+
+                if (!IsUsed && parameter.IsUsed)
+                {
+                    MixBufferVolume.CopyTo(PreviousMixBufferVolume);
+
+                    NeedToUpdateInternalState = false;
+                }
+
+                IsUsed = parameter.IsUsed;
             }
         }
 
@@ -201,14 +118,12 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
         /// </summary>
         public void UpdateInternalState()
         {
-            if (Unsafe.IsNullRef(ref _v2))
+            if (IsUsed && NeedToUpdateInternalState)
             {
-                _v1.UpdateInternalState();
-            }
-            else
-            {
-                _v2.UpdateInternalState();
+                MixBufferVolume.CopyTo(PreviousMixBufferVolume);
             }
+
+            NeedToUpdateInternalState = false;
         }
 
         /// <summary>
@@ -216,23 +131,16 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
         /// </summary>
         public void MarkAsNeedToUpdateInternalState()
         {
-            if (Unsafe.IsNullRef(ref _v2))
-            {
-                _v1.MarkAsNeedToUpdateInternalState();
-            }
-            else
-            {
-                _v2.MarkAsNeedToUpdateInternalState();
-            }
+            NeedToUpdateInternalState = true;
         }
 
         /// <summary>
-        /// Return true if the splitter destination is used and has a destination.
+        /// Return true if the <see cref="SplitterDestination"/> is used and has a destination.
         /// </summary>
-        /// <returns>True if the splitter destination is used and has a destination.</returns>
+        /// <returns>True if the <see cref="SplitterDestination"/> is used and has a destination.</returns>
         public readonly bool IsConfigured()
         {
-            return Unsafe.IsNullRef(ref _v2) ? _v1.IsConfigured() : _v2.IsConfigured();
+            return IsUsed && DestinationId != Constants.UnusedMixId;
         }
 
         /// <summary>
@@ -242,17 +150,9 @@ 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);
-        }
+            Debug.Assert(destinationIndex >= 0 && destinationIndex < Constants.MixBufferCountMax);
 
-        /// <summary>
-        /// Get the previous volume for a given destination.
-        /// </summary>
-        /// <param name="destinationIndex">The destination index to use.</param>
-        /// <returns>The volume for the given destination.</returns>
-        public float GetMixVolumePrev(int destinationIndex)
-        {
-            return Unsafe.IsNullRef(ref _v2) ? _v1.GetMixVolumePrev(destinationIndex) : _v2.GetMixVolumePrev(destinationIndex);
+            return MixBufferVolume[destinationIndex];
         }
 
         /// <summary>
@@ -260,33 +160,22 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
         /// </summary>
         public void ClearVolumes()
         {
-            if (Unsafe.IsNullRef(ref _v2))
-            {
-                _v1.ClearVolumes();
-            }
-            else
-            {
-                _v2.ClearVolumes();
-            }
+            MixBufferVolume.Clear();
+            PreviousMixBufferVolume.Clear();
         }
 
         /// <summary>
-        /// Link the next element to the given splitter destination.
+        /// Link the next element to the given <see cref="SplitterDestination"/>.
         /// </summary>
-        /// <param name="next">The given splitter destination to link.</param>
-        public void Link(SplitterDestination next)
+        /// <param name="next">The given <see cref="SplitterDestination"/> to link.</param>
+        public void Link(ref SplitterDestination next)
         {
-            if (Unsafe.IsNullRef(ref _v2))
+            unsafe
             {
-                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);
+                fixed (SplitterDestination* nextPtr = &next)
+                {
+                    _next = nextPtr;
+                }
             }
         }
 
@@ -295,74 +184,10 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
         /// </summary>
         public void Unlink()
         {
-            if (Unsafe.IsNullRef(ref _v2))
+            unsafe
             {
-                _v1.Unlink();
+                _next = null;
             }
-            else
-            {
-                _v2.Unlink();
-            }
-        }
-
-        /// <summary>
-        /// Checks if any biquad filter is enabled.
-        /// </summary>
-        /// <returns>True if any biquad filter is enabled.</returns>
-        public bool IsBiquadFilterEnabled()
-        {
-            return !Unsafe.IsNullRef(ref _v2) && _v2.IsBiquadFilterEnabled();
-        }
-
-        /// <summary>
-        /// Checks if any biquad filter was previously enabled.
-        /// </summary>
-        /// <returns>True if any biquad filter was previously enabled.</returns>
-        public bool IsBiquadFilterEnabledPrev()
-        {
-            return !Unsafe.IsNullRef(ref _v2) && _v2.IsBiquadFilterEnabledPrev();
-        }
-
-        /// <summary>
-        /// Gets the biquad filter parameters.
-        /// </summary>
-        /// <param name="index">Biquad filter index (0 or 1).</param>
-        /// <returns>Biquad filter parameters.</returns>
-        public ref BiquadFilterParameter GetBiquadFilterParameter(int index)
-        {
-            Debug.Assert(!Unsafe.IsNullRef(ref _v2));
-
-            return ref _v2.GetBiquadFilterParameter(index);
-        }
-
-        /// <summary>
-        /// Checks if any biquad filter was previously enabled.
-        /// </summary>
-        /// <param name="index">Biquad filter index (0 or 1).</param>
-        public void UpdateBiquadFilterEnabledPrev(int index)
-        {
-            if (!Unsafe.IsNullRef(ref _v2))
-            {
-                _v2.UpdateBiquadFilterEnabledPrev(index);
-            }
-        }
-
-        /// <summary>
-        /// Get the reference for the version 1 splitter destination data, or null if version 2 is being used or the destination is null.
-        /// </summary>
-        /// <returns>Reference for the version 1 splitter destination data.</returns>
-        public ref SplitterDestinationVersion1 GetV1RefOrNull()
-        {
-            return ref _v1;
-        }
-
-        /// <summary>
-        /// Get the reference for the version 2 splitter destination data, or null if version 1 is being used or the destination is null.
-        /// </summary>
-        /// <returns>Reference for the version 2 splitter destination data.</returns>
-        public ref SplitterDestinationVersion2 GetV2RefOrNull()
-        {
-            return ref _v2;
         }
     }
 }

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

@@ -1,206 +0,0 @@
-using Ryujinx.Audio.Renderer.Parameter;
-using Ryujinx.Common.Utilities;
-using System;
-using System.Diagnostics;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-namespace Ryujinx.Audio.Renderer.Server.Splitter
-{
-    /// <summary>
-    /// Server state for a splitter destination (version 1).
-    /// </summary>
-    [StructLayout(LayoutKind.Sequential, Size = 0xE0, Pack = Alignment)]
-    public struct SplitterDestinationVersion1
-    {
-        public const int Alignment = 0x10;
-
-        /// <summary>
-        /// The unique id of this <see cref="SplitterDestinationVersion1"/>.
-        /// </summary>
-        public int Id;
-
-        /// <summary>
-        /// The mix to output the result of the splitter.
-        /// </summary>
-        public int DestinationId;
-
-        /// <summary>
-        /// Mix buffer volumes storage.
-        /// </summary>
-        private MixArray _mix;
-        private MixArray _previousMix;
-
-        /// <summary>
-        /// Pointer to the next linked element.
-        /// </summary>
-        private unsafe SplitterDestinationVersion1* _next;
-
-        /// <summary>
-        /// Set to true if in use.
-        /// </summary>
-        [MarshalAs(UnmanagedType.I1)]
-        public bool IsUsed;
-
-        /// <summary>
-        /// Set to true if the internal state need to be updated.
-        /// </summary>
-        [MarshalAs(UnmanagedType.I1)]
-        public bool NeedToUpdateInternalState;
-
-        [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 _mix);
-
-        /// <summary>
-        /// Previous mix buffer volumes.
-        /// </summary>
-        /// <remarks>Used when a splitter id is specified in the mix.</remarks>
-        public Span<float> PreviousMixBufferVolume => SpanHelpers.AsSpan<MixArray, float>(ref _previousMix);
-
-        /// <summary>
-        /// Get the reference of the next element or null if not present.
-        /// </summary>
-        public readonly ref SplitterDestinationVersion1 Next
-        {
-            get
-            {
-                unsafe
-                {
-                    return ref Unsafe.AsRef<SplitterDestinationVersion1>(_next);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Create a new <see cref="SplitterDestinationVersion1"/>.
-        /// </summary>
-        /// <param name="id">The unique id of this <see cref="SplitterDestinationVersion1"/>.</param>
-        public SplitterDestinationVersion1(int id) : this()
-        {
-            Id = id;
-            DestinationId = Constants.UnusedMixId;
-
-            ClearVolumes();
-        }
-
-        /// <summary>
-        /// Update the <see cref="SplitterDestinationVersion1"/> from user parameter.
-        /// </summary>
-        /// <param name="parameter">The user parameter.</param>
-        public void Update<T>(in T parameter) where T : ISplitterDestinationInParameter
-        {
-            Debug.Assert(Id == parameter.Id);
-
-            if (parameter.IsMagicValid() && Id == parameter.Id)
-            {
-                DestinationId = parameter.DestinationId;
-
-                parameter.MixBufferVolume.CopyTo(MixBufferVolume);
-
-                if (!IsUsed && parameter.IsUsed)
-                {
-                    MixBufferVolume.CopyTo(PreviousMixBufferVolume);
-
-                    NeedToUpdateInternalState = false;
-                }
-
-                IsUsed = parameter.IsUsed;
-            }
-        }
-
-        /// <summary>
-        /// Update the internal state of the instance.
-        /// </summary>
-        public void UpdateInternalState()
-        {
-            if (IsUsed && NeedToUpdateInternalState)
-            {
-                MixBufferVolume.CopyTo(PreviousMixBufferVolume);
-            }
-
-            NeedToUpdateInternalState = false;
-        }
-
-        /// <summary>
-        /// Set the update internal state marker.
-        /// </summary>
-        public void MarkAsNeedToUpdateInternalState()
-        {
-            NeedToUpdateInternalState = true;
-        }
-
-        /// <summary>
-        /// Return true if the <see cref="SplitterDestinationVersion1"/> is used and has a destination.
-        /// </summary>
-        /// <returns>True if the <see cref="SplitterDestinationVersion1"/> is used and has a destination.</returns>
-        public readonly bool IsConfigured()
-        {
-            return IsUsed && DestinationId != Constants.UnusedMixId;
-        }
-
-        /// <summary>
-        /// Get the volume for a given destination.
-        /// </summary>
-        /// <param name="destinationIndex">The destination index to use.</param>
-        /// <returns>The volume for the given destination.</returns>
-        public float GetMixVolume(int destinationIndex)
-        {
-            Debug.Assert(destinationIndex >= 0 && destinationIndex < Constants.MixBufferCountMax);
-
-            return MixBufferVolume[destinationIndex];
-        }
-
-        /// <summary>
-        /// Get the previous volume for a given destination.
-        /// </summary>
-        /// <param name="destinationIndex">The destination index to use.</param>
-        /// <returns>The volume for the given destination.</returns>
-        public float GetMixVolumePrev(int destinationIndex)
-        {
-            Debug.Assert(destinationIndex >= 0 && destinationIndex < Constants.MixBufferCountMax);
-
-            return PreviousMixBufferVolume[destinationIndex];
-        }
-
-        /// <summary>
-        /// Clear the volumes.
-        /// </summary>
-        public void ClearVolumes()
-        {
-            MixBufferVolume.Clear();
-            PreviousMixBufferVolume.Clear();
-        }
-
-        /// <summary>
-        /// Link the next element to the given <see cref="SplitterDestinationVersion1"/>.
-        /// </summary>
-        /// <param name="next">The given <see cref="SplitterDestinationVersion1"/> to link.</param>
-        public void Link(ref SplitterDestinationVersion1 next)
-        {
-            unsafe
-            {
-                fixed (SplitterDestinationVersion1* nextPtr = &next)
-                {
-                    _next = nextPtr;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Remove the link to the next element.
-        /// </summary>
-        public void Unlink()
-        {
-            unsafe
-            {
-                _next = null;
-            }
-        }
-    }
-}

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

@@ -1,250 +0,0 @@
-using Ryujinx.Audio.Renderer.Parameter;
-using Ryujinx.Common.Memory;
-using Ryujinx.Common.Utilities;
-using System;
-using System.Diagnostics;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-namespace Ryujinx.Audio.Renderer.Server.Splitter
-{
-    /// <summary>
-    /// Server state for a splitter destination (version 2).
-    /// </summary>
-    [StructLayout(LayoutKind.Sequential, Size = 0x110, Pack = Alignment)]
-    public struct SplitterDestinationVersion2
-    {
-        public const int Alignment = 0x10;
-
-        /// <summary>
-        /// The unique id of this <see cref="SplitterDestinationVersion2"/>.
-        /// </summary>
-        public int Id;
-
-        /// <summary>
-        /// The mix to output the result of the splitter.
-        /// </summary>
-        public int DestinationId;
-
-        /// <summary>
-        /// Mix buffer volumes storage.
-        /// </summary>
-        private MixArray _mix;
-        private MixArray _previousMix;
-
-        /// <summary>
-        /// Pointer to the next linked element.
-        /// </summary>
-        private unsafe SplitterDestinationVersion2* _next;
-
-        /// <summary>
-        /// Set to true if in use.
-        /// </summary>
-        [MarshalAs(UnmanagedType.I1)]
-        public bool IsUsed;
-
-        /// <summary>
-        /// Set to true if the internal state need to be updated.
-        /// </summary>
-        [MarshalAs(UnmanagedType.I1)]
-        public bool NeedToUpdateInternalState;
-
-        [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 _mix);
-
-        /// <summary>
-        /// Previous mix buffer volumes.
-        /// </summary>
-        /// <remarks>Used when a splitter id is specified in the mix.</remarks>
-        public Span<float> PreviousMixBufferVolume => SpanHelpers.AsSpan<MixArray, float>(ref _previousMix);
-
-        /// <summary>
-        /// Get the reference of the next element or null if not present.
-        /// </summary>
-        public readonly ref SplitterDestinationVersion2 Next
-        {
-            get
-            {
-                unsafe
-                {
-                    return ref Unsafe.AsRef<SplitterDestinationVersion2>(_next);
-                }
-            }
-        }
-
-        private Array2<BiquadFilterParameter> _biquadFilters;
-
-        private Array2<bool> _isPreviousBiquadFilterEnabled;
-
-        /// <summary>
-        /// Create a new <see cref="SplitterDestinationVersion2"/>.
-        /// </summary>
-        /// <param name="id">The unique id of this <see cref="SplitterDestinationVersion2"/>.</param>
-        public SplitterDestinationVersion2(int id) : this()
-        {
-            Id = id;
-            DestinationId = Constants.UnusedMixId;
-
-            ClearVolumes();
-        }
-
-        /// <summary>
-        /// Update the <see cref="SplitterDestinationVersion2"/> from user parameter.
-        /// </summary>
-        /// <param name="parameter">The user parameter.</param>
-        public void Update<T>(in T parameter) where T : ISplitterDestinationInParameter
-        {
-            Debug.Assert(Id == parameter.Id);
-
-            if (parameter.IsMagicValid() && Id == parameter.Id)
-            {
-                DestinationId = parameter.DestinationId;
-
-                parameter.MixBufferVolume.CopyTo(MixBufferVolume);
-
-                _biquadFilters = parameter.BiquadFilters;
-
-                if (!IsUsed && parameter.IsUsed)
-                {
-                    MixBufferVolume.CopyTo(PreviousMixBufferVolume);
-
-                    NeedToUpdateInternalState = false;
-                }
-
-                IsUsed = parameter.IsUsed;
-            }
-        }
-
-        /// <summary>
-        /// Update the internal state of the instance.
-        /// </summary>
-        public void UpdateInternalState()
-        {
-            if (IsUsed && NeedToUpdateInternalState)
-            {
-                MixBufferVolume.CopyTo(PreviousMixBufferVolume);
-            }
-
-            NeedToUpdateInternalState = false;
-        }
-
-        /// <summary>
-        /// Set the update internal state marker.
-        /// </summary>
-        public void MarkAsNeedToUpdateInternalState()
-        {
-            NeedToUpdateInternalState = true;
-        }
-
-        /// <summary>
-        /// Return true if the <see cref="SplitterDestinationVersion2"/> is used and has a destination.
-        /// </summary>
-        /// <returns>True if the <see cref="SplitterDestinationVersion2"/> is used and has a destination.</returns>
-        public readonly bool IsConfigured()
-        {
-            return IsUsed && DestinationId != Constants.UnusedMixId;
-        }
-
-        /// <summary>
-        /// Get the volume for a given destination.
-        /// </summary>
-        /// <param name="destinationIndex">The destination index to use.</param>
-        /// <returns>The volume for the given destination.</returns>
-        public float GetMixVolume(int destinationIndex)
-        {
-            Debug.Assert(destinationIndex >= 0 && destinationIndex < Constants.MixBufferCountMax);
-
-            return MixBufferVolume[destinationIndex];
-        }
-
-        /// <summary>
-        /// Get the previous volume for a given destination.
-        /// </summary>
-        /// <param name="destinationIndex">The destination index to use.</param>
-        /// <returns>The volume for the given destination.</returns>
-        public float GetMixVolumePrev(int destinationIndex)
-        {
-            Debug.Assert(destinationIndex >= 0 && destinationIndex < Constants.MixBufferCountMax);
-
-            return PreviousMixBufferVolume[destinationIndex];
-        }
-
-        /// <summary>
-        /// Clear the volumes.
-        /// </summary>
-        public void ClearVolumes()
-        {
-            MixBufferVolume.Clear();
-            PreviousMixBufferVolume.Clear();
-        }
-
-        /// <summary>
-        /// Link the next element to the given <see cref="SplitterDestinationVersion2"/>.
-        /// </summary>
-        /// <param name="next">The given <see cref="SplitterDestinationVersion2"/> to link.</param>
-        public void Link(ref SplitterDestinationVersion2 next)
-        {
-            unsafe
-            {
-                fixed (SplitterDestinationVersion2* nextPtr = &next)
-                {
-                    _next = nextPtr;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Remove the link to the next element.
-        /// </summary>
-        public void Unlink()
-        {
-            unsafe
-            {
-                _next = null;
-            }
-        }
-
-        /// <summary>
-        /// Checks if any biquad filter is enabled.
-        /// </summary>
-        /// <returns>True if any biquad filter is enabled.</returns>
-        public bool IsBiquadFilterEnabled()
-        {
-            return _biquadFilters[0].Enable || _biquadFilters[1].Enable;
-        }
-
-        /// <summary>
-        /// Checks if any biquad filter was previously enabled.
-        /// </summary>
-        /// <returns>True if any biquad filter was previously enabled.</returns>
-        public bool IsBiquadFilterEnabledPrev()
-        {
-            return _isPreviousBiquadFilterEnabled[0];
-        }
-
-        /// <summary>
-        /// Gets the biquad filter parameters.
-        /// </summary>
-        /// <param name="index">Biquad filter index (0 or 1).</param>
-        /// <returns>Biquad filter parameters.</returns>
-        public ref BiquadFilterParameter GetBiquadFilterParameter(int index)
-        {
-            return ref _biquadFilters[index];
-        }
-
-        /// <summary>
-        /// Checks if any biquad filter was previously enabled.
-        /// </summary>
-        /// <param name="index">Biquad filter index (0 or 1).</param>
-        public void UpdateBiquadFilterEnabledPrev(int index)
-        {
-            _isPreviousBiquadFilterEnabled[index] = _biquadFilters[index].Enable;
-        }
-    }
-}

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

@@ -15,8 +15,6 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
     {
         public const int Alignment = 0x10;
 
-        private delegate void SplitterDestinationAction(SplitterDestination destination, int index);
-
         /// <summary>
         /// The unique id of this <see cref="SplitterState"/>.
         /// </summary>
@@ -28,7 +26,7 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
         public uint SampleRate;
 
         /// <summary>
-        /// Count of splitter destinations.
+        /// Count of splitter destinations (<see cref="SplitterDestination"/>).
         /// </summary>
         public int DestinationCount;
 
@@ -39,25 +37,20 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
         public bool HasNewConnection;
 
         /// <summary>
-        /// Linked list of <see cref="SplitterDestinationVersion1"/>.
+        /// Linked list of <see cref="SplitterDestination"/>.
         /// </summary>
-        private unsafe SplitterDestinationVersion1* _destinationDataV1;
+        private unsafe SplitterDestination* _destinationsData;
 
         /// <summary>
-        /// Linked list of <see cref="SplitterDestinationVersion2"/>.
+        /// Span to the first element of the linked list of <see cref="SplitterDestination"/>.
         /// </summary>
-        private unsafe SplitterDestinationVersion2* _destinationDataV2;
-
-        /// <summary>
-        /// First element of the linked list of splitter destinations data.
-        /// </summary>
-        public readonly SplitterDestination Destination
+        public readonly Span<SplitterDestination> Destinations
         {
             get
             {
                 unsafe
                 {
-                    return new SplitterDestination(_destinationDataV1, _destinationDataV2);
+                    return (IntPtr)_destinationsData != IntPtr.Zero ? new Span<SplitterDestination>(_destinationsData, 1) : Span<SplitterDestination>.Empty;
                 }
             }
         }
@@ -71,20 +64,20 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
             Id = id;
         }
 
-        public readonly SplitterDestination GetData(int index)
+        public readonly Span<SplitterDestination> GetData(int index)
         {
             int i = 0;
 
-            SplitterDestination result = Destination;
+            Span<SplitterDestination> result = Destinations;
 
             while (i < index)
             {
-                if (result.IsNull)
+                if (result.IsEmpty)
                 {
                     break;
                 }
 
-                result = result.Next;
+                result = result[0].Next;
                 i++;
             }
 
@@ -100,25 +93,25 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
         }
 
         /// <summary>
-        /// Utility function to apply an action to all <see cref="Destination"/>.
+        /// Utility function to apply a given <see cref="SpanAction{T, TArg}"/> to all <see cref="Destinations"/>.
         /// </summary>
         /// <param name="action">The action to execute on each elements.</param>
-        private readonly void ForEachDestination(SplitterDestinationAction action)
+        private readonly void ForEachDestination(SpanAction<SplitterDestination, int> action)
         {
-            SplitterDestination temp = Destination;
+            Span<SplitterDestination> temp = Destinations;
 
             int i = 0;
 
             while (true)
             {
-                if (temp.IsNull)
+                if (temp.IsEmpty)
                 {
                     break;
                 }
 
-                SplitterDestination next = temp.Next;
+                Span<SplitterDestination> next = temp[0].Next;
 
-                action(temp, i++);
+                action.Invoke(temp, i++);
 
                 temp = next;
             }
@@ -149,9 +142,9 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
             {
                 input.ReadLittleEndian(out int destinationId);
 
-                SplitterDestination destination = context.GetDestination(destinationId);
+                Memory<SplitterDestination> destination = context.GetDestinationMemory(destinationId);
 
-                SetDestination(destination);
+                SetDestination(ref destination.Span[0]);
 
                 DestinationCount = destinationCount;
 
@@ -159,9 +152,9 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
                 {
                     input.ReadLittleEndian(out destinationId);
 
-                    SplitterDestination nextDestination = context.GetDestination(destinationId);
+                    Memory<SplitterDestination> nextDestination = context.GetDestinationMemory(destinationId);
 
-                    destination.Link(nextDestination);
+                    destination.Span[0].Link(ref nextDestination.Span[0]);
                     destination = nextDestination;
                 }
             }
@@ -181,21 +174,16 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
         }
 
         /// <summary>
-        /// Set the head of the linked list of <see cref="Destination"/>.
+        /// Set the head of the linked list of <see cref="Destinations"/>.
         /// </summary>
-        /// <param name="newValue">New destination value.</param>
-        public void SetDestination(SplitterDestination newValue)
+        /// <param name="newValue">A reference to a <see cref="SplitterDestination"/>.</param>
+        public void SetDestination(ref SplitterDestination newValue)
         {
             unsafe
             {
-                fixed (SplitterDestinationVersion1* newValuePtr = &newValue.GetV1RefOrNull())
+                fixed (SplitterDestination* newValuePtr = &newValue)
                 {
-                    _destinationDataV1 = newValuePtr;
-                }
-
-                fixed (SplitterDestinationVersion2* newValuePtr = &newValue.GetV2RefOrNull())
-                {
-                    _destinationDataV2 = newValuePtr;
+                    _destinationsData = newValuePtr;
                 }
             }
         }
@@ -205,20 +193,19 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
         /// </summary>
         public readonly void UpdateInternalState()
         {
-            ForEachDestination((destination, _) => destination.UpdateInternalState());
+            ForEachDestination((destination, _) => destination[0].UpdateInternalState());
         }
 
         /// <summary>
-        /// Clear all links from the <see cref="Destination"/>.
+        /// Clear all links from the <see cref="Destinations"/>.
         /// </summary>
         public void ClearLinks()
         {
-            ForEachDestination((destination, _) => destination.Unlink());
+            ForEachDestination((destination, _) => destination[0].Unlink());
 
             unsafe
             {
-                _destinationDataV1 = null;
-                _destinationDataV2 = null;
+                _destinationsData = (SplitterDestination*)IntPtr.Zero;
             }
         }
 
@@ -232,8 +219,7 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
             {
                 unsafe
                 {
-                    splitter._destinationDataV1 = null;
-                    splitter._destinationDataV2 = null;
+                    splitter._destinationsData = (SplitterDestination*)IntPtr.Zero;
                 }
 
                 splitter.DestinationCount = 0;

src/Ryujinx.Graphics.GAL/BufferAccess.cs

@@ -6,13 +6,8 @@ namespace Ryujinx.Graphics.GAL
     public enum BufferAccess
     {
         Default = 0,
-        HostMemory = 1,
-        DeviceMemory = 2,
-        DeviceMemoryMapped = 3,
-
-        MemoryTypeMask = 0xf,
-
-        Stream = 1 << 4,
-        SparseCompatible = 1 << 5,
+        FlushPersistent = 1 << 0,
+        Stream = 1 << 1,
+        SparseCompatible = 1 << 2,
     }
 }

src/Ryujinx.Graphics.GAL/Capabilities.cs

@@ -6,7 +6,6 @@ namespace Ryujinx.Graphics.GAL
     {
         public readonly TargetApi Api;
         public readonly string VendorName;
-        public readonly SystemMemoryType MemoryType;
 
         public readonly bool HasFrontFacingBug;
         public readonly bool HasVectorIndexingBug;
@@ -37,7 +36,6 @@ namespace Ryujinx.Graphics.GAL
         public readonly bool SupportsMismatchingViewFormat;
         public readonly bool SupportsCubemapView;
         public readonly bool SupportsNonConstantTextureOffset;
-        public readonly bool SupportsQuads;
         public readonly bool SupportsSeparateSampler;
         public readonly bool SupportsShaderBallot;
         public readonly bool SupportsShaderBarrierDivergence;
@@ -67,7 +65,6 @@ namespace Ryujinx.Graphics.GAL
         public Capabilities(
             TargetApi api,
             string vendorName,
-            SystemMemoryType memoryType,
             bool hasFrontFacingBug,
             bool hasVectorIndexingBug,
             bool needsFragmentOutputSpecialization,
@@ -96,7 +93,6 @@ namespace Ryujinx.Graphics.GAL
             bool supportsMismatchingViewFormat,
             bool supportsCubemapView,
             bool supportsNonConstantTextureOffset,
-            bool supportsQuads,
             bool supportsSeparateSampler,
             bool supportsShaderBallot,
             bool supportsShaderBarrierDivergence,
@@ -122,7 +118,6 @@ namespace Ryujinx.Graphics.GAL
         {
             Api = api;
             VendorName = vendorName;
-            MemoryType = memoryType;
             HasFrontFacingBug = hasFrontFacingBug;
             HasVectorIndexingBug = hasVectorIndexingBug;
             NeedsFragmentOutputSpecialization = needsFragmentOutputSpecialization;
@@ -151,7 +146,6 @@ namespace Ryujinx.Graphics.GAL
             SupportsMismatchingViewFormat = supportsMismatchingViewFormat;
             SupportsCubemapView = supportsCubemapView;
             SupportsNonConstantTextureOffset = supportsNonConstantTextureOffset;
-            SupportsQuads = supportsQuads;
             SupportsSeparateSampler = supportsSeparateSampler;
             SupportsShaderBallot = supportsShaderBallot;
             SupportsShaderBarrierDivergence = supportsShaderBarrierDivergence;

src/Ryujinx.Graphics.GAL/Format.cs

@@ -711,36 +711,5 @@ namespace Ryujinx.Graphics.GAL
         {
             return format.IsUint() || format.IsSint();
         }
-
-        /// <summary>
-        /// Checks if the texture format is a float or sRGB color format.
-        /// </summary>
-        /// <remarks>
-        /// Does not include normalized, compressed or depth formats.
-        /// Float and sRGB formats do not participate in logical operations.
-        /// </remarks>
-        /// <param name="format">Texture format</param>
-        /// <returns>True if the format is a float or sRGB color format, false otherwise</returns>
-        public static bool IsFloatOrSrgb(this Format format)
-        {
-            switch (format)
-            {
-                case Format.R8G8B8A8Srgb:
-                case Format.B8G8R8A8Srgb:
-                case Format.R16Float:
-                case Format.R16G16Float:
-                case Format.R16G16B16Float:
-                case Format.R16G16B16A16Float:
-                case Format.R32Float:
-                case Format.R32G32Float:
-                case Format.R32G32B32Float:
-                case Format.R32G32B32A32Float:
-                case Format.R11G11B10Float:
-                case Format.R9G9B9E5Float:
-                    return true;
-            }
-
-            return false;
-        }
     }
 }

src/Ryujinx.Graphics.GAL/IRenderer.cs

@@ -17,6 +17,7 @@ namespace Ryujinx.Graphics.GAL
         void BackgroundContextAction(Action action, bool alwaysBackground = false);
 
         BufferHandle CreateBuffer(int size, BufferAccess access = BufferAccess.Default);
+        BufferHandle CreateBuffer(int size, BufferAccess access, BufferHandle storageHint);
         BufferHandle CreateBuffer(nint pointer, int size);
         BufferHandle CreateBufferSparse(ReadOnlySpan<BufferRange> storageBuffers);
 

src/Ryujinx.Graphics.GAL/Multithreading/CommandHelper.cs

@@ -44,6 +44,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading
             }
 
             Register<ActionCommand>(CommandType.Action);
+            Register<CreateBufferCommand>(CommandType.CreateBuffer);
             Register<CreateBufferAccessCommand>(CommandType.CreateBufferAccess);
             Register<CreateBufferSparseCommand>(CommandType.CreateBufferSparse);
             Register<CreateHostBufferCommand>(CommandType.CreateHostBuffer);

src/Ryujinx.Graphics.GAL/Multithreading/CommandType.cs

@@ -3,6 +3,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading
     enum CommandType : byte
     {
         Action,
+        CreateBuffer,
         CreateBufferAccess,
         CreateBufferSparse,
         CreateHostBuffer,

src/Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/CreateBufferCommand.cs

@@ -0,0 +1,31 @@
+namespace Ryujinx.Graphics.GAL.Multithreading.Commands.Renderer
+{
+    struct CreateBufferCommand : IGALCommand, IGALCommand<CreateBufferCommand>
+    {
+        public readonly CommandType CommandType => CommandType.CreateBuffer;
+        private BufferHandle _threadedHandle;
+        private int _size;
+        private BufferAccess _access;
+        private BufferHandle _storageHint;
+
+        public void Set(BufferHandle threadedHandle, int size, BufferAccess access, BufferHandle storageHint)
+        {
+            _threadedHandle = threadedHandle;
+            _size = size;
+            _access = access;
+            _storageHint = storageHint;
+        }
+
+        public static void Run(ref CreateBufferCommand command, ThreadedRenderer threaded, IRenderer renderer)
+        {
+            BufferHandle hint = BufferHandle.Null;
+
+            if (command._storageHint != BufferHandle.Null)
+            {
+                hint = threaded.Buffers.MapBuffer(command._storageHint);
+            }
+
+            threaded.Buffers.AssignBuffer(command._threadedHandle, renderer.CreateBuffer(command._size, command._access, hint));
+        }
+    }
+}

src/Ryujinx.Graphics.GAL/Multithreading/ThreadedRenderer.cs

@@ -272,6 +272,15 @@ namespace Ryujinx.Graphics.GAL.Multithreading
             return handle;
         }
 
+        public BufferHandle CreateBuffer(int size, BufferAccess access, BufferHandle storageHint)
+        {
+            BufferHandle handle = Buffers.CreateBufferHandle();
+            New<CreateBufferCommand>().Set(handle, size, access, storageHint);
+            QueueCommand();
+
+            return handle;
+        }
+
         public BufferHandle CreateBuffer(nint pointer, int size)
         {
             BufferHandle handle = Buffers.CreateBufferHandle();

src/Ryujinx.Graphics.GAL/SystemMemoryType.cs

@@ -1,29 +0,0 @@
-namespace Ryujinx.Graphics.GAL
-{
-    public enum SystemMemoryType
-    {
-        /// <summary>
-        /// The backend manages the ownership of memory. This mode never supports host imported memory.
-        /// </summary>
-        BackendManaged,
-
-        /// <summary>
-        /// Device memory has similar performance to host memory, usually because it's shared between CPU/GPU.
-        /// Use host memory whenever possible.
-        /// </summary>
-        UnifiedMemory,
-
-        /// <summary>
-        /// GPU storage to host memory goes though a slow interconnect, but it would still be preferable to use it if the data is flushed back often.
-        /// Assumes constant buffer access to host memory is rather fast.
-        /// </summary>
-        DedicatedMemory,
-
-        /// <summary>
-        /// GPU storage to host memory goes though a slow interconnect, that is very slow when doing access from storage.
-        /// When frequently accessed, copy buffers to host memory using DMA.
-        /// Assumes constant buffer access to host memory is rather fast.
-        /// </summary>
-        DedicatedMemorySlowStorage
-    }
-}

src/Ryujinx.Graphics.Gpu/Engine/MME/MacroHLE.cs

@@ -5,7 +5,6 @@ using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.Gpu.Engine.GPFifo;
 using Ryujinx.Graphics.Gpu.Engine.Threed;
 using Ryujinx.Graphics.Gpu.Engine.Types;
-using Ryujinx.Graphics.Gpu.Memory;
 using Ryujinx.Memory.Range;
 using System;
 using System.Collections.Generic;
@@ -496,8 +495,8 @@ namespace Ryujinx.Graphics.Gpu.Engine.MME
 
             ulong indirectBufferSize = (ulong)maxDrawCount * (ulong)stride;
 
-            MultiRange indirectBufferRange = bufferCache.TranslateAndCreateMultiBuffers(_processor.MemoryManager, indirectBufferGpuVa, indirectBufferSize, BufferStage.Indirect);
-            MultiRange parameterBufferRange = bufferCache.TranslateAndCreateMultiBuffers(_processor.MemoryManager, parameterBufferGpuVa, 4, BufferStage.Indirect);
+            MultiRange indirectBufferRange = bufferCache.TranslateAndCreateMultiBuffers(_processor.MemoryManager, indirectBufferGpuVa, indirectBufferSize);
+            MultiRange parameterBufferRange = bufferCache.TranslateAndCreateMultiBuffers(_processor.MemoryManager, parameterBufferGpuVa, 4);
 
             _processor.ThreedClass.DrawIndirect(
                 topology,

src/Ryujinx.Graphics.Gpu/Engine/Threed/ComputeDraw/VtgAsComputeContext.cs

@@ -438,7 +438,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed.ComputeDraw
 
             ReadOnlySpan<byte> dataBytes = MemoryMarshal.Cast<int, byte>(data);
 
-            BufferHandle buffer = _context.Renderer.CreateBuffer(dataBytes.Length, BufferAccess.DeviceMemory);
+            BufferHandle buffer = _context.Renderer.CreateBuffer(dataBytes.Length);
             _context.Renderer.SetBufferData(buffer, 0, dataBytes);
 
             return new IndexBuffer(buffer, count, dataBytes.Length);
@@ -529,7 +529,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed.ComputeDraw
         {
             if (_dummyBuffer == BufferHandle.Null)
             {
-                _dummyBuffer = _context.Renderer.CreateBuffer(DummyBufferSize, BufferAccess.DeviceMemory);
+                _dummyBuffer = _context.Renderer.CreateBuffer(DummyBufferSize);
                 _context.Renderer.Pipeline.ClearBuffer(_dummyBuffer, 0, DummyBufferSize, 0);
             }
 
@@ -550,7 +550,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed.ComputeDraw
                     _context.Renderer.DeleteBuffer(_sequentialIndexBuffer);
                 }
 
-                _sequentialIndexBuffer = _context.Renderer.CreateBuffer(count * sizeof(uint), BufferAccess.DeviceMemory);
+                _sequentialIndexBuffer = _context.Renderer.CreateBuffer(count * sizeof(uint));
                 _sequentialIndexBufferCount = count;
 
                 Span<int> data = new int[count];
@@ -583,7 +583,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed.ComputeDraw
                     _context.Renderer.DeleteBuffer(buffer.Handle);
                 }
 
-                buffer.Handle = _context.Renderer.CreateBuffer(newSize, BufferAccess.DeviceMemory);
+                buffer.Handle = _context.Renderer.CreateBuffer(newSize);
                 buffer.Size = newSize;
             }
 

src/Ryujinx.Graphics.Gpu/Engine/Threed/ComputeDraw/VtgAsComputeState.cs

@@ -3,7 +3,6 @@ using Ryujinx.Common.Logging;
 using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.Gpu.Engine.Types;
 using Ryujinx.Graphics.Gpu.Image;
-using Ryujinx.Graphics.Gpu.Memory;
 using Ryujinx.Graphics.Gpu.Shader;
 using Ryujinx.Graphics.Shader;
 using Ryujinx.Graphics.Shader.Translation;
@@ -371,7 +370,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed.ComputeDraw
         {
             var memoryManager = _channel.MemoryManager;
 
-            BufferRange range = memoryManager.Physical.BufferCache.GetBufferRange(memoryManager.GetPhysicalRegions(address, size), BufferStage.VertexBuffer);
+            BufferRange range = memoryManager.Physical.BufferCache.GetBufferRange(memoryManager.GetPhysicalRegions(address, size));
 
             ITexture bufferTexture = _vacContext.EnsureBufferTexture(index + 2, format);
             bufferTexture.SetStorage(range);
@@ -413,9 +412,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed.ComputeDraw
             var memoryManager = _channel.MemoryManager;
 
             ulong misalign = address & ((ulong)_context.Capabilities.TextureBufferOffsetAlignment - 1);
-            BufferRange range = memoryManager.Physical.BufferCache.GetBufferRange(
-                memoryManager.GetPhysicalRegions(address + indexOffset - misalign, size + misalign),
-                BufferStage.IndexBuffer);
+            BufferRange range = memoryManager.Physical.BufferCache.GetBufferRange(memoryManager.GetPhysicalRegions(address + indexOffset - misalign, size + misalign));
             misalignedOffset = (int)misalign >> shift;
 
             SetIndexBufferTexture(reservations, range, format);

src/Ryujinx.Graphics.Gpu/Engine/Threed/DrawManager.cs

@@ -684,8 +684,8 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
 
             if (hasCount)
             {
-                var indirectBuffer = memory.BufferCache.GetBufferRange(indirectBufferRange, BufferStage.Indirect);
-                var parameterBuffer = memory.BufferCache.GetBufferRange(parameterBufferRange, BufferStage.Indirect);
+                var indirectBuffer = memory.BufferCache.GetBufferRange(indirectBufferRange);
+                var parameterBuffer = memory.BufferCache.GetBufferRange(parameterBufferRange);
 
                 if (indexed)
                 {
@@ -698,7 +698,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
             }
             else
             {
-                var indirectBuffer = memory.BufferCache.GetBufferRange(indirectBufferRange, BufferStage.Indirect);
+                var indirectBuffer = memory.BufferCache.GetBufferRange(indirectBufferRange);
 
                 if (indexed)
                 {

src/Ryujinx.Graphics.Gpu/GpuContext.cs

@@ -393,18 +393,11 @@ namespace Ryujinx.Graphics.Gpu
 
             if (force || _pendingSync || (syncpoint && SyncpointActions.Count > 0))
             {
-                foreach (var action in SyncActions)
-                {
-                    action.SyncPreAction(syncpoint);
-                }
-
-                foreach (var action in SyncpointActions)
-                {
-                    action.SyncPreAction(syncpoint);
-                }
-
                 Renderer.CreateSync(SyncNumber, strict);
 
+                SyncActions.ForEach(action => action.SyncPreAction(syncpoint));
+                SyncpointActions.ForEach(action => action.SyncPreAction(syncpoint));
+
                 SyncNumber++;
 
                 SyncActions.RemoveAll(action => action.SyncAction(syncpoint));

src/Ryujinx.Graphics.Gpu/Image/Texture.cs

@@ -390,7 +390,7 @@ namespace Ryujinx.Graphics.Gpu.Image
         {
             _views.Remove(texture);
 
-            Group.RemoveView(_views, texture);
+            Group.RemoveView(texture);
 
             texture._viewStorage = texture;
 

src/Ryujinx.Graphics.Gpu/Image/TextureBindingsArrayCache.cs

@@ -708,11 +708,11 @@ namespace Ryujinx.Graphics.Gpu.Image
                             format = texture.Format;
                         }
 
-                        _channel.BufferManager.SetBufferTextureStorage(stage, entry.ImageArray, hostTexture, texture.Range, bindingInfo, index, format);
+                        _channel.BufferManager.SetBufferTextureStorage(entry.ImageArray, hostTexture, texture.Range, bindingInfo, index, format);
                     }
                     else
                     {
-                        _channel.BufferManager.SetBufferTextureStorage(stage, entry.TextureArray, hostTexture, texture.Range, bindingInfo, index, format);
+                        _channel.BufferManager.SetBufferTextureStorage(entry.TextureArray, hostTexture, texture.Range, bindingInfo, index, format);
                     }
                 }
                 else if (isImage)
@@ -921,11 +921,11 @@ namespace Ryujinx.Graphics.Gpu.Image
                             format = texture.Format;
                         }
 
-                        _channel.BufferManager.SetBufferTextureStorage(stage, entry.ImageArray, hostTexture, texture.Range, bindingInfo, index, format);
+                        _channel.BufferManager.SetBufferTextureStorage(entry.ImageArray, hostTexture, texture.Range, bindingInfo, index, format);
                     }
                     else
                     {
-                        _channel.BufferManager.SetBufferTextureStorage(stage, entry.TextureArray, hostTexture, texture.Range, bindingInfo, index, format);
+                        _channel.BufferManager.SetBufferTextureStorage(entry.TextureArray, hostTexture, texture.Range, bindingInfo, index, format);
                     }
                 }
                 else if (isImage)

src/Ryujinx.Graphics.Gpu/Image/TextureCache.cs

@@ -8,7 +8,6 @@ using Ryujinx.Graphics.Texture;
 using Ryujinx.Memory.Range;
 using System;
 using System.Collections.Generic;
-using System.Threading;
 
 namespace Ryujinx.Graphics.Gpu.Image
 {
@@ -40,8 +39,6 @@ namespace Ryujinx.Graphics.Gpu.Image
         private readonly MultiRangeList<Texture> _textures;
         private readonly HashSet<Texture> _partiallyMappedTextures;
 
-        private readonly ReaderWriterLockSlim _texturesLock;
-
         private Texture[] _textureOverlaps;
         private OverlapInfo[] _overlapInfo;
 
@@ -60,8 +57,6 @@ namespace Ryujinx.Graphics.Gpu.Image
             _textures = new MultiRangeList<Texture>();
             _partiallyMappedTextures = new HashSet<Texture>();
 
-            _texturesLock = new ReaderWriterLockSlim();
-
             _textureOverlaps = new Texture[OverlapsBufferInitialCapacity];
             _overlapInfo = new OverlapInfo[OverlapsBufferInitialCapacity];
 
@@ -80,16 +75,10 @@ namespace Ryujinx.Graphics.Gpu.Image
 
             MultiRange unmapped = ((MemoryManager)sender).GetPhysicalRegions(e.Address, e.Size);
 
-            _texturesLock.EnterReadLock();
-
-            try
+            lock (_textures)
             {
                 overlapCount = _textures.FindOverlaps(unmapped, ref overlaps);
             }
-            finally
-            {
-                _texturesLock.ExitReadLock();
-            }
 
             if (overlapCount > 0)
             {
@@ -228,18 +217,7 @@ namespace Ryujinx.Graphics.Gpu.Image
         public bool UpdateMapping(Texture texture, MultiRange range)
         {
             // There cannot be an existing texture compatible with this mapping in the texture cache already.
-            int overlapCount;
-
-            _texturesLock.EnterReadLock();
-
-            try
-            {
-                overlapCount = _textures.FindOverlaps(range, ref _textureOverlaps);
-            }
-            finally
-            {
-                _texturesLock.ExitReadLock();
-            }
+            int overlapCount = _textures.FindOverlaps(range, ref _textureOverlaps);
 
             for (int i = 0; i < overlapCount; i++)
             {
@@ -253,20 +231,11 @@ namespace Ryujinx.Graphics.Gpu.Image
                 }
             }
 
-            _texturesLock.EnterWriteLock();
+            _textures.Remove(texture);
 
-            try
-            {
-                _textures.Remove(texture);
+            texture.ReplaceRange(range);
 
-                texture.ReplaceRange(range);
-
-                _textures.Add(texture);
-            }
-            finally
-            {
-                _texturesLock.ExitWriteLock();
-            }
+            _textures.Add(texture);
 
             return true;
         }
@@ -642,17 +611,11 @@ namespace Ryujinx.Graphics.Gpu.Image
 
             int sameAddressOverlapsCount;
 
-            _texturesLock.EnterReadLock();
-
-            try
+            lock (_textures)
             {
                 // Try to find a perfect texture match, with the same address and parameters.
                 sameAddressOverlapsCount = _textures.FindOverlaps(address, ref _textureOverlaps);
             }
-            finally
-            {
-                _texturesLock.ExitReadLock();
-            }
 
             Texture texture = null;
 
@@ -735,16 +698,10 @@ namespace Ryujinx.Graphics.Gpu.Image
 
             if (info.Target != Target.TextureBuffer)
             {
-                _texturesLock.EnterReadLock();
-
-                try
+                lock (_textures)
                 {
                     overlapsCount = _textures.FindOverlaps(range.Value, ref _textureOverlaps);
                 }
-                finally
-                {
-                    _texturesLock.ExitReadLock();
-                }
             }
 
             if (_overlapInfo.Length != _textureOverlaps.Length)
@@ -1068,16 +1025,10 @@ namespace Ryujinx.Graphics.Gpu.Image
                 _cache.Add(texture);
             }
 
-            _texturesLock.EnterWriteLock();
-
-            try
+            lock (_textures)
             {
                 _textures.Add(texture);
             }
-            finally
-            {
-                _texturesLock.ExitWriteLock();
-            }
 
             if (partiallyMapped)
             {
@@ -1140,19 +1091,7 @@ namespace Ryujinx.Graphics.Gpu.Image
                 return null;
             }
 
-            int addressMatches;
-
-            _texturesLock.EnterReadLock();
-
-            try
-            {
-                addressMatches = _textures.FindOverlaps(address, ref _textureOverlaps);
-            }
-            finally
-            {
-                _texturesLock.ExitReadLock();
-            }
-
+            int addressMatches = _textures.FindOverlaps(address, ref _textureOverlaps);
             Texture textureMatch = null;
 
             for (int i = 0; i < addressMatches; i++)
@@ -1293,16 +1232,10 @@ namespace Ryujinx.Graphics.Gpu.Image
         /// <param name="texture">The texture to be removed</param>
         public void RemoveTextureFromCache(Texture texture)
         {
-            _texturesLock.EnterWriteLock();
-
-            try
+            lock (_textures)
             {
                 _textures.Remove(texture);
             }
-            finally
-            {
-                _texturesLock.ExitWriteLock();
-            }
 
             lock (_partiallyMappedTextures)
             {
@@ -1391,19 +1324,13 @@ namespace Ryujinx.Graphics.Gpu.Image
         /// </summary>
         public void Dispose()
         {
-            _texturesLock.EnterReadLock();
-
-            try
+            lock (_textures)
             {
                 foreach (Texture texture in _textures)
                 {
                     texture.Dispose();
                 }
             }
-            finally
-            {
-                _texturesLock.ExitReadLock();
-            }
         }
     }
 }

src/Ryujinx.Graphics.Gpu/Image/TextureGroup.cs

@@ -88,9 +88,9 @@ namespace Ryujinx.Graphics.Gpu.Image
         private MultiRange TextureRange => Storage.Range;
 
         /// <summary>
-        /// The views array from the storage texture.
+        /// The views list from the storage texture.
         /// </summary>
-        private Texture[] _views;
+        private List<Texture> _views;
         private TextureGroupHandle[] _handles;
         private bool[] _loadNeeded;
 
@@ -645,7 +645,7 @@ namespace Ryujinx.Graphics.Gpu.Image
                 }
                 else
                 {
-                    _flushBuffer = _context.Renderer.CreateBuffer((int)Storage.Size, BufferAccess.HostMemory);
+                    _flushBuffer = _context.Renderer.CreateBuffer((int)Storage.Size, BufferAccess.FlushPersistent);
                     _flushBufferImported = false;
                 }
 
@@ -1074,7 +1074,7 @@ namespace Ryujinx.Graphics.Gpu.Image
         public void UpdateViews(List<Texture> views, Texture texture)
         {
             // This is saved to calculate overlapping views for each handle.
-            _views = views.ToArray();
+            _views = views;
 
             bool layerViews = _hasLayerViews;
             bool mipViews = _hasMipViews;
@@ -1136,13 +1136,9 @@ namespace Ryujinx.Graphics.Gpu.Image
         /// <summary>
         /// Removes a view from the group, removing it from all overlap lists.
         /// </summary>
-        /// <param name="views">The views list of the storage texture</param>
         /// <param name="view">View to remove from the group</param>
-        public void RemoveView(List<Texture> views, Texture view)
+        public void RemoveView(Texture view)
         {
-            // This is saved to calculate overlapping views for each handle.
-            _views = views.ToArray();
-
             int offset = FindOffset(view);
 
             foreach (TextureGroupHandle handle in _handles)
@@ -1609,11 +1605,9 @@ namespace Ryujinx.Graphics.Gpu.Image
 
             Storage.SignalModifiedDirty();
 
-            Texture[] views = _views;
-
-            if (views != null)
+            if (_views != null)
             {
-                foreach (Texture texture in views)
+                foreach (Texture texture in _views)
                 {
                     texture.SignalModifiedDirty();
                 }

src/Ryujinx.Graphics.Gpu/Image/TextureGroupHandle.cs

@@ -121,7 +121,7 @@ namespace Ryujinx.Graphics.Gpu.Image
         public TextureGroupHandle(TextureGroup group,
                                   int offset,
                                   ulong size,
-                                  IEnumerable<Texture> views,
+                                  List<Texture> views,
                                   int firstLayer,
                                   int firstLevel,
                                   int baseSlice,
@@ -201,8 +201,8 @@ namespace Ryujinx.Graphics.Gpu.Image
         /// Calculate a list of which views overlap this handle.
         /// </summary>
         /// <param name="group">The parent texture group, used to find a view's base CPU VA offset</param>
-        /// <param name="views">The views to search for overlaps</param>
-        public void RecalculateOverlaps(TextureGroup group, IEnumerable<Texture> views)
+        /// <param name="views">The list of views to search for overlaps</param>
+        public void RecalculateOverlaps(TextureGroup group, List<Texture> views)
         {
             // Overlaps can be accessed from the memory tracking signal handler, so access must be atomic.
             lock (Overlaps)

src/Ryujinx.Graphics.Gpu/Memory/Buffer.cs

@@ -10,8 +10,6 @@ using System.Threading;
 
 namespace Ryujinx.Graphics.Gpu.Memory
 {
-    delegate void BufferFlushAction(ulong address, ulong size, ulong syncNumber);
-
     /// <summary>
     /// Buffer, used to store vertex and index data, uniform and storage buffers, and others.
     /// </summary>
@@ -25,7 +23,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// <summary>
         /// Host buffer handle.
         /// </summary>
-        public BufferHandle Handle { get; private set; }
+        public BufferHandle Handle { get; }
 
         /// <summary>
         /// Start address of the buffer in guest memory.
@@ -62,17 +60,6 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// </remarks>
         private BufferModifiedRangeList _modifiedRanges = null;
 
-        /// <summary>
-        /// A structure that is used to flush buffer data back to a host mapped buffer for cached readback.
-        /// Only used if the buffer data is explicitly owned by device local memory.
-        /// </summary>
-        private BufferPreFlush _preFlush = null;
-
-        /// <summary>
-        /// Usage tracking state that determines what type of backing the buffer should use.
-        /// </summary>
-        public BufferBackingState BackingState;
-
         private readonly MultiRegionHandle _memoryTrackingGranular;
         private readonly RegionHandle _memoryTracking;
 
@@ -100,7 +87,6 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// <param name="physicalMemory">Physical memory where the buffer is mapped</param>
         /// <param name="address">Start address of the buffer</param>
         /// <param name="size">Size of the buffer in bytes</param>
-        /// <param name="stage">The type of usage that created the buffer</param>
         /// <param name="sparseCompatible">Indicates if the buffer can be used in a sparse buffer mapping</param>
         /// <param name="baseBuffers">Buffers which this buffer contains, and will inherit tracking handles from</param>
         public Buffer(
@@ -108,7 +94,6 @@ namespace Ryujinx.Graphics.Gpu.Memory
             PhysicalMemory physicalMemory,
             ulong address,
             ulong size,
-            BufferStage stage,
             bool sparseCompatible,
             IEnumerable<Buffer> baseBuffers = null)
         {
@@ -118,11 +103,9 @@ namespace Ryujinx.Graphics.Gpu.Memory
             Size = size;
             SparseCompatible = sparseCompatible;
 
-            BackingState = new BufferBackingState(_context, this, stage, baseBuffers);
+            BufferAccess access = sparseCompatible ? BufferAccess.SparseCompatible : BufferAccess.Default;
 
-            BufferAccess access = BackingState.SwitchAccess(this);
-
-            Handle = context.Renderer.CreateBuffer((int)size, access);
+            Handle = context.Renderer.CreateBuffer((int)size, access, baseBuffers?.MaxBy(x => x.Size).Handle ?? BufferHandle.Null);
 
             _useGranular = size > GranularBufferThreshold;
 
@@ -178,29 +161,6 @@ namespace Ryujinx.Graphics.Gpu.Memory
             _virtualDependenciesLock = new ReaderWriterLockSlim();
         }
 
-        /// <summary>
-        /// Recreates the backing buffer based on the desired access type
-        /// reported by the backing state struct.
-        /// </summary>
-        private void ChangeBacking()
-        {
-            BufferAccess access = BackingState.SwitchAccess(this);
-
-            BufferHandle newHandle = _context.Renderer.CreateBuffer((int)Size, access);
-
-            _context.Renderer.Pipeline.CopyBuffer(Handle, newHandle, 0, 0, (int)Size);
-
-            _modifiedRanges?.SelfMigration();
-
-            // If swtiching from device local to host mapped, pre-flushing data no longer makes sense.
-            // This is set to null and disposed when the migration fully completes.
-            _preFlush = null;
-
-            Handle = newHandle;
-
-            _physicalMemory.BufferCache.BufferBackingChanged(this);
-        }
-
         /// <summary>
         /// Gets a sub-range from the buffer, from a start address til a page boundary after the given size.
         /// </summary>
@@ -286,7 +246,6 @@ namespace Ryujinx.Graphics.Gpu.Memory
                     }
                     else
                     {
-                        BackingState.RecordSet();
                         _context.Renderer.SetBufferData(Handle, 0, _physicalMemory.GetSpan(Address, (int)Size));
                         CopyToDependantVirtualBuffers();
                     }
@@ -324,35 +283,15 @@ namespace Ryujinx.Graphics.Gpu.Memory
             _modifiedRanges ??= new BufferModifiedRangeList(_context, this, Flush);
         }
 
-        /// <summary>
-        /// Checks if a backing change is deemed necessary from the given usage.
-        /// If it is, queues a backing change to happen on the next sync action.
-        /// </summary>
-        /// <param name="stage">Buffer stage that can change backing type</param>
-        private void TryQueueBackingChange(BufferStage stage)
-        {
-            if (BackingState.ShouldChangeBacking(stage))
-            {
-                if (!_syncActionRegistered)
-                {
-                    _context.RegisterSyncAction(this);
-                    _syncActionRegistered = true;
-                }
-            }
-        }
-
         /// <summary>
         /// Signal that the given region of the buffer has been modified.
         /// </summary>
         /// <param name="address">The start address of the modified region</param>
         /// <param name="size">The size of the modified region</param>
-        /// <param name="stage">Buffer stage that triggered the modification</param>
-        public void SignalModified(ulong address, ulong size, BufferStage stage)
+        public void SignalModified(ulong address, ulong size)
         {
             EnsureRangeList();
 
-            TryQueueBackingChange(stage);
-
             _modifiedRanges.SignalModified(address, size);
 
             if (!_syncActionRegistered)
@@ -372,37 +311,6 @@ namespace Ryujinx.Graphics.Gpu.Memory
             _modifiedRanges?.Clear(address, size);
         }
 
-        /// <summary>
-        /// Action to be performed immediately before sync is created.
-        /// This will copy any buffer ranges designated for pre-flushing.
-        /// </summary>
-        /// <param name="syncpoint">True if the action is a guest syncpoint</param>
-        public void SyncPreAction(bool syncpoint)
-        {
-            if (_referenceCount == 0)
-            {
-                return;
-            }
-
-            if (BackingState.ShouldChangeBacking())
-            {
-                ChangeBacking();
-            }
-
-            if (BackingState.IsDeviceLocal)
-            {
-                _preFlush ??= new BufferPreFlush(_context, this, FlushImpl);
-
-                if (_preFlush.ShouldCopy)
-                {
-                    _modifiedRanges?.GetRangesAtSync(Address, Size, _context.SyncNumber, (address, size) =>
-                    {
-                        _preFlush.CopyModified(address, size);
-                    });
-                }
-            }
-        }
-
         /// <summary>
         /// Action to be performed when a syncpoint is reached after modification.
         /// This will register read/write tracking to flush the buffer from GPU when its memory is used.
@@ -558,8 +466,6 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// <param name="mSize">Size of the modified region</param>
         private void LoadRegion(ulong mAddress, ulong mSize)
         {
-            BackingState.RecordSet();
-
             int offset = (int)(mAddress - Address);
 
             _context.Renderer.SetBufferData(Handle, offset, _physicalMemory.GetSpan(mAddress, (int)mSize));
@@ -633,84 +539,18 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// Flushes a range of the buffer.
         /// This writes the range data back into guest memory.
         /// </summary>
-        /// <param name="handle">Buffer handle to flush data from</param>
         /// <param name="address">Start address of the range</param>
         /// <param name="size">Size in bytes of the range</param>
-        private void FlushImpl(BufferHandle handle, ulong address, ulong size)
+        public void Flush(ulong address, ulong size)
         {
             int offset = (int)(address - Address);
 
-            using PinnedSpan<byte> data = _context.Renderer.GetBufferData(handle, offset, (int)size);
+            using PinnedSpan<byte> data = _context.Renderer.GetBufferData(Handle, offset, (int)size);
 
             // TODO: When write tracking shaders, they will need to be aware of changes in overlapping buffers.
             _physicalMemory.WriteUntracked(address, CopyFromDependantVirtualBuffers(data.Get(), address, size));
         }
 
-        /// <summary>
-        /// Flushes a range of the buffer.
-        /// This writes the range data back into guest memory.
-        /// </summary>
-        /// <param name="address">Start address of the range</param>
-        /// <param name="size">Size in bytes of the range</param>
-        private void FlushImpl(ulong address, ulong size)
-        {
-            FlushImpl(Handle, address, size);
-        }
-
-        /// <summary>
-        /// Flushes a range of the buffer from the most optimal source.
-        /// This writes the range data back into guest memory.
-        /// </summary>
-        /// <param name="address">Start address of the range</param>
-        /// <param name="size">Size in bytes of the range</param>
-        /// <param name="syncNumber">Sync number waited for before flushing the data</param>
-        public void Flush(ulong address, ulong size, ulong syncNumber)
-        {
-            BackingState.RecordFlush();
-
-            BufferPreFlush preFlush = _preFlush;
-
-            if (preFlush != null)
-            {
-                preFlush.FlushWithAction(address, size, syncNumber);
-            }
-            else
-            {
-                FlushImpl(address, size);
-            }
-        }
-        /// <summary>
-        /// Gets an action that disposes the backing buffer using its current handle.
-        /// Useful for deleting an old copy of the buffer after the handle changes.
-        /// </summary>
-        /// <returns>An action that flushes data from the specified range, using the buffer handle at the time the method is generated</returns>
-        public Action GetSnapshotDisposeAction()
-        {
-            BufferHandle handle = Handle;
-            BufferPreFlush preFlush = _preFlush;
-
-            return () =>
-            {
-                _context.Renderer.DeleteBuffer(handle);
-                preFlush?.Dispose();
-            };
-        }
-
-        /// <summary>
-        /// Gets an action that flushes a range of the buffer using its current handle.
-        /// Useful for flushing data from old copies of the buffer after the handle changes.
-        /// </summary>
-        /// <returns>An action that flushes data from the specified range, using the buffer handle at the time the method is generated</returns>
-        public BufferFlushAction GetSnapshotFlushAction()
-        {
-            BufferHandle handle = Handle;
-
-            return (ulong address, ulong size, ulong _) =>
-            {
-                FlushImpl(handle, address, size);
-            };
-        }
-
         /// <summary>
         /// Align a given address and size region to page boundaries.
         /// </summary>
@@ -1017,8 +857,6 @@ namespace Ryujinx.Graphics.Gpu.Memory
             _modifiedRanges?.Clear();
 
             _context.Renderer.DeleteBuffer(Handle);
-            _preFlush?.Dispose();
-            _preFlush = null;
 
             UnmappedSequence++;
         }

src/Ryujinx.Graphics.Gpu/Memory/BufferBackingState.cs

@@ -1,294 +0,0 @@
-using Ryujinx.Graphics.GAL;
-using System;
-using System.Collections.Generic;
-
-namespace Ryujinx.Graphics.Gpu.Memory
-{
-    /// <summary>
-    /// Type of backing memory.
-    /// In ascending order of priority when merging multiple buffer backing states.
-    /// </summary>
-    internal enum BufferBackingType
-    {
-        HostMemory,
-        DeviceMemory,
-        DeviceMemoryWithFlush
-    }
-
-    /// <summary>
-    /// Keeps track of buffer usage to decide what memory heap that buffer memory is placed on.
-    /// Dedicated GPUs prefer certain types of resources to be device local,
-    /// and if we need data to be read back, we might prefer that they're in host memory.
-    /// 
-    /// The measurements recorded here compare to a set of heruristics (thresholds and conditions)
-    /// that appear to produce good performance in most software.
-    /// </summary>
-    internal struct BufferBackingState
-    {
-        private const int DeviceLocalSizeThreshold = 256 * 1024; // 256kb
-
-        private const int SetCountThreshold = 100;
-        private const int WriteCountThreshold = 50;
-        private const int FlushCountThreshold = 5;
-        private const int DeviceLocalForceExpiry = 100;
-
-        public readonly bool IsDeviceLocal => _activeType != BufferBackingType.HostMemory;
-
-        private readonly SystemMemoryType _systemMemoryType;
-        private BufferBackingType _activeType;
-        private BufferBackingType _desiredType;
-
-        private bool _canSwap;
-
-        private int _setCount;
-        private int _writeCount;
-        private int _flushCount;
-        private int _flushTemp;
-        private int _lastFlushWrite;
-        private int _deviceLocalForceCount;
-
-        private readonly int _size;
-
-        /// <summary>
-        /// Initialize the buffer backing state for a given parent buffer.
-        /// </summary>
-        /// <param name="context">GPU context</param>
-        /// <param name="parent">Parent buffer</param>
-        /// <param name="stage">Initial buffer stage</param>
-        /// <param name="baseBuffers">Buffers to inherit state from</param>
-        public BufferBackingState(GpuContext context, Buffer parent, BufferStage stage, IEnumerable<Buffer> baseBuffers = null)
-        {
-            _size = (int)parent.Size;
-            _systemMemoryType = context.Capabilities.MemoryType;
-
-            // Backend managed is always auto, unified memory is always host.
-            _desiredType = BufferBackingType.HostMemory;
-            _canSwap = _systemMemoryType != SystemMemoryType.BackendManaged && _systemMemoryType != SystemMemoryType.UnifiedMemory;
-
-            if (_canSwap)
-            {
-                // Might want to start certain buffers as being device local,
-                // and the usage might also lock those buffers into being device local.
-
-                BufferStage storageFlags = stage & BufferStage.StorageMask;
-
-                if (parent.Size > DeviceLocalSizeThreshold && baseBuffers == null)
-                {
-                    _desiredType = BufferBackingType.DeviceMemory;
-                }
-
-                if (storageFlags != 0)
-                {
-                    // Storage buffer bindings may require special treatment.
-
-                    var rawStage = stage & BufferStage.StageMask;
-
-                    if (rawStage == BufferStage.Fragment)
-                    {
-                        // Fragment read should start device local.
-
-                        _desiredType = BufferBackingType.DeviceMemory;
-
-                        if (storageFlags != BufferStage.StorageRead)
-                        {
-                            // Fragment write should stay device local until the use doesn't happen anymore.
-
-                            _deviceLocalForceCount = DeviceLocalForceExpiry;
-                        }
-                    }
-
-                    // TODO: Might be nice to force atomic access to be device local for any stage.
-                }
-
-                if (baseBuffers != null)
-                {
-                    foreach (Buffer buffer in baseBuffers)
-                    {
-                        CombineState(buffer.BackingState);
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Combine buffer backing types, selecting the one with highest priority.
-        /// </summary>
-        /// <param name="left">First buffer backing type</param>
-        /// <param name="right">Second buffer backing type</param>
-        /// <returns>Combined buffer backing type</returns>
-        private static BufferBackingType CombineTypes(BufferBackingType left, BufferBackingType right)
-        {
-            return (BufferBackingType)Math.Max((int)left, (int)right);
-        }
-
-        /// <summary>
-        /// Combine the state from the given buffer backing state with this one,
-        /// so that the state isn't lost when migrating buffers.
-        /// </summary>
-        /// <param name="oldState">Buffer state to combine into this state</param>
-        private void CombineState(BufferBackingState oldState)
-        {
-            _setCount += oldState._setCount;
-            _writeCount += oldState._writeCount;
-            _flushCount += oldState._flushCount;
-            _flushTemp += oldState._flushTemp;
-            _lastFlushWrite = -1;
-            _deviceLocalForceCount = Math.Max(_deviceLocalForceCount, oldState._deviceLocalForceCount);
-
-            _canSwap &= oldState._canSwap;
-
-            _desiredType = CombineTypes(_desiredType, oldState._desiredType);
-        }
-
-        /// <summary>
-        /// Get the buffer access for the desired backing type, and record that type as now being active.
-        /// </summary>
-        /// <param name="parent">Parent buffer</param>
-        /// <returns>Buffer access</returns>
-        public BufferAccess SwitchAccess(Buffer parent)
-        {
-            BufferAccess access = parent.SparseCompatible ? BufferAccess.SparseCompatible : BufferAccess.Default;
-
-            bool isBackendManaged = _systemMemoryType == SystemMemoryType.BackendManaged;
-
-            if (!isBackendManaged)
-            {
-                switch (_desiredType)
-                {
-                    case BufferBackingType.HostMemory:
-                        access |= BufferAccess.HostMemory;
-                        break;
-                    case BufferBackingType.DeviceMemory:
-                        access |= BufferAccess.DeviceMemory;
-                        break;
-                    case BufferBackingType.DeviceMemoryWithFlush:
-                        access |= BufferAccess.DeviceMemoryMapped;
-                        break;
-                }
-            }
-
-            _activeType = _desiredType;
-
-            return access;
-        }
-
-        /// <summary>
-        /// Record when data has been uploaded to the buffer.
-        /// </summary>
-        public void RecordSet()
-        {
-            _setCount++;
-
-            ConsiderUseCounts();
-        }
-
-        /// <summary>
-        /// Record when data has been flushed from the buffer.
-        /// </summary>
-        public void RecordFlush()
-        {
-            if (_lastFlushWrite != _writeCount)
-            {
-                // If it's on the same page as the last flush, ignore it.
-                _lastFlushWrite = _writeCount;
-                _flushCount++;
-            }
-        }
-
-        /// <summary>
-        /// Determine if the buffer backing should be changed.
-        /// </summary>
-        /// <returns>True if the desired backing type is different from the current type</returns>
-        public readonly bool ShouldChangeBacking()
-        {
-            return _desiredType != _activeType;
-        }
-
-        /// <summary>
-        /// Determine if the buffer backing should be changed, considering a new use with the given buffer stage.
-        /// </summary>
-        /// <param name="stage">Buffer stage for the use</param>
-        /// <returns>True if the desired backing type is different from the current type</returns>
-        public bool ShouldChangeBacking(BufferStage stage)
-        {
-            if (!_canSwap)
-            {
-                return false;
-            }
-
-            BufferStage storageFlags = stage & BufferStage.StorageMask;
-
-            if (storageFlags != 0)
-            {
-                if (storageFlags != BufferStage.StorageRead)
-                {
-                    // Storage write.
-                    _writeCount++;
-
-                    var rawStage = stage & BufferStage.StageMask;
-
-                    if (rawStage == BufferStage.Fragment)
-                    {
-                        // Switch to device memory, swap back only if this use disappears.
-
-                        _desiredType = CombineTypes(_desiredType, BufferBackingType.DeviceMemory);
-                        _deviceLocalForceCount = DeviceLocalForceExpiry;
-
-                        // TODO: Might be nice to force atomic access to be device local for any stage.
-                    }
-                }
-
-                ConsiderUseCounts();
-            }
-
-            return _desiredType != _activeType;
-        }
-
-        /// <summary>
-        /// Evaluate the current counts to determine what the buffer's desired backing type is.
-        /// This method depends on heuristics devised by testing a variety of software.
-        /// </summary>
-        private void ConsiderUseCounts()
-        {
-            if (_canSwap)
-            {
-                if (_writeCount >= WriteCountThreshold || _setCount >= SetCountThreshold || _flushCount >= FlushCountThreshold)
-                {
-                    if (_deviceLocalForceCount > 0 && --_deviceLocalForceCount != 0)
-                    {
-                        // Some buffer usage demanded that the buffer stay device local.
-                        // The desired type was selected when this counter was set.
-                    }
-                    else if (_flushCount > 0 || _flushTemp-- > 0)
-                    {
-                        // Buffers that flush should ideally be mapped in host address space for easy copies.
-                        // If the buffer is large it will do better on GPU memory, as there will be more writes than data flushes (typically individual pages).
-                        // If it is small, then it's likely most of the buffer will be flushed so we want it on host memory, as access is cached.
-                        _desiredType = _size > DeviceLocalSizeThreshold ? BufferBackingType.DeviceMemoryWithFlush : BufferBackingType.HostMemory;
-                    }
-                    else if (_writeCount >= WriteCountThreshold)
-                    {
-                        // Buffers that are written often should ideally be in the device local heap. (Storage buffers)
-                        _desiredType = BufferBackingType.DeviceMemory;
-                    }
-                    else if (_setCount > SetCountThreshold)
-                    {
-                        // Buffers that have their data set often should ideally be host mapped. (Constant buffers)
-                        _desiredType = BufferBackingType.HostMemory;
-                    }
-
-                    // It's harder for a buffer that is flushed to revert to another type of mapping.
-                    if (_flushCount > 0)
-                    {
-                        _flushTemp = 1000;
-                    }
-
-                    _lastFlushWrite = -1;
-                    _flushCount = 0;
-                    _writeCount = 0;
-                    _setCount = 0;
-                }
-            }
-        }
-    }
-}

src/Ryujinx.Graphics.Gpu/Memory/BufferCache.cs

@@ -107,9 +107,8 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// <param name="memoryManager">GPU memory manager where the buffer is mapped</param>
         /// <param name="gpuVa">Start GPU virtual address of the buffer</param>
         /// <param name="size">Size in bytes of the buffer</param>
-        /// <param name="stage">The type of usage that created the buffer</param>
         /// <returns>Contiguous physical range of the buffer, after address translation</returns>
-        public MultiRange TranslateAndCreateBuffer(MemoryManager memoryManager, ulong gpuVa, ulong size, BufferStage stage)
+        public MultiRange TranslateAndCreateBuffer(MemoryManager memoryManager, ulong gpuVa, ulong size)
         {
             if (gpuVa == 0)
             {
@@ -120,7 +119,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
 
             if (address != MemoryManager.PteUnmapped)
             {
-                CreateBuffer(address, size, stage);
+                CreateBuffer(address, size);
             }
 
             return new MultiRange(address, size);
@@ -133,9 +132,8 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// <param name="memoryManager">GPU memory manager where the buffer is mapped</param>
         /// <param name="gpuVa">Start GPU virtual address of the buffer</param>
         /// <param name="size">Size in bytes of the buffer</param>
-        /// <param name="stage">The type of usage that created the buffer</param>
         /// <returns>Physical ranges of the buffer, after address translation</returns>
-        public MultiRange TranslateAndCreateMultiBuffers(MemoryManager memoryManager, ulong gpuVa, ulong size, BufferStage stage)
+        public MultiRange TranslateAndCreateMultiBuffers(MemoryManager memoryManager, ulong gpuVa, ulong size)
         {
             if (gpuVa == 0)
             {
@@ -151,7 +149,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
                 return range;
             }
 
-            CreateBuffer(range, stage);
+            CreateBuffer(range);
 
             return range;
         }
@@ -163,9 +161,8 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// <param name="memoryManager">GPU memory manager where the buffer is mapped</param>
         /// <param name="gpuVa">Start GPU virtual address of the buffer</param>
         /// <param name="size">Size in bytes of the buffer</param>
-        /// <param name="stage">The type of usage that created the buffer</param>
         /// <returns>Physical ranges of the buffer, after address translation</returns>
-        public MultiRange TranslateAndCreateMultiBuffersPhysicalOnly(MemoryManager memoryManager, ulong gpuVa, ulong size, BufferStage stage)
+        public MultiRange TranslateAndCreateMultiBuffersPhysicalOnly(MemoryManager memoryManager, ulong gpuVa, ulong size)
         {
             if (gpuVa == 0)
             {
@@ -189,11 +186,11 @@ namespace Ryujinx.Graphics.Gpu.Memory
                 {
                     if (range.Count > 1)
                     {
-                        CreateBuffer(subRange.Address, subRange.Size, stage, SparseBufferAlignmentSize);
+                        CreateBuffer(subRange.Address, subRange.Size, SparseBufferAlignmentSize);
                     }
                     else
                     {
-                        CreateBuffer(subRange.Address, subRange.Size, stage);
+                        CreateBuffer(subRange.Address, subRange.Size);
                     }
                 }
             }
@@ -206,12 +203,11 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// This can be used to ensure the existance of a buffer.
         /// </summary>
         /// <param name="range">Physical ranges of memory where the buffer data is located</param>
-        /// <param name="stage">The type of usage that created the buffer</param>
-        public void CreateBuffer(MultiRange range, BufferStage stage)
+        public void CreateBuffer(MultiRange range)
         {
             if (range.Count > 1)
             {
-                CreateMultiRangeBuffer(range, stage);
+                CreateMultiRangeBuffer(range);
             }
             else
             {
@@ -219,7 +215,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
 
                 if (subRange.Address != MemoryManager.PteUnmapped)
                 {
-                    CreateBuffer(subRange.Address, subRange.Size, stage);
+                    CreateBuffer(subRange.Address, subRange.Size);
                 }
             }
         }
@@ -230,8 +226,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// </summary>
         /// <param name="address">Address of the buffer in memory</param>
         /// <param name="size">Size of the buffer in bytes</param>
-        /// <param name="stage">The type of usage that created the buffer</param>
-        public void CreateBuffer(ulong address, ulong size, BufferStage stage)
+        public void CreateBuffer(ulong address, ulong size)
         {
             ulong endAddress = address + size;
 
@@ -244,7 +239,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
                 alignedEndAddress += BufferAlignmentSize;
             }
 
-            CreateBufferAligned(alignedAddress, alignedEndAddress - alignedAddress, stage);
+            CreateBufferAligned(alignedAddress, alignedEndAddress - alignedAddress);
         }
 
         /// <summary>
@@ -253,9 +248,8 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// </summary>
         /// <param name="address">Address of the buffer in memory</param>
         /// <param name="size">Size of the buffer in bytes</param>
-        /// <param name="stage">The type of usage that created the buffer</param>
         /// <param name="alignment">Alignment of the start address of the buffer in bytes</param>
-        public void CreateBuffer(ulong address, ulong size, BufferStage stage, ulong alignment)
+        public void CreateBuffer(ulong address, ulong size, ulong alignment)
         {
             ulong alignmentMask = alignment - 1;
             ulong pageAlignmentMask = BufferAlignmentMask;
@@ -270,7 +264,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
                 alignedEndAddress += pageAlignmentMask;
             }
 
-            CreateBufferAligned(alignedAddress, alignedEndAddress - alignedAddress, stage, alignment);
+            CreateBufferAligned(alignedAddress, alignedEndAddress - alignedAddress, alignment);
         }
 
         /// <summary>
@@ -278,8 +272,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// if it does not exist yet.
         /// </summary>
         /// <param name="range">Physical ranges of memory</param>
-        /// <param name="stage">The type of usage that created the buffer</param>
-        private void CreateMultiRangeBuffer(MultiRange range, BufferStage stage)
+        private void CreateMultiRangeBuffer(MultiRange range)
         {
             // Ensure all non-contiguous buffer we might use are sparse aligned.
             for (int i = 0; i < range.Count; i++)
@@ -288,7 +281,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
 
                 if (subRange.Address != MemoryManager.PteUnmapped)
                 {
-                    CreateBuffer(subRange.Address, subRange.Size, stage, SparseBufferAlignmentSize);
+                    CreateBuffer(subRange.Address, subRange.Size, SparseBufferAlignmentSize);
                 }
             }
 
@@ -438,9 +431,9 @@ namespace Ryujinx.Graphics.Gpu.Memory
                 result.EndGpuAddress < gpuVa + size ||
                 result.UnmappedSequence != result.Buffer.UnmappedSequence)
             {
-                MultiRange range = TranslateAndCreateBuffer(memoryManager, gpuVa, size, BufferStage.Internal);
+                MultiRange range = TranslateAndCreateBuffer(memoryManager, gpuVa, size);
                 ulong address = range.GetSubRange(0).Address;
-                result = new BufferCacheEntry(address, gpuVa, GetBuffer(address, size, BufferStage.Internal));
+                result = new BufferCacheEntry(address, gpuVa, GetBuffer(address, size));
 
                 _dirtyCache[gpuVa] = result;
             }
@@ -473,9 +466,9 @@ namespace Ryujinx.Graphics.Gpu.Memory
                 result.EndGpuAddress < alignedEndGpuVa ||
                 result.UnmappedSequence != result.Buffer.UnmappedSequence)
             {
-                MultiRange range = TranslateAndCreateBuffer(memoryManager, alignedGpuVa, size, BufferStage.None);
+                MultiRange range = TranslateAndCreateBuffer(memoryManager, alignedGpuVa, size);
                 ulong address = range.GetSubRange(0).Address;
-                result = new BufferCacheEntry(address, alignedGpuVa, GetBuffer(address, size, BufferStage.None));
+                result = new BufferCacheEntry(address, alignedGpuVa, GetBuffer(address, size));
 
                 _modifiedCache[alignedGpuVa] = result;
             }
@@ -492,8 +485,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// </summary>
         /// <param name="address">Address of the buffer in guest memory</param>
         /// <param name="size">Size in bytes of the buffer</param>
-        /// <param name="stage">The type of usage that created the buffer</param>
-        private void CreateBufferAligned(ulong address, ulong size, BufferStage stage)
+        private void CreateBufferAligned(ulong address, ulong size)
         {
             Buffer[] overlaps = _bufferOverlaps;
             int overlapsCount = _buffers.FindOverlapsNonOverlapping(address, size, ref overlaps);
@@ -554,13 +546,13 @@ namespace Ryujinx.Graphics.Gpu.Memory
 
                     ulong newSize = endAddress - address;
 
-                    CreateBufferAligned(address, newSize, stage, anySparseCompatible, overlaps, overlapsCount);
+                    CreateBufferAligned(address, newSize, anySparseCompatible, overlaps, overlapsCount);
                 }
             }
             else
             {
                 // No overlap, just create a new buffer.
-                Buffer buffer = new(_context, _physicalMemory, address, size, stage, sparseCompatible: false);
+                Buffer buffer = new(_context, _physicalMemory, address, size, sparseCompatible: false);
 
                 lock (_buffers)
                 {
@@ -578,9 +570,8 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// </summary>
         /// <param name="address">Address of the buffer in guest memory</param>
         /// <param name="size">Size in bytes of the buffer</param>
-        /// <param name="stage">The type of usage that created the buffer</param>
         /// <param name="alignment">Alignment of the start address of the buffer</param>
-        private void CreateBufferAligned(ulong address, ulong size, BufferStage stage, ulong alignment)
+        private void CreateBufferAligned(ulong address, ulong size, ulong alignment)
         {
             Buffer[] overlaps = _bufferOverlaps;
             int overlapsCount = _buffers.FindOverlapsNonOverlapping(address, size, ref overlaps);
@@ -633,13 +624,13 @@ namespace Ryujinx.Graphics.Gpu.Memory
 
                     ulong newSize = endAddress - address;
 
-                    CreateBufferAligned(address, newSize, stage, sparseAligned, overlaps, overlapsCount);
+                    CreateBufferAligned(address, newSize, sparseAligned, overlaps, overlapsCount);
                 }
             }
             else
             {
                 // No overlap, just create a new buffer.
-                Buffer buffer = new(_context, _physicalMemory, address, size, stage, sparseAligned);
+                Buffer buffer = new(_context, _physicalMemory, address, size, sparseAligned);
 
                 lock (_buffers)
                 {
@@ -657,13 +648,12 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// </summary>
         /// <param name="address">Address of the buffer in guest memory</param>
         /// <param name="size">Size in bytes of the buffer</param>
-        /// <param name="stage">The type of usage that created the buffer</param>
         /// <param name="sparseCompatible">Indicates if the buffer can be used in a sparse buffer mapping</param>
         /// <param name="overlaps">Buffers overlapping the range</param>
         /// <param name="overlapsCount">Total of overlaps</param>
-        private void CreateBufferAligned(ulong address, ulong size, BufferStage stage, bool sparseCompatible, Buffer[] overlaps, int overlapsCount)
+        private void CreateBufferAligned(ulong address, ulong size, bool sparseCompatible, Buffer[] overlaps, int overlapsCount)
         {
-            Buffer newBuffer = new Buffer(_context, _physicalMemory, address, size, stage, sparseCompatible, overlaps.Take(overlapsCount));
+            Buffer newBuffer = new Buffer(_context, _physicalMemory, address, size, sparseCompatible, overlaps.Take(overlapsCount));
 
             lock (_buffers)
             {
@@ -714,7 +704,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
 
             for (int index = 0; index < overlapCount; index++)
             {
-                CreateMultiRangeBuffer(overlaps[index].Range, BufferStage.None);
+                CreateMultiRangeBuffer(overlaps[index].Range);
             }
         }
 
@@ -741,8 +731,8 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// <param name="size">Size in bytes of the copy</param>
         public void CopyBuffer(MemoryManager memoryManager, ulong srcVa, ulong dstVa, ulong size)
         {
-            MultiRange srcRange = TranslateAndCreateMultiBuffersPhysicalOnly(memoryManager, srcVa, size, BufferStage.Copy);
-            MultiRange dstRange = TranslateAndCreateMultiBuffersPhysicalOnly(memoryManager, dstVa, size, BufferStage.Copy);
+            MultiRange srcRange = TranslateAndCreateMultiBuffersPhysicalOnly(memoryManager, srcVa, size);
+            MultiRange dstRange = TranslateAndCreateMultiBuffersPhysicalOnly(memoryManager, dstVa, size);
 
             if (srcRange.Count == 1 && dstRange.Count == 1)
             {
@@ -798,8 +788,8 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// <param name="size">Size in bytes of the copy</param>
         private void CopyBufferSingleRange(MemoryManager memoryManager, ulong srcAddress, ulong dstAddress, ulong size)
         {
-            Buffer srcBuffer = GetBuffer(srcAddress, size, BufferStage.Copy);
-            Buffer dstBuffer = GetBuffer(dstAddress, size, BufferStage.Copy);
+            Buffer srcBuffer = GetBuffer(srcAddress, size);
+            Buffer dstBuffer = GetBuffer(dstAddress, size);
 
             int srcOffset = (int)(srcAddress - srcBuffer.Address);
             int dstOffset = (int)(dstAddress - dstBuffer.Address);
@@ -813,7 +803,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
 
             if (srcBuffer.IsModified(srcAddress, size))
             {
-                dstBuffer.SignalModified(dstAddress, size, BufferStage.Copy);
+                dstBuffer.SignalModified(dstAddress, size);
             }
             else
             {
@@ -838,12 +828,12 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// <param name="value">Value to be written into the buffer</param>
         public void ClearBuffer(MemoryManager memoryManager, ulong gpuVa, ulong size, uint value)
         {
-            MultiRange range = TranslateAndCreateMultiBuffersPhysicalOnly(memoryManager, gpuVa, size, BufferStage.Copy);
+            MultiRange range = TranslateAndCreateMultiBuffersPhysicalOnly(memoryManager, gpuVa, size);
 
             for (int index = 0; index < range.Count; index++)
             {
                 MemoryRange subRange = range.GetSubRange(index);
-                Buffer buffer = GetBuffer(subRange.Address, subRange.Size, BufferStage.Copy);
+                Buffer buffer = GetBuffer(subRange.Address, subRange.Size);
 
                 int offset = (int)(subRange.Address - buffer.Address);
 
@@ -859,19 +849,18 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// Gets a buffer sub-range starting at a given memory address, aligned to the next page boundary.
         /// </summary>
         /// <param name="range">Physical regions of memory where the buffer is mapped</param>
-        /// <param name="stage">Buffer stage that triggered the access</param>
         /// <param name="write">Whether the buffer will be written to by this use</param>
         /// <returns>The buffer sub-range starting at the given memory address</returns>
-        public BufferRange GetBufferRangeAligned(MultiRange range, BufferStage stage, bool write = false)
+        public BufferRange GetBufferRangeAligned(MultiRange range, bool write = false)
         {
             if (range.Count > 1)
             {
-                return GetBuffer(range, stage, write).GetRange(range);
+                return GetBuffer(range, write).GetRange(range);
             }
             else
             {
                 MemoryRange subRange = range.GetSubRange(0);
-                return GetBuffer(subRange.Address, subRange.Size, stage, write).GetRangeAligned(subRange.Address, subRange.Size, write);
+                return GetBuffer(subRange.Address, subRange.Size, write).GetRangeAligned(subRange.Address, subRange.Size, write);
             }
         }
 
@@ -879,19 +868,18 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// Gets a buffer sub-range for a given memory range.
         /// </summary>
         /// <param name="range">Physical regions of memory where the buffer is mapped</param>
-        /// <param name="stage">Buffer stage that triggered the access</param>
         /// <param name="write">Whether the buffer will be written to by this use</param>
         /// <returns>The buffer sub-range for the given range</returns>
-        public BufferRange GetBufferRange(MultiRange range, BufferStage stage, bool write = false)
+        public BufferRange GetBufferRange(MultiRange range, bool write = false)
         {
             if (range.Count > 1)
             {
-                return GetBuffer(range, stage, write).GetRange(range);
+                return GetBuffer(range, write).GetRange(range);
             }
             else
             {
                 MemoryRange subRange = range.GetSubRange(0);
-                return GetBuffer(subRange.Address, subRange.Size, stage, write).GetRange(subRange.Address, subRange.Size, write);
+                return GetBuffer(subRange.Address, subRange.Size, write).GetRange(subRange.Address, subRange.Size, write);
             }
         }
 
@@ -900,10 +888,9 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// A buffer overlapping with the specified range is assumed to already exist on the cache.
         /// </summary>
         /// <param name="range">Physical regions of memory where the buffer is mapped</param>
-        /// <param name="stage">Buffer stage that triggered the access</param>
         /// <param name="write">Whether the buffer will be written to by this use</param>
         /// <returns>The buffer where the range is fully contained</returns>
-        private MultiRangeBuffer GetBuffer(MultiRange range, BufferStage stage, bool write = false)
+        private MultiRangeBuffer GetBuffer(MultiRange range, bool write = false)
         {
             for (int i = 0; i < range.Count; i++)
             {
@@ -915,7 +902,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
 
                 if (write)
                 {
-                    subBuffer.SignalModified(subRange.Address, subRange.Size, stage);
+                    subBuffer.SignalModified(subRange.Address, subRange.Size);
                 }
             }
 
@@ -948,10 +935,9 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// </summary>
         /// <param name="address">Start address of the memory range</param>
         /// <param name="size">Size in bytes of the memory range</param>
-        /// <param name="stage">Buffer stage that triggered the access</param>
         /// <param name="write">Whether the buffer will be written to by this use</param>
         /// <returns>The buffer where the range is fully contained</returns>
-        private Buffer GetBuffer(ulong address, ulong size, BufferStage stage, bool write = false)
+        private Buffer GetBuffer(ulong address, ulong size, bool write = false)
         {
             Buffer buffer;
 
@@ -964,7 +950,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
 
                 if (write)
                 {
-                    buffer.SignalModified(address, size, stage);
+                    buffer.SignalModified(address, size);
                 }
             }
             else
@@ -1018,18 +1004,6 @@ namespace Ryujinx.Graphics.Gpu.Memory
             }
         }
 
-        /// <summary>
-        /// Signal that the given buffer's handle has changed,
-        /// forcing rebind and any overlapping multi-range buffers to be recreated.
-        /// </summary>
-        /// <param name="buffer">The buffer that has changed handle</param>
-        public void BufferBackingChanged(Buffer buffer)
-        {
-            NotifyBuffersModified?.Invoke();
-
-            RecreateMultiRangeBuffers(buffer.Address, buffer.Size);
-        }
-
         /// <summary>
         /// Prune any invalid entries from a quick access dictionary.
         /// </summary>

src/Ryujinx.Graphics.Gpu/Memory/BufferManager.cs

@@ -156,7 +156,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// <param name="type">Type of each index buffer element</param>
         public void SetIndexBuffer(ulong gpuVa, ulong size, IndexType type)
         {
-            MultiRange range = _channel.MemoryManager.Physical.BufferCache.TranslateAndCreateBuffer(_channel.MemoryManager, gpuVa, size, BufferStage.IndexBuffer);
+            MultiRange range = _channel.MemoryManager.Physical.BufferCache.TranslateAndCreateBuffer(_channel.MemoryManager, gpuVa, size);
 
             _indexBuffer.Range = range;
             _indexBuffer.Type = type;
@@ -186,7 +186,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// <param name="divisor">Vertex divisor of the buffer, for instanced draws</param>
         public void SetVertexBuffer(int index, ulong gpuVa, ulong size, int stride, int divisor)
         {
-            MultiRange range = _channel.MemoryManager.Physical.BufferCache.TranslateAndCreateBuffer(_channel.MemoryManager, gpuVa, size, BufferStage.VertexBuffer);
+            MultiRange range = _channel.MemoryManager.Physical.BufferCache.TranslateAndCreateBuffer(_channel.MemoryManager, gpuVa, size);
 
             _vertexBuffers[index].Range = range;
             _vertexBuffers[index].Stride = stride;
@@ -213,7 +213,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// <param name="size">Size in bytes of the transform feedback buffer</param>
         public void SetTransformFeedbackBuffer(int index, ulong gpuVa, ulong size)
         {
-            MultiRange range = _channel.MemoryManager.Physical.BufferCache.TranslateAndCreateMultiBuffers(_channel.MemoryManager, gpuVa, size, BufferStage.TransformFeedback);
+            MultiRange range = _channel.MemoryManager.Physical.BufferCache.TranslateAndCreateMultiBuffers(_channel.MemoryManager, gpuVa, size);
 
             _transformFeedbackBuffers[index] = new BufferBounds(range);
             _transformFeedbackBuffersDirty = true;
@@ -260,7 +260,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
 
             gpuVa = BitUtils.AlignDown<ulong>(gpuVa, (ulong)_context.Capabilities.StorageBufferOffsetAlignment);
 
-            MultiRange range = _channel.MemoryManager.Physical.BufferCache.TranslateAndCreateMultiBuffers(_channel.MemoryManager, gpuVa, size, BufferStageUtils.ComputeStorage(flags));
+            MultiRange range = _channel.MemoryManager.Physical.BufferCache.TranslateAndCreateMultiBuffers(_channel.MemoryManager, gpuVa, size);
 
             _cpStorageBuffers.SetBounds(index, range, flags);
         }
@@ -284,7 +284,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
 
             gpuVa = BitUtils.AlignDown<ulong>(gpuVa, (ulong)_context.Capabilities.StorageBufferOffsetAlignment);
 
-            MultiRange range = _channel.MemoryManager.Physical.BufferCache.TranslateAndCreateMultiBuffers(_channel.MemoryManager, gpuVa, size, BufferStageUtils.GraphicsStorage(stage, flags));
+            MultiRange range = _channel.MemoryManager.Physical.BufferCache.TranslateAndCreateMultiBuffers(_channel.MemoryManager, gpuVa, size);
 
             if (!buffers.Buffers[index].Range.Equals(range))
             {
@@ -303,7 +303,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// <param name="size">Size in bytes of the storage buffer</param>
         public void SetComputeUniformBuffer(int index, ulong gpuVa, ulong size)
         {
-            MultiRange range = _channel.MemoryManager.Physical.BufferCache.TranslateAndCreateBuffer(_channel.MemoryManager, gpuVa, size, BufferStage.Compute);
+            MultiRange range = _channel.MemoryManager.Physical.BufferCache.TranslateAndCreateBuffer(_channel.MemoryManager, gpuVa, size);
 
             _cpUniformBuffers.SetBounds(index, range);
         }
@@ -318,7 +318,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// <param name="size">Size in bytes of the storage buffer</param>
         public void SetGraphicsUniformBuffer(int stage, int index, ulong gpuVa, ulong size)
         {
-            MultiRange range = _channel.MemoryManager.Physical.BufferCache.TranslateAndCreateBuffer(_channel.MemoryManager, gpuVa, size, BufferStageUtils.FromShaderStage(stage));
+            MultiRange range = _channel.MemoryManager.Physical.BufferCache.TranslateAndCreateBuffer(_channel.MemoryManager, gpuVa, size);
 
             _gpUniformBuffers[stage].SetBounds(index, range);
             _gpUniformBuffersDirty = true;
@@ -502,7 +502,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
                 foreach (var binding in _bufferTextures)
                 {
                     var isStore = binding.BindingInfo.Flags.HasFlag(TextureUsageFlags.ImageStore);
-                    var range = bufferCache.GetBufferRange(binding.Range, BufferStageUtils.TextureBuffer(binding.Stage, binding.BindingInfo.Flags), isStore);
+                    var range = bufferCache.GetBufferRange(binding.Range, isStore);
                     binding.Texture.SetStorage(range);
 
                     // The texture must be rebound to use the new storage if it was updated.
@@ -526,7 +526,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
 
                 foreach (var binding in _bufferTextureArrays)
                 {
-                    var range = bufferCache.GetBufferRange(binding.Range, BufferStage.None);
+                    var range = bufferCache.GetBufferRange(binding.Range);
                     binding.Texture.SetStorage(range);
 
                     textureArray[0] = binding.Texture;
@@ -536,7 +536,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
                 foreach (var binding in _bufferImageArrays)
                 {
                     var isStore = binding.BindingInfo.Flags.HasFlag(TextureUsageFlags.ImageStore);
-                    var range = bufferCache.GetBufferRange(binding.Range, BufferStage.None, isStore);
+                    var range = bufferCache.GetBufferRange(binding.Range, isStore);
                     binding.Texture.SetStorage(range);
 
                     textureArray[0] = binding.Texture;
@@ -565,7 +565,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
 
                     if (!_indexBuffer.Range.IsUnmapped)
                     {
-                        BufferRange buffer = bufferCache.GetBufferRange(_indexBuffer.Range, BufferStage.IndexBuffer);
+                        BufferRange buffer = bufferCache.GetBufferRange(_indexBuffer.Range);
 
                         _context.Renderer.Pipeline.SetIndexBuffer(buffer, _indexBuffer.Type);
                     }
@@ -597,7 +597,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
                         continue;
                     }
 
-                    BufferRange buffer = bufferCache.GetBufferRange(vb.Range, BufferStage.VertexBuffer);
+                    BufferRange buffer = bufferCache.GetBufferRange(vb.Range);
 
                     vertexBuffers[index] = new VertexBufferDescriptor(buffer, vb.Stride, vb.Divisor);
                 }
@@ -637,7 +637,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
                             continue;
                         }
 
-                        tfbs[index] = bufferCache.GetBufferRange(tfb.Range, BufferStage.TransformFeedback, write: true);
+                        tfbs[index] = bufferCache.GetBufferRange(tfb.Range, write: true);
                     }
 
                     _context.Renderer.Pipeline.SetTransformFeedbackBuffers(tfbs);
@@ -684,7 +684,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
 
                             _context.SupportBufferUpdater.SetTfeOffset(index, tfeOffset);
 
-                            buffers[index] = new BufferAssignment(index, bufferCache.GetBufferRange(range, BufferStage.TransformFeedback, write: true));
+                            buffers[index] = new BufferAssignment(index, bufferCache.GetBufferRange(range, write: true));
                         }
                     }
 
@@ -751,7 +751,6 @@ namespace Ryujinx.Graphics.Gpu.Memory
             for (ShaderStage stage = ShaderStage.Vertex; stage <= ShaderStage.Fragment; stage++)
             {
                 ref var buffers = ref bindings[(int)stage - 1];
-                BufferStage bufferStage = BufferStageUtils.FromShaderStage(stage);
 
                 for (int index = 0; index < buffers.Count; index++)
                 {
@@ -763,8 +762,8 @@ namespace Ryujinx.Graphics.Gpu.Memory
                     {
                         var isWrite = bounds.Flags.HasFlag(BufferUsageFlags.Write);
                         var range = isStorage
-                            ? bufferCache.GetBufferRangeAligned(bounds.Range, bufferStage | BufferStageUtils.FromUsage(bounds.Flags), isWrite)
-                            : bufferCache.GetBufferRange(bounds.Range, bufferStage);
+                            ? bufferCache.GetBufferRangeAligned(bounds.Range, isWrite)
+                            : bufferCache.GetBufferRange(bounds.Range);
 
                         ranges[rangesCount++] = new BufferAssignment(bindingInfo.Binding, range);
                     }
@@ -800,8 +799,8 @@ namespace Ryujinx.Graphics.Gpu.Memory
                 {
                     var isWrite = bounds.Flags.HasFlag(BufferUsageFlags.Write);
                     var range = isStorage
-                        ? bufferCache.GetBufferRangeAligned(bounds.Range, BufferStageUtils.ComputeStorage(bounds.Flags), isWrite)
-                        : bufferCache.GetBufferRange(bounds.Range, BufferStage.Compute);
+                        ? bufferCache.GetBufferRangeAligned(bounds.Range, isWrite)
+                        : bufferCache.GetBufferRange(bounds.Range);
 
                     ranges[rangesCount++] = new BufferAssignment(bindingInfo.Binding, range);
                 }
@@ -876,7 +875,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
             Format format,
             bool isImage)
         {
-            _channel.MemoryManager.Physical.BufferCache.CreateBuffer(range, BufferStageUtils.TextureBuffer(stage, bindingInfo.Flags));
+            _channel.MemoryManager.Physical.BufferCache.CreateBuffer(range);
 
             _bufferTextures.Add(new BufferTextureBinding(stage, texture, range, bindingInfo, format, isImage));
         }
@@ -884,7 +883,6 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// <summary>
         /// Sets the buffer storage of a buffer texture array element. This will be bound when the buffer manager commits bindings.
         /// </summary>
-        /// <param name="stage">Shader stage accessing the texture</param>
         /// <param name="array">Texture array where the element will be inserted</param>
         /// <param name="texture">Buffer texture</param>
         /// <param name="range">Physical ranges of memory where the buffer texture data is located</param>
@@ -892,7 +890,6 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// <param name="index">Index of the binding on the array</param>
         /// <param name="format">Format of the buffer texture</param>
         public void SetBufferTextureStorage(
-            ShaderStage stage,
             ITextureArray array,
             ITexture texture,
             MultiRange range,
@@ -900,7 +897,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
             int index,
             Format format)
         {
-            _channel.MemoryManager.Physical.BufferCache.CreateBuffer(range, BufferStageUtils.TextureBuffer(stage, bindingInfo.Flags));
+            _channel.MemoryManager.Physical.BufferCache.CreateBuffer(range);
 
             _bufferTextureArrays.Add(new BufferTextureArrayBinding<ITextureArray>(array, texture, range, bindingInfo, index, format));
         }
@@ -908,7 +905,6 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// <summary>
         /// Sets the buffer storage of a buffer image array element. This will be bound when the buffer manager commits bindings.
         /// </summary>
-        /// <param name="stage">Shader stage accessing the texture</param>
         /// <param name="array">Image array where the element will be inserted</param>
         /// <param name="texture">Buffer texture</param>
         /// <param name="range">Physical ranges of memory where the buffer texture data is located</param>
@@ -916,7 +912,6 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// <param name="index">Index of the binding on the array</param>
         /// <param name="format">Format of the buffer texture</param>
         public void SetBufferTextureStorage(
-            ShaderStage stage,
             IImageArray array,
             ITexture texture,
             MultiRange range,
@@ -924,7 +919,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
             int index,
             Format format)
         {
-            _channel.MemoryManager.Physical.BufferCache.CreateBuffer(range, BufferStageUtils.TextureBuffer(stage, bindingInfo.Flags));
+            _channel.MemoryManager.Physical.BufferCache.CreateBuffer(range);
 
             _bufferImageArrays.Add(new BufferTextureArrayBinding<IImageArray>(array, texture, range, bindingInfo, index, format));
         }

src/Ryujinx.Graphics.Gpu/Memory/BufferMigration.cs

@@ -1,21 +1,37 @@
 using System;
-using System.Threading;
 
 namespace Ryujinx.Graphics.Gpu.Memory
 {
     /// <summary>
-    /// A record of when buffer data was copied from multiple buffers to one migration target,
-    /// along with the SyncNumber when the migration will be complete.
-    /// Keeps the source buffers alive for data flushes until the migration is complete.
-    /// All spans cover the full range of the "destination" buffer.
+    /// A record of when buffer data was copied from one buffer to another, along with the SyncNumber when the migration will be complete.
+    /// Keeps the source buffer alive for data flushes until the migration is complete.
     /// </summary>
     internal class BufferMigration : IDisposable
     {
         /// <summary>
-        /// Ranges from source buffers that were copied as part of this migration.
-        /// Ordered by increasing base address.
+        /// The offset for the migrated region.
         /// </summary>
-        public BufferMigrationSpan[] Spans { get; private set; }
+        private readonly ulong _offset;
+
+        /// <summary>
+        /// The size for the migrated region.
+        /// </summary>
+        private readonly ulong _size;
+
+        /// <summary>
+        /// The buffer that was migrated from.
+        /// </summary>
+        private readonly Buffer _buffer;
+
+        /// <summary>
+        /// The source range action, to be called on overlap with an unreached sync number.
+        /// </summary>
+        private readonly Action<ulong, ulong> _sourceRangeAction;
+
+        /// <summary>
+        /// The source range list.
+        /// </summary>
+        private readonly BufferModifiedRangeList _source;
 
         /// <summary>
         /// The destination range list. This range list must be updated when flushing the source.
@@ -27,193 +43,55 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// </summary>
         public readonly ulong SyncNumber;
 
-        /// <summary>
-        /// Number of active users there are traversing this migration's spans.
-        /// </summary>
-        private int _refCount;
-
-        /// <summary>
-        /// Create a new buffer migration.
-        /// </summary>
-        /// <param name="spans">Source spans for the migration</param>
-        /// <param name="destination">Destination buffer range list</param>
-        /// <param name="syncNumber">Sync number where this migration will be complete</param>
-        public BufferMigration(BufferMigrationSpan[] spans, BufferModifiedRangeList destination, ulong syncNumber)
-        {
-            Spans = spans;
-            Destination = destination;
-            SyncNumber = syncNumber;
-        }
-
-        /// <summary>
-        /// Add a span to the migration. Allocates a new array with the target size, and replaces it.
-        /// </summary>
-        /// <remarks>
-        /// The base address for the span is assumed to be higher than all other spans in the migration,
-        /// to keep the span array ordered.
-        /// </remarks>
-        public void AddSpanToEnd(BufferMigrationSpan span)
-        {
-            BufferMigrationSpan[] oldSpans = Spans;
-
-            BufferMigrationSpan[] newSpans = new BufferMigrationSpan[oldSpans.Length + 1];
-
-            oldSpans.CopyTo(newSpans, 0);
-
-            newSpans[oldSpans.Length] = span;
-
-            Spans = newSpans;
-        }
-
-        /// <summary>
-        /// Performs the given range action, or one from a migration that overlaps and has not synced yet.
-        /// </summary>
-        /// <param name="offset">The offset to pass to the action</param>
-        /// <param name="size">The size to pass to the action</param>
-        /// <param name="syncNumber">The sync number that has been reached</param>
-        /// <param name="rangeAction">The action to perform</param>
-        public void RangeActionWithMigration(ulong offset, ulong size, ulong syncNumber, BufferFlushAction rangeAction)
-        {
-            long syncDiff = (long)(syncNumber - SyncNumber);
-
-            if (syncDiff >= 0)
-            {
-                // The migration has completed. Run the parent action.
-                rangeAction(offset, size, syncNumber);
-            }
-            else
-            {
-                Interlocked.Increment(ref _refCount);
-
-                ulong prevAddress = offset;
-                ulong endAddress = offset + size;
-
-                foreach (BufferMigrationSpan span in Spans)
-                {
-                    if (!span.Overlaps(offset, size))
-                    {
-                        continue;
-                    }
-
-                    if (span.Address > prevAddress)
-                    {
-                        // There's a gap between this span and the last (or the start address). Flush the range using the parent action.
-
-                        rangeAction(prevAddress, span.Address - prevAddress, syncNumber);
-                    }
-
-                    span.RangeActionWithMigration(offset, size, syncNumber);
-
-                    prevAddress = span.Address + span.Size;
-                }
-
-                if (endAddress > prevAddress)
-                {
-                    // There's a gap at the end of the range with no migration. Flush the range using the parent action.
-                    rangeAction(prevAddress, endAddress - prevAddress, syncNumber);
-                }
-
-                Interlocked.Decrement(ref _refCount);
-            }
-        }
-
-        /// <summary>
-        /// Dispose the buffer migration. This removes the reference from the destination range list,
-        /// and runs all the dispose buffers for the migration spans. (typically disposes the source buffer)
-        /// </summary>
-        public void Dispose()
-        {
-            while (Volatile.Read(ref _refCount) > 0)
-            {
-                // Coming into this method, the sync for the migration will be met, so nothing can increment the ref count.
-                // However, an existing traversal of the spans for data flush could still be in progress.
-                // Spin if this is ever the case, so they don't get disposed before the operation is complete.
-            }
-
-            Destination.RemoveMigration(this);
-
-            foreach (BufferMigrationSpan span in Spans)
-            {
-                span.Dispose();
-            }
-        }
-    }
-
-    /// <summary>
-    /// A record of when buffer data was copied from one buffer to another, for a specific range in a source buffer.
-    /// Keeps the source buffer alive for data flushes until the migration is complete.
-    /// </summary>
-    internal readonly struct BufferMigrationSpan : IDisposable
-    {
-        /// <summary>
-        /// The offset for the migrated region.
-        /// </summary>
-        public readonly ulong Address;
-
-        /// <summary>
-        /// The size for the migrated region.
-        /// </summary>
-        public readonly ulong Size;
-
-        /// <summary>
-        /// The action to perform when the migration isn't needed anymore.
-        /// </summary>
-        private readonly Action _disposeAction;
-
-        /// <summary>
-        /// The source range action, to be called on overlap with an unreached sync number.
-        /// </summary>
-        private readonly BufferFlushAction _sourceRangeAction;
-
-        /// <summary>
-        /// Optional migration for the source data. Can chain together if many migrations happen in a short time.
-        /// If this is null, then _sourceRangeAction will always provide up to date data.
-        /// </summary>
-        private readonly BufferMigration _source;
-
         /// <summary>
         /// Creates a record for a buffer migration.
         /// </summary>
         /// <param name="buffer">The source buffer for this migration</param>
-        /// <param name="disposeAction">The action to perform when the migration isn't needed anymore</param>
         /// <param name="sourceRangeAction">The flush action for the source buffer</param>
-        /// <param name="source">Pending migration for the source buffer</param>
-        public BufferMigrationSpan(
+        /// <param name="source">The modified range list for the source buffer</param>
+        /// <param name="dest">The modified range list for the destination buffer</param>
+        /// <param name="syncNumber">The sync number for when the migration is complete</param>
+        public BufferMigration(
             Buffer buffer,
-            Action disposeAction,
-            BufferFlushAction sourceRangeAction,
-            BufferMigration source)
+            Action<ulong, ulong> sourceRangeAction,
+            BufferModifiedRangeList source,
+            BufferModifiedRangeList dest,
+            ulong syncNumber)
         {
-            Address = buffer.Address;
-            Size = buffer.Size;
-            _disposeAction = disposeAction;
+            _offset = buffer.Address;
+            _size = buffer.Size;
+            _buffer = buffer;
             _sourceRangeAction = sourceRangeAction;
             _source = source;
+            Destination = dest;
+            SyncNumber = syncNumber;
         }
 
-        /// <summary>
-        /// Creates a record for a buffer migration, using the default buffer dispose action.
-        /// </summary>
-        /// <param name="buffer">The source buffer for this migration</param>
-        /// <param name="sourceRangeAction">The flush action for the source buffer</param>
-        /// <param name="source">Pending migration for the source buffer</param>
-        public BufferMigrationSpan(
-            Buffer buffer,
-            BufferFlushAction sourceRangeAction,
-            BufferMigration source) : this(buffer, buffer.DecrementReferenceCount, sourceRangeAction, source) { }
-
         /// <summary>
         /// Determine if the given range overlaps this migration, and has not been completed yet.
         /// </summary>
         /// <param name="offset">Start offset</param>
         /// <param name="size">Range size</param>
+        /// <param name="syncNumber">The sync number that was waited on</param>
         /// <returns>True if overlapping and in progress, false otherwise</returns>
-        public bool Overlaps(ulong offset, ulong size)
+        public bool Overlaps(ulong offset, ulong size, ulong syncNumber)
         {
             ulong end = offset + size;
-            ulong destEnd = Address + Size;
+            ulong destEnd = _offset + _size;
+            long syncDiff = (long)(syncNumber - SyncNumber); // syncNumber is less if the copy has not completed.
 
-            return !(end <= Address || offset >= destEnd);
+            return !(end <= _offset || offset >= destEnd) && syncDiff < 0;
+        }
+
+        /// <summary>
+        /// Determine if the given range matches this migration.
+        /// </summary>
+        /// <param name="offset">Start offset</param>
+        /// <param name="size">Range size</param>
+        /// <returns>True if the range exactly matches, false otherwise</returns>
+        public bool FullyMatches(ulong offset, ulong size)
+        {
+            return _offset == offset && _size == size;
         }
 
         /// <summary>
@@ -222,30 +100,26 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// <param name="offset">Start offset</param>
         /// <param name="size">Range size</param>
         /// <param name="syncNumber">Current sync number</param>
-        public void RangeActionWithMigration(ulong offset, ulong size, ulong syncNumber)
+        /// <param name="parent">The modified range list that originally owned this range</param>
+        public void RangeActionWithMigration(ulong offset, ulong size, ulong syncNumber, BufferModifiedRangeList parent)
         {
             ulong end = offset + size;
-            end = Math.Min(Address + Size, end);
-            offset = Math.Max(Address, offset);
+            end = Math.Min(_offset + _size, end);
+            offset = Math.Max(_offset, offset);
 
             size = end - offset;
 
-            if (_source != null)
-            {
-                _source.RangeActionWithMigration(offset, size, syncNumber, _sourceRangeAction);
-            }
-            else
-            {
-                _sourceRangeAction(offset, size, syncNumber);
-            }
+            _source.RangeActionWithMigration(offset, size, syncNumber, parent, _sourceRangeAction);
         }
 
         /// <summary>
-        /// Removes this migration span, potentially allowing for the source buffer to be disposed.
+        /// Removes this reference to the range list, potentially allowing for the source buffer to be disposed.
         /// </summary>
         public void Dispose()
         {
-            _disposeAction();
+            Destination.RemoveMigration(this);
+
+            _buffer.DecrementReferenceCount();
         }
     }
 }

src/Ryujinx.Graphics.Gpu/Memory/BufferModifiedRangeList.cs

@@ -1,6 +1,7 @@
 using Ryujinx.Common.Pools;
 using Ryujinx.Memory.Range;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 
 namespace Ryujinx.Graphics.Gpu.Memory
@@ -71,10 +72,10 @@ namespace Ryujinx.Graphics.Gpu.Memory
 
         private readonly GpuContext _context;
         private readonly Buffer _parent;
-        private readonly BufferFlushAction _flushAction;
+        private readonly Action<ulong, ulong> _flushAction;
 
-        private BufferMigration _source;
-        private BufferModifiedRangeList _migrationTarget;
+        private List<BufferMigration> _sources;
+        private BufferMigration _migrationTarget;
 
         private readonly object _lock = new();
 
@@ -98,7 +99,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// <param name="context">GPU context that the buffer range list belongs to</param>
         /// <param name="parent">The parent buffer that owns this range list</param>
         /// <param name="flushAction">The flush action for the parent buffer</param>
-        public BufferModifiedRangeList(GpuContext context, Buffer parent, BufferFlushAction flushAction) : base(BackingInitialSize)
+        public BufferModifiedRangeList(GpuContext context, Buffer parent, Action<ulong, ulong> flushAction) : base(BackingInitialSize)
         {
             _context = context;
             _parent = parent;
@@ -198,36 +199,6 @@ namespace Ryujinx.Graphics.Gpu.Memory
             }
         }
 
-        /// <summary>
-        /// Gets modified ranges within the specified region, and then fires the given action for each range individually.
-        /// </summary>
-        /// <param name="address">Start address to query</param>
-        /// <param name="size">Size to query</param>
-        /// <param name="syncNumber">Sync number required for a range to be signalled</param>
-        /// <param name="rangeAction">The action to call for each modified range</param>
-        public void GetRangesAtSync(ulong address, ulong size, ulong syncNumber, Action<ulong, ulong> rangeAction)
-        {
-            int count = 0;
-
-            ref var overlaps = ref ThreadStaticArray<BufferModifiedRange>.Get();
-
-            // Range list must be consistent for this operation.
-            lock (_lock)
-            {
-                count = FindOverlapsNonOverlapping(address, size, ref overlaps);
-            }
-
-            for (int i = 0; i < count; i++)
-            {
-                BufferModifiedRange overlap = overlaps[i];
-
-                if (overlap.SyncNumber == syncNumber)
-                {
-                    rangeAction(overlap.Address, overlap.Size);
-                }
-            }
-        }
-
         /// <summary>
         /// Gets modified ranges within the specified region, and then fires the given action for each range individually.
         /// </summary>
@@ -274,16 +245,41 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// <param name="offset">The offset to pass to the action</param>
         /// <param name="size">The size to pass to the action</param>
         /// <param name="syncNumber">The sync number that has been reached</param>
+        /// <param name="parent">The modified range list that originally owned this range</param>
         /// <param name="rangeAction">The action to perform</param>
-        public void RangeActionWithMigration(ulong offset, ulong size, ulong syncNumber, BufferFlushAction rangeAction)
+        public void RangeActionWithMigration(ulong offset, ulong size, ulong syncNumber, BufferModifiedRangeList parent, Action<ulong, ulong> rangeAction)
         {
-            if (_source != null)
+            bool firstSource = true;
+
+            if (parent != this)
             {
-                _source.RangeActionWithMigration(offset, size, syncNumber, rangeAction);
+                lock (_lock)
+                {
+                    if (_sources != null)
+                    {
+                        foreach (BufferMigration source in _sources)
+                        {
+                            if (source.Overlaps(offset, size, syncNumber))
+                            {
+                                if (firstSource && !source.FullyMatches(offset, size))
+                                {
+                                    // Perform this buffer's action first. The migrations will run after.
+                                    rangeAction(offset, size);
+                                }
+
+                                source.RangeActionWithMigration(offset, size, syncNumber, parent);
+
+                                firstSource = false;
+                            }
+                        }
+                    }
+                }
             }
-            else
+
+            if (firstSource)
             {
-                rangeAction(offset, size, syncNumber);
+                // No overlapping migrations, or they are not meant for this range, flush the data using the given action.
+                rangeAction(offset, size);
             }
         }
 
@@ -323,7 +319,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
 
                             ClearPart(overlap, clampAddress, clampEnd);
 
-                            RangeActionWithMigration(clampAddress, clampEnd - clampAddress, waitSync, _flushAction);
+                            RangeActionWithMigration(clampAddress, clampEnd - clampAddress, waitSync, overlap.Parent, _flushAction);
                         }
                     }
 
@@ -333,7 +329,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
 
             // There is a migration target to call instead. This can't be changed after set so accessing it outside the lock is fine.
 
-            _migrationTarget.RemoveRangesAndFlush(overlaps, rangeCount, highestDiff, currentSync, address, endAddress);
+            _migrationTarget.Destination.RemoveRangesAndFlush(overlaps, rangeCount, highestDiff, currentSync, address, endAddress);
         }
 
         /// <summary>
@@ -371,7 +367,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
 
             if (rangeCount == -1)
             {
-                _migrationTarget.WaitForAndFlushRanges(address, size);
+                _migrationTarget.Destination.WaitForAndFlushRanges(address, size);
 
                 return;
             }
@@ -411,9 +407,6 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// <summary>
         /// Inherit ranges from another modified range list.
         /// </summary>
-        /// <remarks>
-        /// Assumes that ranges will be inherited in address ascending order.
-        /// </remarks>
         /// <param name="ranges">The range list to inherit from</param>
         /// <param name="registerRangeAction">The action to call for each modified range</param>
         public void InheritRanges(BufferModifiedRangeList ranges, Action<ulong, ulong> registerRangeAction)
@@ -422,31 +415,18 @@ namespace Ryujinx.Graphics.Gpu.Memory
 
             lock (ranges._lock)
             {
+                BufferMigration migration = new(ranges._parent, ranges._flushAction, ranges, this, _context.SyncNumber);
+
+                ranges._parent.IncrementReferenceCount();
+                ranges._migrationTarget = migration;
+
+                _context.RegisterBufferMigration(migration);
+
                 inheritRanges = ranges.ToArray();
 
                 lock (_lock)
                 {
-                    // Copy over the migration from the previous range list
-
-                    BufferMigration oldMigration = ranges._source;
-
-                    BufferMigrationSpan span = new BufferMigrationSpan(ranges._parent, ranges._flushAction, oldMigration);
-                    ranges._parent.IncrementReferenceCount();
-
-                    if (_source == null)
-                    {
-                        // Create a new migration. 
-                        _source = new BufferMigration(new BufferMigrationSpan[] { span }, this, _context.SyncNumber);
-
-                        _context.RegisterBufferMigration(_source);
-                    }
-                    else
-                    {
-                        // Extend the migration
-                        _source.AddSpanToEnd(span);
-                    }
-
-                    ranges._migrationTarget = this;
+                    (_sources ??= new List<BufferMigration>()).Add(migration);
 
                     foreach (BufferModifiedRange range in inheritRanges)
                     {
@@ -465,27 +445,6 @@ namespace Ryujinx.Graphics.Gpu.Memory
             }
         }
 
-        /// <summary>
-        /// Register a migration from previous buffer storage. This migration is from a snapshot of the buffer's
-        /// current handle to its handle in the future, and is assumed to be complete when the sync action completes.
-        /// When the migration completes, the handle is disposed.
-        /// </summary>
-        public void SelfMigration()
-        {
-            lock (_lock)
-            {
-                BufferMigrationSpan span = new(_parent, _parent.GetSnapshotDisposeAction(), _parent.GetSnapshotFlushAction(), _source);
-                BufferMigration migration = new(new BufferMigrationSpan[] { span }, this, _context.SyncNumber);
-
-                // Migration target is used to redirect flush actions to the latest range list,
-                // so we don't need to set it here. (this range list is still the latest)
-
-                _context.RegisterBufferMigration(migration);
-
-                _source = migration;
-            }
-        }
-
         /// <summary>
         /// Removes a source buffer migration, indicating its copy has completed.
         /// </summary>
@@ -494,10 +453,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
         {
             lock (_lock)
             {
-                if (_source == migration)
-                {
-                    _source = null;
-                }
+                _sources.Remove(migration);
             }
         }
 

src/Ryujinx.Graphics.Gpu/Memory/BufferPreFlush.cs

@@ -1,295 +0,0 @@
-using Ryujinx.Common;
-using Ryujinx.Graphics.GAL;
-using System;
-
-namespace Ryujinx.Graphics.Gpu.Memory
-{
-    /// <summary>
-    /// Manages flushing ranges from buffers in advance for easy access, if they are flushed often.
-    /// Typically, from device local memory to a host mapped target for cached access.
-    /// </summary>
-    internal class BufferPreFlush : IDisposable
-    {
-        private const ulong PageSize = MemoryManager.PageSize;
-
-        /// <summary>
-        /// Threshold for the number of copies without a flush required to disable preflush on a page.
-        /// </summary>
-        private const int DeactivateCopyThreshold = 200;
-
-        /// <summary>
-        /// Value that indicates whether a page has been flushed or copied before.
-        /// </summary>
-        private enum PreFlushState
-        {
-            None,
-            HasFlushed,
-            HasCopied
-        }
-
-        /// <summary>
-        /// Flush state for each page of the buffer.
-        /// Controls whether data should be copied to the flush buffer, what sync is expected
-        /// and unflushed copy counting for stopping copies that are no longer needed.
-        /// </summary>
-        private struct PreFlushPage
-        {
-            public PreFlushState State;
-            public ulong FirstActivatedSync;
-            public ulong LastCopiedSync;
-            public int CopyCount;
-        }
-
-        /// <summary>
-        /// True if there are ranges that should copy to the flush buffer, false otherwise.
-        /// </summary>
-        public bool ShouldCopy { get; private set; }
-
-        private readonly GpuContext _context;
-        private readonly Buffer _buffer;
-        private readonly PreFlushPage[] _pages;
-        private readonly ulong _address;
-        private readonly ulong _size;
-        private readonly ulong _misalignment;
-        private readonly Action<BufferHandle, ulong, ulong> _flushAction;
-
-        private BufferHandle _flushBuffer;
-
-        public BufferPreFlush(GpuContext context, Buffer parent, Action<BufferHandle, ulong, ulong> flushAction)
-        {
-            _context = context;
-            _buffer = parent;
-            _address = parent.Address;
-            _size = parent.Size;
-            _pages = new PreFlushPage[BitUtils.DivRoundUp(_size, PageSize)];
-            _misalignment = _address & (PageSize - 1);
-
-            _flushAction = flushAction;
-        }
-
-        /// <summary>
-        /// Ensure that the flush buffer exists.
-        /// </summary>
-        private void EnsureFlushBuffer()
-        {
-            if (_flushBuffer == BufferHandle.Null)
-            {
-                _flushBuffer = _context.Renderer.CreateBuffer((int)_size, BufferAccess.HostMemory);
-            }
-        }
-
-        /// <summary>
-        /// Gets a page range from an address and size byte range.
-        /// </summary>
-        /// <param name="address">Range address</param>
-        /// <param name="size">Range size</param>
-        /// <returns>A page index and count</returns>
-        private (int index, int count) GetPageRange(ulong address, ulong size)
-        {
-            ulong offset = address - _address;
-            ulong endOffset = offset + size;
-
-            int basePage = (int)(offset / PageSize);
-            int endPage = (int)((endOffset - 1) / PageSize);
-
-            return (basePage, 1 + endPage - basePage);
-        }
-
-        /// <summary>
-        /// Gets an offset and size range in the parent buffer from a page index and count.
-        /// </summary>
-        /// <param name="startPage">Range start page</param>
-        /// <param name="count">Range page count</param>
-        /// <returns>Offset and size range</returns>
-        private (int offset, int size) GetOffset(int startPage, int count)
-        {
-            int offset = (int)((ulong)startPage * PageSize - _misalignment);
-            int endOffset = (int)((ulong)(startPage + count) * PageSize - _misalignment);
-
-            offset = Math.Max(0, offset);
-            endOffset = Math.Min((int)_size, endOffset);
-
-            return (offset, endOffset - offset);
-        }
-
-        /// <summary>
-        /// Copy a range of pages from the parent buffer into the flush buffer.
-        /// </summary>
-        /// <param name="startPage">Range start page</param>
-        /// <param name="count">Range page count</param>
-        private void CopyPageRange(int startPage, int count)
-        {
-            (int offset, int size) = GetOffset(startPage, count);
-
-            EnsureFlushBuffer();
-
-            _context.Renderer.Pipeline.CopyBuffer(_buffer.Handle, _flushBuffer, offset, offset, size);
-        }
-
-        /// <summary>
-        /// Copy a modified range into the flush buffer if it's marked as flushed.
-        /// Any pages the range overlaps are copied, and copies aren't repeated in the same sync number.
-        /// </summary>
-        /// <param name="address">Range address</param>
-        /// <param name="size">Range size</param>
-        public void CopyModified(ulong address, ulong size)
-        {
-            (int baseIndex, int count) = GetPageRange(address, size);
-            ulong syncNumber = _context.SyncNumber;
-
-            int startPage = -1;
-
-            for (int i = 0; i < count; i++)
-            {
-                int pageIndex = baseIndex + i;
-                ref PreFlushPage page = ref _pages[pageIndex];
-
-                if (page.State > PreFlushState.None)
-                {
-                    // Perform the copy, and update the state of each page.
-                    if (startPage == -1)
-                    {
-                        startPage = pageIndex;
-                    }
-
-                    if (page.State != PreFlushState.HasCopied)
-                    {
-                        page.FirstActivatedSync = syncNumber;
-                        page.State = PreFlushState.HasCopied;
-                    }
-                    else if (page.CopyCount++ >= DeactivateCopyThreshold)
-                    {
-                        page.CopyCount = 0;
-                        page.State = PreFlushState.None;
-                    }
-
-                    if (page.LastCopiedSync != syncNumber)
-                    {
-                        page.LastCopiedSync = syncNumber;
-                    }
-                }
-                else if (startPage != -1)
-                {
-                    CopyPageRange(startPage, pageIndex - startPage);
-
-                    startPage = -1;
-                }
-            }
-
-            if (startPage != -1)
-            {
-                CopyPageRange(startPage, (baseIndex + count) - startPage);
-            }
-        }
-
-        /// <summary>
-        /// Flush the given page range back into guest memory, optionally using data from the flush buffer.
-        /// The actual flushed range is an intersection of the page range and the address range.
-        /// </summary>
-        /// <param name="address">Address range start</param>
-        /// <param name="size">Address range size</param>
-        /// <param name="startPage">Page range start</param>
-        /// <param name="count">Page range count</param>
-        /// <param name="preFlush">True if the data should come from the flush buffer</param>
-        private void FlushPageRange(ulong address, ulong size, int startPage, int count, bool preFlush)
-        {
-            (int pageOffset, int pageSize) = GetOffset(startPage, count);
-
-            int offset = (int)(address - _address);
-            int end = offset + (int)size;
-
-            offset = Math.Max(offset, pageOffset);
-            end = Math.Min(end, pageOffset + pageSize);
-
-            if (end >= offset)
-            {
-                BufferHandle handle = preFlush ? _flushBuffer : _buffer.Handle;
-                _flushAction(handle, _address + (ulong)offset, (ulong)(end - offset));
-            }
-        }
-
-        /// <summary>
-        /// Flush the given address range back into guest memory, optionally using data from the flush buffer.
-        /// When a copy has been performed on or before the waited sync number, the data can come from the flush buffer.
-        /// Otherwise, it flushes the parent buffer directly.
-        /// </summary>
-        /// <param name="address">Range address</param>
-        /// <param name="size">Range size</param>
-        /// <param name="syncNumber">Sync number that has been waited for</param>
-        public void FlushWithAction(ulong address, ulong size, ulong syncNumber)
-        {
-            // Copy the parts of the range that have pre-flush copies that have been completed.
-            // Run the flush action for ranges that don't have pre-flush copies.
-
-            // If a range doesn't have a pre-flush copy, consider adding one.
-
-            (int baseIndex, int count) = GetPageRange(address, size);
-
-            bool rangePreFlushed = false;
-            int startPage = -1;
-
-            for (int i = 0; i < count; i++)
-            {
-                int pageIndex = baseIndex + i;
-                ref PreFlushPage page = ref _pages[pageIndex];
-
-                bool flushPage = false;
-                page.CopyCount = 0;
-
-                if (page.State == PreFlushState.HasCopied)
-                {
-                    if (syncNumber >= page.FirstActivatedSync)
-                    {
-                        // After the range is first activated, its data will always be copied to the preflush buffer on each sync.
-                        flushPage = true;
-                    }
-                }
-                else if (page.State == PreFlushState.None)
-                {
-                    page.State = PreFlushState.HasFlushed;
-                    ShouldCopy = true;
-                }
-
-                if (flushPage)
-                {
-                    if (!rangePreFlushed || startPage == -1)
-                    {
-                        if (startPage != -1)
-                        {
-                            FlushPageRange(address, size, startPage, pageIndex - startPage, false);
-                        }
-
-                        rangePreFlushed = true;
-                        startPage = pageIndex;
-                    }
-                }
-                else if (rangePreFlushed || startPage == -1)
-                {
-                    if (startPage != -1)
-                    {
-                        FlushPageRange(address, size, startPage, pageIndex - startPage, true);
-                    }
-
-                    rangePreFlushed = false;
-                    startPage = pageIndex;
-                }
-            }
-
-            if (startPage != -1)
-            {
-                FlushPageRange(address, size, startPage, (baseIndex + count) - startPage, rangePreFlushed);
-            }
-        }
-
-        /// <summary>
-        /// Dispose the flush buffer, if present.
-        /// </summary>
-        public void Dispose()
-        {
-            if (_flushBuffer != BufferHandle.Null)
-            {
-                _context.Renderer.DeleteBuffer(_flushBuffer);
-            }
-        }
-    }
-}

src/Ryujinx.Graphics.Gpu/Memory/BufferStage.cs

@@ -1,99 +0,0 @@
-using Ryujinx.Graphics.Shader;
-using System.Runtime.CompilerServices;
-
-namespace Ryujinx.Graphics.Gpu.Memory
-{
-    /// <summary>
-    /// Pipeline stages that can modify buffer data, as well as flags indicating storage usage.
-    /// Must match ShaderStage for the shader stages, though anything after that can be in any order.
-    /// </summary>
-    internal enum BufferStage : byte
-    {
-        Compute,
-        Vertex,
-        TessellationControl,
-        TessellationEvaluation,
-        Geometry,
-        Fragment,
-
-        Indirect,
-        VertexBuffer,
-        IndexBuffer,
-        Copy,
-        TransformFeedback,
-        Internal,
-        None,
-
-        StageMask = 0x3f,
-        StorageMask = 0xc0,
-
-        StorageRead = 0x40,
-        StorageWrite = 0x80,
-
-#pragma warning disable CA1069 // Enums values should not be duplicated
-        StorageAtomic = 0xc0
-#pragma warning restore CA1069 // Enums values should not be duplicated
-    }
-
-    /// <summary>
-    /// Utility methods to convert shader stages and binding flags into buffer stages.
-    /// </summary>
-    internal static class BufferStageUtils
-    {
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static BufferStage FromShaderStage(ShaderStage stage)
-        {
-            return (BufferStage)stage;
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static BufferStage FromShaderStage(int stageIndex)
-        {
-            return (BufferStage)(stageIndex + 1);
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static BufferStage FromUsage(BufferUsageFlags flags)
-        {
-            if (flags.HasFlag(BufferUsageFlags.Write))
-            {
-                return BufferStage.StorageWrite;
-            }
-            else
-            {
-                return BufferStage.StorageRead;
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static BufferStage FromUsage(TextureUsageFlags flags)
-        {
-            if (flags.HasFlag(TextureUsageFlags.ImageStore))
-            {
-                return BufferStage.StorageWrite;
-            }
-            else
-            {
-                return BufferStage.StorageRead;
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static BufferStage TextureBuffer(ShaderStage shaderStage, TextureUsageFlags flags)
-        {
-            return FromShaderStage(shaderStage) | FromUsage(flags);
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static BufferStage GraphicsStorage(int stageIndex, BufferUsageFlags flags)
-        {
-            return FromShaderStage(stageIndex) | FromUsage(flags);
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static BufferStage ComputeStorage(BufferUsageFlags flags)
-        {
-            return BufferStage.Compute | FromUsage(flags);
-        }
-    }
-}

src/Ryujinx.Graphics.Gpu/Shader/DiskCache/BinarySerializer.cs

@@ -141,7 +141,7 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
 
             if (algorithm == CompressionAlgorithm.Deflate)
             {
-                _activeStream = new DeflateStream(_stream, CompressionLevel.Fastest, true);
+                _activeStream = new DeflateStream(_stream, CompressionLevel.SmallestSize, true);
             }
         }
 
@@ -206,7 +206,7 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
                     stream.Write(data);
                     break;
                 case CompressionAlgorithm.Deflate:
-                    stream = new DeflateStream(stream, CompressionLevel.Fastest, true);
+                    stream = new DeflateStream(stream, CompressionLevel.SmallestSize, true);
                     stream.Write(data);
                     stream.Dispose();
                     break;

src/Ryujinx.Graphics.Gpu/Shader/DiskCache/DiskCacheGpuAccessor.cs

@@ -18,8 +18,6 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
         private readonly ShaderSpecializationState _newSpecState;
         private readonly int _stageIndex;
         private readonly bool _isVulkan;
-        private readonly bool _hasGeometryShader;
-        private readonly bool _supportsQuads;
 
         /// <summary>
         /// Creates a new instance of the cached GPU state accessor for shader translation.
@@ -31,7 +29,6 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
         /// <param name="newSpecState">Shader specialization state of the recompiled shader</param>
         /// <param name="counts">Resource counts shared across all shader stages</param>
         /// <param name="stageIndex">Shader stage index</param>
-        /// <param name="hasGeometryShader">Indicates if a geometry shader is present</param>
         public DiskCacheGpuAccessor(
             GpuContext context,
             ReadOnlyMemory<byte> data,
@@ -39,8 +36,7 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
             ShaderSpecializationState oldSpecState,
             ShaderSpecializationState newSpecState,
             ResourceCounts counts,
-            int stageIndex,
-            bool hasGeometryShader) : base(context, counts, stageIndex)
+            int stageIndex) : base(context, counts, stageIndex)
         {
             _data = data;
             _cb1Data = cb1Data;
@@ -48,8 +44,6 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
             _newSpecState = newSpecState;
             _stageIndex = stageIndex;
             _isVulkan = context.Capabilities.Api == TargetApi.Vulkan;
-            _hasGeometryShader = hasGeometryShader;
-            _supportsQuads = context.Capabilities.SupportsQuads;
 
             if (stageIndex == (int)ShaderStage.Geometry - 1)
             {
@@ -106,11 +100,7 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
         /// <inheritdoc/>
         public GpuGraphicsState QueryGraphicsState()
         {
-            return _oldSpecState.GraphicsState.CreateShaderGraphicsState(
-                !_isVulkan,
-                _supportsQuads,
-                _hasGeometryShader,
-                _isVulkan || _oldSpecState.GraphicsState.YNegateEnabled);
+            return _oldSpecState.GraphicsState.CreateShaderGraphicsState(!_isVulkan, _isVulkan || _oldSpecState.GraphicsState.YNegateEnabled);
         }
 
         /// <inheritdoc/>

src/Ryujinx.Graphics.Gpu/Shader/DiskCache/DiskCacheHostStorage.cs

@@ -22,7 +22,7 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
         private const ushort FileFormatVersionMajor = 1;
         private const ushort FileFormatVersionMinor = 2;
         private const uint FileFormatVersionPacked = ((uint)FileFormatVersionMajor << 16) | FileFormatVersionMinor;
-        private const uint CodeGenVersion = 5936;
+        private const uint CodeGenVersion = 6577;
 
         private const string SharedTocFileName = "shared.toc";
         private const string SharedDataFileName = "shared.data";

src/Ryujinx.Graphics.Gpu/Shader/DiskCache/ParallelDiskCacheLoader.cs

@@ -601,8 +601,6 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
 
             TargetApi api = _context.Capabilities.Api;
 
-            bool hasCachedGs = guestShaders[4].HasValue;
-
             for (int stageIndex = Constants.ShaderStages - 1; stageIndex >= 0; stageIndex--)
             {
                 if (guestShaders[stageIndex + 1].HasValue)
@@ -612,7 +610,7 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
                     byte[] guestCode = shader.Code;
                     byte[] cb1Data = shader.Cb1Data;
 
-                    DiskCacheGpuAccessor gpuAccessor = new(_context, guestCode, cb1Data, specState, newSpecState, counts, stageIndex, hasCachedGs);
+                    DiskCacheGpuAccessor gpuAccessor = new(_context, guestCode, cb1Data, specState, newSpecState, counts, stageIndex);
                     TranslatorContext currentStage = DecodeGraphicsShader(gpuAccessor, api, DefaultFlags, 0);
 
                     if (nextStage != null)
@@ -625,7 +623,7 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
                         byte[] guestCodeA = guestShaders[0].Value.Code;
                         byte[] cb1DataA = guestShaders[0].Value.Cb1Data;
 
-                        DiskCacheGpuAccessor gpuAccessorA = new(_context, guestCodeA, cb1DataA, specState, newSpecState, counts, 0, hasCachedGs);
+                        DiskCacheGpuAccessor gpuAccessorA = new(_context, guestCodeA, cb1DataA, specState, newSpecState, counts, 0);
                         translatorContexts[0] = DecodeGraphicsShader(gpuAccessorA, api, DefaultFlags | TranslationFlags.VertexA, 0);
                     }
 
@@ -713,7 +711,7 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
             GuestCodeAndCbData shader = guestShaders[0].Value;
             ResourceCounts counts = new();
             ShaderSpecializationState newSpecState = new(ref specState.ComputeState);
-            DiskCacheGpuAccessor gpuAccessor = new(_context, shader.Code, shader.Cb1Data, specState, newSpecState, counts, 0, false);
+            DiskCacheGpuAccessor gpuAccessor = new(_context, shader.Code, shader.Cb1Data, specState, newSpecState, counts, 0);
             gpuAccessor.InitializeReservedCounts(tfEnabled: false, vertexAsCompute: false);
 
             TranslatorContext translatorContext = DecodeComputeShader(gpuAccessor, _context.Capabilities.Api, 0);

src/Ryujinx.Graphics.Gpu/Shader/GpuAccessor.cs

@@ -17,8 +17,6 @@ namespace Ryujinx.Graphics.Gpu.Shader
         private readonly int _stageIndex;
         private readonly bool _compute;
         private readonly bool _isVulkan;
-        private readonly bool _hasGeometryShader;
-        private readonly bool _supportsQuads;
 
         /// <summary>
         /// Creates a new instance of the GPU state accessor for graphics shader translation.
@@ -27,20 +25,12 @@ namespace Ryujinx.Graphics.Gpu.Shader
         /// <param name="channel">GPU channel</param>
         /// <param name="state">Current GPU state</param>
         /// <param name="stageIndex">Graphics shader stage index (0 = Vertex, 4 = Fragment)</param>
-        /// <param name="hasGeometryShader">Indicates if a geometry shader is present</param>
-        public GpuAccessor(
-            GpuContext context,
-            GpuChannel channel,
-            GpuAccessorState state,
-            int stageIndex,
-            bool hasGeometryShader) : base(context, state.ResourceCounts, stageIndex)
+        public GpuAccessor(GpuContext context, GpuChannel channel, GpuAccessorState state, int stageIndex) : base(context, state.ResourceCounts, stageIndex)
         {
+            _isVulkan = context.Capabilities.Api == TargetApi.Vulkan;
             _channel = channel;
             _state = state;
             _stageIndex = stageIndex;
-            _isVulkan = context.Capabilities.Api == TargetApi.Vulkan;
-            _hasGeometryShader = hasGeometryShader;
-            _supportsQuads = context.Capabilities.SupportsQuads;
 
             if (stageIndex == (int)ShaderStage.Geometry - 1)
             {
@@ -115,11 +105,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
         /// <inheritdoc/>
         public GpuGraphicsState QueryGraphicsState()
         {
-            return _state.GraphicsState.CreateShaderGraphicsState(
-                !_isVulkan,
-                _supportsQuads,
-                _hasGeometryShader,
-                _isVulkan || _state.GraphicsState.YNegateEnabled);
+            return _state.GraphicsState.CreateShaderGraphicsState(!_isVulkan, _isVulkan || _state.GraphicsState.YNegateEnabled);
         }
 
         /// <inheritdoc/>

src/Ryujinx.Graphics.Gpu/Shader/GpuChannelGraphicsState.cs

@@ -106,11 +106,8 @@ namespace Ryujinx.Graphics.Gpu.Shader
         /// Creates a new graphics state from this state that can be used for shader generation.
         /// </summary>
         /// <param name="hostSupportsAlphaTest">Indicates if the host API supports alpha test operations</param>
-        /// <param name="hostSupportsQuads">Indicates if the host API supports quad primitives</param>
-        /// <param name="hasGeometryShader">Indicates if a geometry shader is used</param>
-        /// <param name="originUpperLeft">If true, indicates that the fragment origin is the upper left corner of the viewport, otherwise it is the lower left corner</param>
         /// <returns>GPU graphics state that can be used for shader translation</returns>
-        public readonly GpuGraphicsState CreateShaderGraphicsState(bool hostSupportsAlphaTest, bool hostSupportsQuads, bool hasGeometryShader, bool originUpperLeft)
+        public readonly GpuGraphicsState CreateShaderGraphicsState(bool hostSupportsAlphaTest, bool originUpperLeft)
         {
             AlphaTestOp alphaTestOp;
 
@@ -133,9 +130,6 @@ namespace Ryujinx.Graphics.Gpu.Shader
                 };
             }
 
-            bool isQuad = Topology == PrimitiveTopology.Quads || Topology == PrimitiveTopology.QuadStrip;
-            bool halvePrimitiveId = !hostSupportsQuads && !hasGeometryShader && isQuad;
-
             return new GpuGraphicsState(
                 EarlyZForce,
                 ConvertToInputTopology(Topology, TessellationMode),
@@ -155,8 +149,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
                 in FragmentOutputTypes,
                 DualSourceBlendEnable,
                 YNegateEnabled,
-                originUpperLeft,
-                halvePrimitiveId);
+                originUpperLeft);
         }
 
         /// <summary>

src/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs

@@ -339,7 +339,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
 
                 if (gpuVa != 0)
                 {
-                    GpuAccessor gpuAccessor = new(_context, channel, gpuAccessorState, stageIndex, addresses.Geometry != 0);
+                    GpuAccessor gpuAccessor = new(_context, channel, gpuAccessorState, stageIndex);
                     TranslatorContext currentStage = DecodeGraphicsShader(gpuAccessor, api, DefaultFlags, gpuVa);
 
                     if (nextStage != null)

src/Ryujinx.Graphics.OpenGL/OpenGLRenderer.cs

@@ -61,9 +61,7 @@ namespace Ryujinx.Graphics.OpenGL
         {
             BufferCount++;
 
-            var memType = access & GAL.BufferAccess.MemoryTypeMask;
-
-            if (memType == GAL.BufferAccess.HostMemory)
+            if (access.HasFlag(GAL.BufferAccess.FlushPersistent))
             {
                 BufferHandle handle = Buffer.CreatePersistent(size);
 
@@ -77,6 +75,11 @@ namespace Ryujinx.Graphics.OpenGL
             }
         }
 
+        public BufferHandle CreateBuffer(int size, GAL.BufferAccess access, BufferHandle storageHint)
+        {
+            return CreateBuffer(size, access);
+        }
+
         public BufferHandle CreateBuffer(nint pointer, int size)
         {
             throw new NotSupportedException();
@@ -145,7 +148,6 @@ namespace Ryujinx.Graphics.OpenGL
             return new Capabilities(
                 api: TargetApi.OpenGL,
                 vendorName: GpuVendor,
-                memoryType: SystemMemoryType.BackendManaged,
                 hasFrontFacingBug: intelWindows,
                 hasVectorIndexingBug: amdWindows,
                 needsFragmentOutputSpecialization: false,
@@ -159,7 +161,6 @@ namespace Ryujinx.Graphics.OpenGL
                 supportsBgraFormat: false,
                 supportsR4G4Format: false,
                 supportsR4G4B4A4Format: true,
-                supportsScaledVertexFormats: true,
                 supportsSnormBufferTextureFormat: false,
                 supports5BitComponentFormat: true,
                 supportsSparseBuffer: false,
@@ -174,7 +175,7 @@ namespace Ryujinx.Graphics.OpenGL
                 supportsMismatchingViewFormat: HwCapabilities.SupportsMismatchingViewFormat,
                 supportsCubemapView: true,
                 supportsNonConstantTextureOffset: HwCapabilities.SupportsNonConstantTextureOffset,
-                supportsQuads: HwCapabilities.SupportsQuads,
+                supportsScaledVertexFormats: true,
                 supportsSeparateSampler: false,
                 supportsShaderBallot: HwCapabilities.SupportsShaderBallot,
                 supportsShaderBarrierDivergence: !(intelWindows || intelUnix),

src/Ryujinx.Graphics.Shader/GpuGraphicsState.cs

@@ -102,11 +102,6 @@ namespace Ryujinx.Graphics.Shader
         /// </summary>
         public readonly bool OriginUpperLeft;
 
-        /// <summary>
-        /// Indicates that the primitive ID values on the shader should be halved due to quad to triangles conversion.
-        /// </summary>
-        public readonly bool HalvePrimitiveId;
-
         /// <summary>
         /// Creates a new GPU graphics state.
         /// </summary>
@@ -129,7 +124,6 @@ namespace Ryujinx.Graphics.Shader
         /// <param name="dualSourceBlendEnable">Indicates whether dual source blend is enabled</param>
         /// <param name="yNegateEnabled">Indicates if negation of the viewport Y axis is enabled</param>
         /// <param name="originUpperLeft">If true, indicates that the fragment origin is the upper left corner of the viewport, otherwise it is the lower left corner</param>
-        /// <param name="halvePrimitiveId">Indicates that the primitive ID values on the shader should be halved due to quad to triangles conversion</param>
         public GpuGraphicsState(
             bool earlyZForce,
             InputTopology topology,
@@ -149,8 +143,7 @@ namespace Ryujinx.Graphics.Shader
             in Array8<AttributeType> fragmentOutputTypes,
             bool dualSourceBlendEnable,
             bool yNegateEnabled,
-            bool originUpperLeft,
-            bool halvePrimitiveId)
+            bool originUpperLeft)
         {
             EarlyZForce = earlyZForce;
             Topology = topology;
@@ -171,7 +164,6 @@ namespace Ryujinx.Graphics.Shader
             DualSourceBlendEnable = dualSourceBlendEnable;
             YNegateEnabled = yNegateEnabled;
             OriginUpperLeft = originUpperLeft;
-            HalvePrimitiveId = halvePrimitiveId;
         }
     }
 }

src/Ryujinx.Graphics.Shader/IGpuAccessor.cs

@@ -135,7 +135,6 @@ namespace Ryujinx.Graphics.Shader
                 default,
                 false,
                 false,
-                false,
                 false);
         }
 

src/Ryujinx.Graphics.Shader/Instructions/InstEmitAttribute.cs

@@ -84,10 +84,6 @@ namespace Ryujinx.Graphics.Shader.Instructions
                                 value = context.IConvertU32ToFP32(value);
                             }
                         }
-                        else if (offset == AttributeConsts.PrimitiveId && context.TranslatorContext.Definitions.HalvePrimitiveId)
-                        {
-                            value = context.ShiftRightS32(value, Const(1));
-                        }
 
                         context.Copy(Register(rd), value);
                     }
@@ -191,12 +187,6 @@ namespace Ryujinx.Graphics.Shader.Instructions
                         }
                     }
                 }
-                else if (op.Imm10 == AttributeConsts.PrimitiveId && context.TranslatorContext.Definitions.HalvePrimitiveId)
-                {
-                    // If quads are used, but the host does not support them, they need to be converted to triangles.
-                    // Since each quad becomes 2 triangles, we need to compensate here and divide primitive ID by 2.
-                    res = context.ShiftRightS32(res, Const(1));
-                }
                 else if (op.Imm10 == AttributeConsts.FrontFacing && context.TranslatorContext.GpuAccessor.QueryHostHasFrontFacingBug())
                 {
                     // gl_FrontFacing sometimes has incorrect (flipped) values depending how it is accessed on Intel GPUs.

src/Ryujinx.Graphics.Shader/Translation/Optimizations/BindlessElimination.cs

@@ -66,9 +66,9 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations
 
             if (nvHandle.AsgOp is not Operation handleOp ||
                 handleOp.Inst != Instruction.Load ||
-                (handleOp.StorageKind != StorageKind.Input && handleOp.StorageKind != StorageKind.StorageBuffer))
+                handleOp.StorageKind != StorageKind.Input)
             {
-                // Right now, we only allow bindless access when the handle comes from a shader input or storage buffer.
+                // Right now, we only allow bindless access when the handle comes from a shader input.
                 // This is an artificial limitation to prevent it from being used in cases where it
                 // would have a large performance impact of loading all textures in the pool.
                 // It might be removed in the future, if we can mitigate the performance impact.

src/Ryujinx.Graphics.Shader/Translation/ShaderDefinitions.cs

@@ -45,8 +45,6 @@ namespace Ryujinx.Graphics.Shader.Translation
         public bool YNegateEnabled => _graphicsState.YNegateEnabled;
         public bool OriginUpperLeft => _graphicsState.OriginUpperLeft;
 
-        public bool HalvePrimitiveId => _graphicsState.HalvePrimitiveId;
-
         public ImapPixelType[] ImapTypes { get; }
         public bool IaIndexing { get; private set; }
         public bool OaIndexing { get; private set; }

src/Ryujinx.Graphics.Vulkan/BufferHolder.cs

@@ -1,3 +1,4 @@
+using Ryujinx.Common.Logging;
 using Ryujinx.Graphics.GAL;
 using Silk.NET.Vulkan;
 using System;
@@ -30,29 +31,40 @@ namespace Ryujinx.Graphics.Vulkan
 
         private readonly VulkanRenderer _gd;
         private readonly Device _device;
-        private readonly MemoryAllocation _allocation;
-        private readonly Auto<DisposableBuffer> _buffer;
-        private readonly Auto<MemoryAllocation> _allocationAuto;
+        private MemoryAllocation _allocation;
+        private Auto<DisposableBuffer> _buffer;
+        private Auto<MemoryAllocation> _allocationAuto;
         private readonly bool _allocationImported;
-        private readonly ulong _bufferHandle;
+        private ulong _bufferHandle;
 
         private CacheByRange<BufferHolder> _cachedConvertedBuffers;
 
         public int Size { get; }
 
-        private readonly IntPtr _map;
+        private IntPtr _map;
 
-        private readonly MultiFenceHolder _waitable;
+        private MultiFenceHolder _waitable;
 
         private bool _lastAccessIsWrite;
 
-        private readonly BufferAllocationType _baseType;
-        private readonly BufferAllocationType _activeType;
+        private BufferAllocationType _baseType;
+        private BufferAllocationType _currentType;
+        private bool _swapQueued;
+
+        public BufferAllocationType DesiredType { get; private set; }
+
+        private int _setCount;
+        private int _writeCount;
+        private int _flushCount;
+        private int _flushTemp;
+        private int _lastFlushWrite = -1;
 
         private readonly ReaderWriterLockSlim _flushLock;
         private FenceHolder _flushFence;
         private int _flushWaiting;
 
+        private List<Action> _swapActions;
+
         private byte[] _pendingData;
         private BufferMirrorRangeList _pendingDataRanges;
         private Dictionary<ulong, StagingBufferReserved> _mirrors;
@@ -71,7 +83,8 @@ namespace Ryujinx.Graphics.Vulkan
             _map = allocation.HostPointer;
 
             _baseType = type;
-            _activeType = currentType;
+            _currentType = currentType;
+            DesiredType = currentType;
 
             _flushLock = new ReaderWriterLockSlim();
             _useMirrors = gd.IsTBDR;
@@ -91,7 +104,8 @@ namespace Ryujinx.Graphics.Vulkan
             _map = _allocation.HostPointer + offset;
 
             _baseType = type;
-            _activeType = currentType;
+            _currentType = currentType;
+            DesiredType = currentType;
 
             _flushLock = new ReaderWriterLockSlim();
         }
@@ -106,11 +120,164 @@ namespace Ryujinx.Graphics.Vulkan
             Size = size;
 
             _baseType = BufferAllocationType.Sparse;
-            _activeType = BufferAllocationType.Sparse;
+            _currentType = BufferAllocationType.Sparse;
+            DesiredType = BufferAllocationType.Sparse;
 
             _flushLock = new ReaderWriterLockSlim();
         }
 
+        public bool TryBackingSwap(ref CommandBufferScoped? cbs)
+        {
+            if (_swapQueued && DesiredType != _currentType)
+            {
+                // Only swap if the buffer is not used in any queued command buffer.
+                bool isRented = _buffer.HasRentedCommandBufferDependency(_gd.CommandBufferPool);
+
+                if (!isRented && _gd.CommandBufferPool.OwnedByCurrentThread && !_flushLock.IsReadLockHeld && (_pendingData == null || cbs != null))
+                {
+                    var currentAllocation = _allocationAuto;
+                    var currentBuffer = _buffer;
+                    IntPtr currentMap = _map;
+
+                    (VkBuffer buffer, MemoryAllocation allocation, BufferAllocationType resultType) = _gd.BufferManager.CreateBacking(_gd, Size, DesiredType, false, false, _currentType);
+
+                    if (buffer.Handle != 0)
+                    {
+                        if (cbs != null)
+                        {
+                            ClearMirrors(cbs.Value, 0, Size);
+                        }
+
+                        _flushLock.EnterWriteLock();
+
+                        ClearFlushFence();
+
+                        _waitable = new MultiFenceHolder(Size);
+
+                        _allocation = allocation;
+                        _allocationAuto = new Auto<MemoryAllocation>(allocation);
+                        _buffer = new Auto<DisposableBuffer>(new DisposableBuffer(_gd.Api, _device, buffer), this, _waitable, _allocationAuto);
+                        _bufferHandle = buffer.Handle;
+                        _map = allocation.HostPointer;
+
+                        if (_map != IntPtr.Zero && currentMap != IntPtr.Zero)
+                        {
+                            // Copy data directly. Readbacks don't have to wait if this is done.
+
+                            unsafe
+                            {
+                                new Span<byte>((void*)currentMap, Size).CopyTo(new Span<byte>((void*)_map, Size));
+                            }
+                        }
+                        else
+                        {
+                            cbs ??= _gd.CommandBufferPool.Rent();
+
+                            CommandBufferScoped cbsV = cbs.Value;
+
+                            Copy(_gd, cbsV, currentBuffer, _buffer, 0, 0, Size);
+
+                            // Need to wait for the data to reach the new buffer before data can be flushed.
+
+                            _flushFence = _gd.CommandBufferPool.GetFence(cbsV.CommandBufferIndex);
+                            _flushFence.Get();
+                        }
+
+                        Logger.Debug?.PrintMsg(LogClass.Gpu, $"Converted {Size} buffer {_currentType} to {resultType}");
+
+                        _currentType = resultType;
+
+                        if (_swapActions != null)
+                        {
+                            foreach (var action in _swapActions)
+                            {
+                                action();
+                            }
+
+                            _swapActions.Clear();
+                        }
+
+                        currentBuffer.Dispose();
+                        currentAllocation.Dispose();
+
+                        _gd.PipelineInternal.SwapBuffer(currentBuffer, _buffer);
+
+                        _flushLock.ExitWriteLock();
+                    }
+
+                    _swapQueued = false;
+
+                    return true;
+                }
+
+                return false;
+            }
+
+            _swapQueued = false;
+
+            return true;
+        }
+
+        private void ConsiderBackingSwap()
+        {
+            if (_baseType == BufferAllocationType.Auto)
+            {
+                // When flushed, wait for a bit more info to make a decision.
+                bool wasFlushed = _flushTemp > 0;
+                int multiplier = wasFlushed ? 2 : 0;
+                if (_writeCount >= (WriteCountThreshold << multiplier) || _setCount >= (SetCountThreshold << multiplier) || _flushCount >= (FlushCountThreshold << multiplier))
+                {
+                    if (_flushCount > 0 || _flushTemp-- > 0)
+                    {
+                        // Buffers that flush should ideally be mapped in host address space for easy copies.
+                        // If the buffer is large it will do better on GPU memory, as there will be more writes than data flushes (typically individual pages).
+                        // If it is small, then it's likely most of the buffer will be flushed so we want it on host memory, as access is cached.
+
+                        bool hostMappingSensitive = _gd.Vendor == Vendor.Nvidia;
+                        bool deviceLocalMapped = Size > DeviceLocalSizeThreshold || (wasFlushed && _writeCount > _flushCount * 10 && hostMappingSensitive) || _currentType == BufferAllocationType.DeviceLocalMapped;
+
+                        DesiredType = deviceLocalMapped ? BufferAllocationType.DeviceLocalMapped : BufferAllocationType.HostMapped;
+
+                        // It's harder for a buffer that is flushed to revert to another type of mapping.
+                        if (_flushCount > 0)
+                        {
+                            _flushTemp = 1000;
+                        }
+                    }
+                    else if (_writeCount >= (WriteCountThreshold << multiplier))
+                    {
+                        // Buffers that are written often should ideally be in the device local heap. (Storage buffers)
+                        DesiredType = BufferAllocationType.DeviceLocal;
+                    }
+                    else if (_setCount > (SetCountThreshold << multiplier))
+                    {
+                        // Buffers that have their data set often should ideally be host mapped. (Constant buffers)
+                        DesiredType = BufferAllocationType.HostMapped;
+                    }
+
+                    _lastFlushWrite = -1;
+                    _flushCount = 0;
+                    _writeCount = 0;
+                    _setCount = 0;
+                }
+
+                if (!_swapQueued && DesiredType != _currentType)
+                {
+                    _swapQueued = true;
+
+                    _gd.PipelineInternal.AddBackingSwap(this);
+                }
+            }
+        }
+
+        public void Pin()
+        {
+            if (_baseType == BufferAllocationType.Auto)
+            {
+                _baseType = _currentType;
+            }
+        }
+
         public unsafe Auto<DisposableBufferView> CreateView(VkFormat format, int offset, int size, Action invalidateView)
         {
             var bufferViewCreateInfo = new BufferViewCreateInfo
@@ -124,9 +291,19 @@ namespace Ryujinx.Graphics.Vulkan
 
             _gd.Api.CreateBufferView(_device, bufferViewCreateInfo, null, out var bufferView).ThrowOnError();
 
+            (_swapActions ??= new List<Action>()).Add(invalidateView);
+
             return new Auto<DisposableBufferView>(new DisposableBufferView(_gd.Api, _device, bufferView), this, _waitable, _buffer);
         }
 
+        public void InheritMetrics(BufferHolder other)
+        {
+            _setCount = other._setCount;
+            _writeCount = other._writeCount;
+            _flushCount = other._flushCount;
+            _flushTemp = other._flushTemp;
+        }
+
         public unsafe void InsertBarrier(CommandBuffer commandBuffer, bool isWrite)
         {
             // If the last access is write, we always need a barrier to be sure we will read or modify
@@ -246,8 +423,18 @@ namespace Ryujinx.Graphics.Vulkan
         {
             if (isWrite)
             {
+                _writeCount++;
+
                 SignalWrite(0, Size);
             }
+            else if (isSSBO)
+            {
+                // Always consider SSBO access for swapping to device local memory.
+
+                _writeCount++;
+
+                ConsiderBackingSwap();
+            }
 
             return _buffer;
         }
@@ -256,6 +443,8 @@ namespace Ryujinx.Graphics.Vulkan
         {
             if (isWrite)
             {
+                _writeCount++;
+
                 SignalWrite(offset, size);
             }
 
@@ -354,6 +543,8 @@ namespace Ryujinx.Graphics.Vulkan
 
         public void SignalWrite(int offset, int size)
         {
+            ConsiderBackingSwap();
+
             if (offset == 0 && size == Size)
             {
                 _cachedConvertedBuffers.Clear();
@@ -433,6 +624,13 @@ namespace Ryujinx.Graphics.Vulkan
 
             WaitForFlushFence();
 
+            if (_lastFlushWrite != _writeCount)
+            {
+                // If it's on the same page as the last flush, ignore it.
+                _lastFlushWrite = _writeCount;
+                _flushCount++;
+            }
+
             Span<byte> result;
 
             if (_map != IntPtr.Zero)
@@ -513,7 +711,8 @@ namespace Ryujinx.Graphics.Vulkan
                 return;
             }
 
-            bool allowMirror = _useMirrors && allowCbsWait && cbs != null && _activeType <= BufferAllocationType.HostMapped;
+            _setCount++;
+            bool allowMirror = _useMirrors && allowCbsWait && cbs != null && _currentType <= BufferAllocationType.HostMapped;
 
             if (_map != IntPtr.Zero)
             {
@@ -664,6 +863,8 @@ namespace Ryujinx.Graphics.Vulkan
 
             var dstBuffer = GetBuffer(cbs.CommandBuffer, dstOffset, data.Length, true).Get(cbs, dstOffset, data.Length, true).Value;
 
+            _writeCount--;
+
             InsertBufferBarrier(
                 _gd,
                 cbs.CommandBuffer,
@@ -899,6 +1100,8 @@ namespace Ryujinx.Graphics.Vulkan
 
         public void Dispose()
         {
+            _swapQueued = false;
+
             _gd.PipelineInternal?.FlushCommandsIfWeightExceeding(_buffer, (ulong)Size);
 
             _buffer.Dispose();

src/Ryujinx.Graphics.Vulkan/BufferManager.cs

@@ -165,6 +165,10 @@ namespace Ryujinx.Graphics.Vulkan
 
                 if (TryGetBuffer(range.Handle, out var existingHolder))
                 {
+                    // Since this buffer now also owns the memory from the referenced buffer,
+                    // we pin it to ensure the memory location will not change.
+                    existingHolder.Pin();
+
                     (var memory, var offset) = existingHolder.GetDeviceMemoryAndOffset();
 
                     memoryBinds[index] = new SparseMemoryBind()
@@ -231,9 +235,10 @@ namespace Ryujinx.Graphics.Vulkan
             int size,
             bool sparseCompatible = false,
             BufferAllocationType baseType = BufferAllocationType.HostMapped,
+            BufferHandle storageHint = default,
             bool forceMirrors = false)
         {
-            return CreateWithHandle(gd, size, out _, sparseCompatible, baseType, forceMirrors);
+            return CreateWithHandle(gd, size, out _, sparseCompatible, baseType, storageHint, forceMirrors);
         }
 
         public BufferHandle CreateWithHandle(
@@ -242,9 +247,10 @@ namespace Ryujinx.Graphics.Vulkan
             out BufferHolder holder,
             bool sparseCompatible = false,
             BufferAllocationType baseType = BufferAllocationType.HostMapped,
+            BufferHandle storageHint = default,
             bool forceMirrors = false)
         {
-            holder = Create(gd, size, forConditionalRendering: false, sparseCompatible, baseType);
+            holder = Create(gd, size, forConditionalRendering: false, sparseCompatible, baseType, storageHint);
             if (holder == null)
             {
                 return BufferHandle.Null;
@@ -381,13 +387,31 @@ namespace Ryujinx.Graphics.Vulkan
             int size,
             bool forConditionalRendering = false,
             bool sparseCompatible = false,
-            BufferAllocationType baseType = BufferAllocationType.HostMapped)
+            BufferAllocationType baseType = BufferAllocationType.HostMapped,
+            BufferHandle storageHint = default)
         {
             BufferAllocationType type = baseType;
+            BufferHolder storageHintHolder = null;
 
             if (baseType == BufferAllocationType.Auto)
             {
-                type = BufferAllocationType.HostMapped;
+                if (gd.IsSharedMemory)
+                {
+                    baseType = BufferAllocationType.HostMapped;
+                    type = baseType;
+                }
+                else
+                {
+                    type = size >= BufferHolder.DeviceLocalSizeThreshold ? BufferAllocationType.DeviceLocal : BufferAllocationType.HostMapped;
+                }
+
+                if (storageHint != BufferHandle.Null)
+                {
+                    if (TryGetBuffer(storageHint, out storageHintHolder))
+                    {
+                        type = storageHintHolder.DesiredType;
+                    }
+                }
             }
 
             (VkBuffer buffer, MemoryAllocation allocation, BufferAllocationType resultType) =
@@ -397,6 +421,11 @@ namespace Ryujinx.Graphics.Vulkan
             {
                 var holder = new BufferHolder(gd, _device, buffer, allocation, size, baseType, resultType);
 
+                if (storageHintHolder != null)
+                {
+                    holder.InheritMetrics(storageHintHolder);
+                }
+
                 return holder;
             }
 

src/Ryujinx.Graphics.Vulkan/EnumConversion.cs

@@ -424,20 +424,10 @@ namespace Ryujinx.Graphics.Vulkan
 
         public static BufferAllocationType Convert(this BufferAccess access)
         {
-            BufferAccess memType = access & BufferAccess.MemoryTypeMask;
-
-            if (memType == BufferAccess.HostMemory || access.HasFlag(BufferAccess.Stream))
+            if (access.HasFlag(BufferAccess.FlushPersistent) || access.HasFlag(BufferAccess.Stream))
             {
                 return BufferAllocationType.HostMapped;
             }
-            else if (memType == BufferAccess.DeviceMemory)
-            {
-                return BufferAllocationType.DeviceLocal;
-            }
-            else if (memType == BufferAccess.DeviceMemoryMapped)
-            {
-                return BufferAllocationType.DeviceLocalMapped;
-            }
 
             return BufferAllocationType.Auto;
         }

src/Ryujinx.Graphics.Vulkan/FramebufferParams.cs

@@ -24,7 +24,6 @@ namespace Ryujinx.Graphics.Vulkan
         public VkFormat[] AttachmentFormats { get; }
         public int[] AttachmentIndices { get; }
         public uint AttachmentIntegerFormatMask { get; }
-        public bool LogicOpsAllowed { get; }
 
         public int AttachmentsCount { get; }
         public int MaxColorAttachmentIndex => AttachmentIndices.Length > 0 ? AttachmentIndices[^1] : -1;
@@ -33,9 +32,7 @@ namespace Ryujinx.Graphics.Vulkan
 
         public FramebufferParams(Device device, TextureView view, uint width, uint height)
         {
-            var format = view.Info.Format;
-
-            bool isDepthStencil = format.IsDepthOrStencil();
+            bool isDepthStencil = view.Info.Format.IsDepthOrStencil();
 
             _device = device;
             _attachments = new[] { view.GetImageViewForAttachment() };
@@ -59,8 +56,6 @@ namespace Ryujinx.Graphics.Vulkan
             AttachmentSamples = new[] { (uint)view.Info.Samples };
             AttachmentFormats = new[] { view.VkFormat };
             AttachmentIndices = isDepthStencil ? Array.Empty<int>() : new[] { 0 };
-            AttachmentIntegerFormatMask = format.IsInteger() ? 1u : 0u;
-            LogicOpsAllowed = !format.IsFloatOrSrgb();
 
             AttachmentsCount = 1;
 
@@ -90,7 +85,6 @@ namespace Ryujinx.Graphics.Vulkan
             int index = 0;
             int bindIndex = 0;
             uint attachmentIntegerFormatMask = 0;
-            bool allFormatsFloatOrSrgb = colorsCount != 0;
 
             foreach (ITexture color in colors)
             {
@@ -107,15 +101,11 @@ namespace Ryujinx.Graphics.Vulkan
                     AttachmentFormats[index] = texture.VkFormat;
                     AttachmentIndices[index] = bindIndex;
 
-                    var format = texture.Info.Format;
-
-                    if (format.IsInteger())
+                    if (texture.Info.Format.IsInteger())
                     {
                         attachmentIntegerFormatMask |= 1u << bindIndex;
                     }
 
-                    allFormatsFloatOrSrgb &= format.IsFloatOrSrgb();
-
                     width = Math.Min(width, (uint)texture.Width);
                     height = Math.Min(height, (uint)texture.Height);
                     layers = Math.Min(layers, (uint)texture.Layers);
@@ -130,7 +120,6 @@ namespace Ryujinx.Graphics.Vulkan
             }
 
             AttachmentIntegerFormatMask = attachmentIntegerFormatMask;
-            LogicOpsAllowed = !allFormatsFloatOrSrgb;
 
             if (depthStencil is TextureView dsTexture && dsTexture.Valid)
             {

src/Ryujinx.Graphics.Vulkan/PipelineBase.cs

@@ -1498,7 +1498,6 @@ namespace Ryujinx.Graphics.Vulkan
             var dstAttachmentFormats = _newState.Internal.AttachmentFormats.AsSpan();
             FramebufferParams.AttachmentFormats.CopyTo(dstAttachmentFormats);
             _newState.Internal.AttachmentIntegerFormatMask = FramebufferParams.AttachmentIntegerFormatMask;
-            _newState.Internal.LogicOpsAllowed = FramebufferParams.LogicOpsAllowed;
 
             for (int i = FramebufferParams.AttachmentFormats.Length; i < dstAttachmentFormats.Length; i++)
             {

src/Ryujinx.Graphics.Vulkan/PipelineConverter.cs

@@ -302,7 +302,6 @@ namespace Ryujinx.Graphics.Vulkan
             int attachmentCount = 0;
             int maxColorAttachmentIndex = -1;
             uint attachmentIntegerFormatMask = 0;
-            bool allFormatsFloatOrSrgb = true;
 
             for (int i = 0; i < Constants.MaxRenderTargets; i++)
             {
@@ -315,8 +314,6 @@ namespace Ryujinx.Graphics.Vulkan
                     {
                         attachmentIntegerFormatMask |= 1u << i;
                     }
-
-                    allFormatsFloatOrSrgb &= state.AttachmentFormats[i].IsFloatOrSrgb();
                 }
             }
 
@@ -328,7 +325,6 @@ namespace Ryujinx.Graphics.Vulkan
             pipeline.ColorBlendAttachmentStateCount = (uint)(maxColorAttachmentIndex + 1);
             pipeline.VertexAttributeDescriptionsCount = (uint)Math.Min(Constants.MaxVertexAttributes, state.VertexAttribCount);
             pipeline.Internal.AttachmentIntegerFormatMask = attachmentIntegerFormatMask;
-            pipeline.Internal.LogicOpsAllowed = attachmentCount == 0 || !allFormatsFloatOrSrgb;
 
             return pipeline;
         }

src/Ryujinx.Graphics.Vulkan/PipelineFull.cs

@@ -222,6 +222,20 @@ namespace Ryujinx.Graphics.Vulkan
             }
         }
 
+        private void TryBackingSwaps()
+        {
+            CommandBufferScoped? cbs = null;
+
+            _backingSwaps.RemoveAll(holder => holder.TryBackingSwap(ref cbs));
+
+            cbs?.Dispose();
+        }
+
+        public void AddBackingSwap(BufferHolder holder)
+        {
+            _backingSwaps.Add(holder);
+        }
+
         public void Restore()
         {
             if (Pipeline != null)
@@ -277,6 +291,8 @@ namespace Ryujinx.Graphics.Vulkan
 
             Gd.ResetCounterPool();
 
+            TryBackingSwaps();
+
             Restore();
         }
 

src/Ryujinx.Graphics.Vulkan/PipelineState.cs

@@ -560,14 +560,10 @@ namespace Ryujinx.Graphics.Vulkan
                     }
                 }
 
-                // AMD has a bug where it enables logical operations even for float formats,
-                // so we need to force disable them here.
-                bool logicOpEnable = LogicOpEnable && (gd.Vendor != Vendor.Amd || Internal.LogicOpsAllowed);
-
                 var colorBlendState = new PipelineColorBlendStateCreateInfo
                 {
                     SType = StructureType.PipelineColorBlendStateCreateInfo,
-                    LogicOpEnable = logicOpEnable,
+                    LogicOpEnable = LogicOpEnable,
                     LogicOp = LogicOp,
                     AttachmentCount = ColorBlendAttachmentStateCount,
                     PAttachments = pColorBlendAttachmentState,

src/Ryujinx.Graphics.Vulkan/PipelineUid.cs

@@ -34,7 +34,6 @@ namespace Ryujinx.Graphics.Vulkan
         public Array8<PipelineColorBlendAttachmentState> ColorBlendAttachmentState;
         public Array9<Format> AttachmentFormats;
         public uint AttachmentIntegerFormatMask;
-        public bool LogicOpsAllowed;
 
         public readonly override bool Equals(object obj)
         {

src/Ryujinx.Graphics.Vulkan/VulkanRenderer.cs

@@ -486,7 +486,12 @@ namespace Ryujinx.Graphics.Vulkan
 
         public BufferHandle CreateBuffer(int size, BufferAccess access)
         {
-            return BufferManager.CreateWithHandle(this, size, access.HasFlag(BufferAccess.SparseCompatible), access.Convert(), access.HasFlag(BufferAccess.Stream));
+            return BufferManager.CreateWithHandle(this, size, access.HasFlag(BufferAccess.SparseCompatible), access.Convert(), default, access == BufferAccess.Stream);
+        }
+
+        public BufferHandle CreateBuffer(int size, BufferAccess access, BufferHandle storageHint)
+        {
+            return BufferManager.CreateWithHandle(this, size, access.HasFlag(BufferAccess.SparseCompatible), access.Convert(), storageHint);
         }
 
         public BufferHandle CreateBuffer(nint pointer, int size)
@@ -670,23 +675,9 @@ namespace Ryujinx.Graphics.Vulkan
             var limits = _physicalDevice.PhysicalDeviceProperties.Limits;
             var mainQueueProperties = _physicalDevice.QueueFamilyProperties[QueueFamilyIndex];
 
-            SystemMemoryType memoryType;
-
-            if (IsSharedMemory)
-            {
-                memoryType = SystemMemoryType.UnifiedMemory;
-            }
-            else
-            {
-                memoryType = Vendor == Vendor.Nvidia ?
-                    SystemMemoryType.DedicatedMemorySlowStorage :
-                    SystemMemoryType.DedicatedMemory;
-            }
-
             return new Capabilities(
                 api: TargetApi.Vulkan,
                 GpuVendor,
-                memoryType: memoryType,
                 hasFrontFacingBug: IsIntelWindows,
                 hasVectorIndexingBug: Vendor == Vendor.Qualcomm,
                 needsFragmentOutputSpecialization: IsMoltenVk,
@@ -700,7 +691,6 @@ namespace Ryujinx.Graphics.Vulkan
                 supportsBgraFormat: true,
                 supportsR4G4Format: false,
                 supportsR4G4B4A4Format: supportsR4G4B4A4Format,
-                supportsScaledVertexFormats: FormatCapabilities.SupportsScaledVertexFormats(),
                 supportsSnormBufferTextureFormat: true,
                 supports5BitComponentFormat: supports5BitComponentFormat,
                 supportsSparseBuffer: features2.Features.SparseBinding && mainQueueProperties.QueueFlags.HasFlag(QueueFlags.SparseBindingBit),
@@ -715,7 +705,7 @@ namespace Ryujinx.Graphics.Vulkan
                 supportsMismatchingViewFormat: true,
                 supportsCubemapView: !IsAmdGcn,
                 supportsNonConstantTextureOffset: false,
-                supportsQuads: false,
+                supportsScaledVertexFormats: FormatCapabilities.SupportsScaledVertexFormats(),
                 supportsSeparateSampler: true,
                 supportsShaderBallot: false,
                 supportsShaderBarrierDivergence: Vendor != Vendor.Intel,

src/Ryujinx.Gtk3/Input/GTK3/GTK3KeyboardDriver.cs

@@ -81,11 +81,6 @@ namespace Ryujinx.Input.GTK3
             return _pressedKeys.Contains(nativeKey);
         }
 
-        public void Clear()
-        {
-            _pressedKeys.Clear();
-        }
-
         public IGamepad GetGamepad(string id)
         {
             if (!_keyboardIdentifers[0].Equals(id))

src/Ryujinx.Gtk3/Program.cs

@@ -75,7 +75,7 @@ namespace Ryujinx
 
             if (OperatingSystem.IsWindows() && !OperatingSystem.IsWindowsVersionAtLeast(10, 0, 17134))
             {
-                MessageBoxA(IntPtr.Zero, "You are running an outdated version of Windows.\n\nRyujinx supports Windows 10 version 1803 and newer.\n", $"Ryujinx {Version}", MbIconWarning);
+                MessageBoxA(IntPtr.Zero, "You are running an outdated version of Windows.\n\nStarting on June 1st 2022, Ryujinx will only support Windows 10 1803 and newer.\n", $"Ryujinx {Version}", MbIconWarning);
             }
 
             // Parse arguments
@@ -181,24 +181,21 @@ namespace Ryujinx
             {
                 // No configuration, we load the default values and save it to disk
                 ConfigurationPath = appDataConfigurationPath;
-                Logger.Notice.Print(LogClass.Application, $"No configuration file found. Saving default configuration to: {ConfigurationPath}");
 
                 ConfigurationState.Instance.LoadDefault();
                 ConfigurationState.Instance.ToFileFormat().SaveConfig(ConfigurationPath);
             }
             else
             {
-                Logger.Notice.Print(LogClass.Application, $"Loading configuration from: {ConfigurationPath}");
-
                 if (ConfigurationFileFormat.TryLoad(ConfigurationPath, out ConfigurationFileFormat configurationFileFormat))
                 {
                     ConfigurationState.Instance.Load(configurationFileFormat, ConfigurationPath);
                 }
                 else
                 {
-                    Logger.Warning?.PrintMsg(LogClass.Application, $"Failed to load config! Loading the default config instead.\nFailed config location: {ConfigurationPath}");
-
                     ConfigurationState.Instance.LoadDefault();
+
+                    Logger.Warning?.PrintMsg(LogClass.Application, $"Failed to load config! Loading the default config instead.\nFailed config location {ConfigurationPath}");
                 }
             }
 

src/Ryujinx.Gtk3/Ryujinx.Gtk3.csproj

@@ -63,7 +63,7 @@
     </Content>
   </ItemGroup>
 
-  <ItemGroup Condition="'$(RuntimeIdentifier)' == 'linux-x64' OR '$(RuntimeIdentifier)' == 'linux-arm64' OR ('$(RuntimeIdentifier)' == '' AND $([MSBuild]::IsOSPlatform('Linux')))">
+  <ItemGroup Condition="'$(RuntimeIdentifier)' == 'linux-x64' OR '$(RuntimeIdentifier)' == 'linux-arm64'">
     <Content Include="..\..\distribution\linux\Ryujinx.sh">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

src/Ryujinx.Gtk3/UI/Applet/GtkHostUIHandler.cs

@@ -107,8 +107,6 @@ namespace Ryujinx.UI.Applet
                     swkbdDialog.SetInputLengthValidation(args.StringLengthMin, args.StringLengthMax);
                     swkbdDialog.SetInputValidation(args.KeyboardMode);
 
-                    ((MainWindow)_parent).RendererWidget.NpadManager.BlockInputUpdates();
-
                     if (swkbdDialog.Run() == (int)ResponseType.Ok)
                     {
                         inputText = swkbdDialog.InputEntry.Text;
@@ -130,7 +128,6 @@ namespace Ryujinx.UI.Applet
             });
 
             dialogCloseEvent.WaitOne();
-            ((MainWindow)_parent).RendererWidget.NpadManager.UnblockInputUpdates();
 
             userText = error ? null : inputText;
 

src/Ryujinx.HLE/HOS/Kernel/Threading/KScheduler.cs

@@ -28,25 +28,42 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
 
         private SchedulingState _state;
 
+        private AutoResetEvent _idleInterruptEvent;
+        private readonly object _idleInterruptEventLock;
+
         private KThread _previousThread;
         private KThread _currentThread;
-
-        private int _coreIdleLock;
-        private bool _idleSignalled = true;
-        private bool _idleActive = true;
-        private long _idleTimeRunning;
+        private readonly KThread _idleThread;
 
         public KThread PreviousThread => _previousThread;
         public KThread CurrentThread => _currentThread;
         public long LastContextSwitchTime { get; private set; }
-        public long TotalIdleTimeTicks => _idleTimeRunning;
+        public long TotalIdleTimeTicks => _idleThread.TotalTimeRunning;
 
         public KScheduler(KernelContext context, int coreId)
         {
             _context = context;
             _coreId = coreId;
 
-            _currentThread = null;
+            _idleInterruptEvent = new AutoResetEvent(false);
+            _idleInterruptEventLock = new object();
+
+            KThread idleThread = CreateIdleThread(context, coreId);
+
+            _currentThread = idleThread;
+            _idleThread = idleThread;
+
+            idleThread.StartHostThread();
+            idleThread.SchedulerWaitEvent.Set();
+        }
+
+        private KThread CreateIdleThread(KernelContext context, int cpuCore)
+        {
+            KThread idleThread = new(context);
+
+            idleThread.Initialize(0UL, 0UL, 0UL, PrioritiesCount, cpuCore, null, ThreadType.Dummy, IdleThreadLoop);
+
+            return idleThread;
         }
 
         public static ulong SelectThreads(KernelContext context)
@@ -220,64 +237,39 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
                 KThread threadToSignal = context.Schedulers[coreToSignal]._currentThread;
 
                 // Request the thread running on that core to stop and reschedule, if we have one.
-                threadToSignal?.Context.RequestInterrupt();
+                if (threadToSignal != context.Schedulers[coreToSignal]._idleThread)
+                {
+                    threadToSignal.Context.RequestInterrupt();
+                }
 
                 // If the core is idle, ensure that the idle thread is awaken.
-                context.Schedulers[coreToSignal].NotifyIdleThread();
+                context.Schedulers[coreToSignal]._idleInterruptEvent.Set();
 
                 scheduledCoresMask &= ~(1UL << coreToSignal);
             }
         }
 
-        private void ActivateIdleThread()
+        private void IdleThreadLoop()
         {
-            while (Interlocked.CompareExchange(ref _coreIdleLock, 1, 0) != 0)
-            {
-                Thread.SpinWait(1);
-            }
-
-            Thread.MemoryBarrier();
-
-            // Signals that idle thread is now active on this core.
-            _idleActive = true;
-
-            TryLeaveIdle();
-
-            Interlocked.Exchange(ref _coreIdleLock, 0);
-        }
-
-        private void NotifyIdleThread()
-        {
-            while (Interlocked.CompareExchange(ref _coreIdleLock, 1, 0) != 0)
-            {
-                Thread.SpinWait(1);
-            }
-
-            Thread.MemoryBarrier();
-
-            // Signals that the idle core may be able to exit idle.
-            _idleSignalled = true;
-
-            TryLeaveIdle();
-
-            Interlocked.Exchange(ref _coreIdleLock, 0);
-        }
-
-        public void TryLeaveIdle()
-        {
-            if (_idleSignalled && _idleActive)
+            while (_context.Running)
             {
                 _state.NeedsScheduling = false;
                 Thread.MemoryBarrier();
-                KThread nextThread = PickNextThread(null, _state.SelectedThread);
+                KThread nextThread = PickNextThread(_state.SelectedThread);
 
-                if (nextThread != null)
+                if (_idleThread != nextThread)
                 {
-                    _idleActive = false;
-                    nextThread.SchedulerWaitEvent.Set();
+                    _idleThread.SchedulerWaitEvent.Reset();
+                    WaitHandle.SignalAndWait(nextThread.SchedulerWaitEvent, _idleThread.SchedulerWaitEvent);
                 }
 
-                _idleSignalled = false;
+                _idleInterruptEvent.WaitOne();
+            }
+
+            lock (_idleInterruptEventLock)
+            {
+                _idleInterruptEvent.Dispose();
+                _idleInterruptEvent = null;
             }
         }
 
@@ -300,37 +292,20 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
             // Wake all the threads that might be waiting until this thread context is unlocked.
             for (int core = 0; core < CpuCoresCount; core++)
             {
-                _context.Schedulers[core].NotifyIdleThread();
+                _context.Schedulers[core]._idleInterruptEvent.Set();
             }
 
-            KThread nextThread = PickNextThread(KernelStatic.GetCurrentThread(), selectedThread);
+            KThread nextThread = PickNextThread(selectedThread);
 
             if (currentThread.Context.Running)
             {
                 // Wait until this thread is scheduled again, and allow the next thread to run.
-
-                if (nextThread == null)
-                {
-                    ActivateIdleThread();
-                    currentThread.SchedulerWaitEvent.WaitOne();
-                }
-                else
-                {
-                    WaitHandle.SignalAndWait(nextThread.SchedulerWaitEvent, currentThread.SchedulerWaitEvent);
-                }
+                WaitHandle.SignalAndWait(nextThread.SchedulerWaitEvent, currentThread.SchedulerWaitEvent);
             }
             else
             {
                 // Allow the next thread to run.
-
-                if (nextThread == null)
-                {
-                    ActivateIdleThread();
-                }
-                else
-                {
-                    nextThread.SchedulerWaitEvent.Set();
-                }
+                nextThread.SchedulerWaitEvent.Set();
 
                 // We don't need to wait since the thread is exiting, however we need to
                 // make sure this thread will never call the scheduler again, since it is
@@ -344,7 +319,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
             }
         }
 
-        private KThread PickNextThread(KThread currentThread, KThread selectedThread)
+        private KThread PickNextThread(KThread selectedThread)
         {
             while (true)
             {
@@ -360,7 +335,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
                     // on the core, as the scheduled thread will handle the next switch.
                     if (selectedThread.ThreadContext.Lock())
                     {
-                        SwitchTo(currentThread, selectedThread);
+                        SwitchTo(selectedThread);
 
                         if (!_state.NeedsScheduling)
                         {
@@ -371,15 +346,15 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
                     }
                     else
                     {
-                        return null;
+                        return _idleThread;
                     }
                 }
                 else
                 {
                     // The core is idle now, make sure that the idle thread can run
                     // and switch the core when a thread is available.
-                    SwitchTo(currentThread, null);
-                    return null;
+                    SwitchTo(null);
+                    return _idleThread;
                 }
 
                 _state.NeedsScheduling = false;
@@ -388,9 +363,12 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
             }
         }
 
-        private void SwitchTo(KThread currentThread, KThread nextThread)
+        private void SwitchTo(KThread nextThread)
         {
-            KProcess currentProcess = currentThread?.Owner;
+            KProcess currentProcess = KernelStatic.GetCurrentProcess();
+            KThread currentThread = KernelStatic.GetCurrentThread();
+
+            nextThread ??= _idleThread;
 
             if (currentThread != nextThread)
             {
@@ -398,14 +376,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
                 long currentTicks = PerformanceCounter.ElapsedTicks;
                 long ticksDelta = currentTicks - previousTicks;
 
-                if (currentThread == null)
-                {
-                    Interlocked.Add(ref _idleTimeRunning, ticksDelta);
-                }
-                else
-                {
-                    currentThread.AddCpuTime(ticksDelta);
-                }
+                currentThread.AddCpuTime(ticksDelta);
 
                 currentProcess?.AddCpuTime(ticksDelta);
 
@@ -415,13 +386,13 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
                 {
                     _previousThread = !currentThread.TerminationRequested && currentThread.ActiveCore == _coreId ? currentThread : null;
                 }
-                else if (currentThread == null)
+                else if (currentThread == _idleThread)
                 {
                     _previousThread = null;
                 }
             }
 
-            if (nextThread != null && nextThread.CurrentCore != _coreId)
+            if (nextThread.CurrentCore != _coreId)
             {
                 nextThread.CurrentCore = _coreId;
             }
@@ -674,7 +645,11 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
 
         public void Dispose()
         {
-            // No resources to dispose for now.
+            // Ensure that the idle thread is not blocked and can exit.
+            lock (_idleInterruptEventLock)
+            {
+                _idleInterruptEvent?.Set();
+            }
         }
     }
 }

src/Ryujinx.HLE/HOS/Kernel/Threading/KThread.cs

@@ -143,7 +143,9 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
             PreferredCore = cpuCore;
             AffinityMask |= 1UL << cpuCore;
 
-            SchedFlags = ThreadSchedState.None;
+            SchedFlags = type == ThreadType.Dummy
+                ? ThreadSchedState.Running
+                : ThreadSchedState.None;
 
             ActiveCore = cpuCore;
             ObjSyncResult = KernelResult.ThreadNotStarted;
@@ -1053,7 +1055,6 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
                     // If the thread is not schedulable, we want to just run or pause
                     // it directly as we don't care about priority or the core it is
                     // running on in this case.
-
                     if (SchedFlags == ThreadSchedState.Running)
                     {
                         _schedulerWaitEvent.Set();

src/Ryujinx.HLE/HOS/Kernel/Threading/ThreadType.cs

@@ -2,6 +2,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
 {
     enum ThreadType
     {
+        Dummy,
         Kernel,
         Kernel2,
         User,

src/Ryujinx.HLE/HOS/Services/Hid/IHidServer.cs

@@ -22,7 +22,6 @@ namespace Ryujinx.HLE.HOS.Services.Hid
 
         private bool _sixAxisSensorFusionEnabled;
         private bool _unintendedHomeButtonInputProtectionEnabled;
-        private bool _npadAnalogStickCenterClampEnabled;
         private bool _vibrationPermitted;
         private bool _usbFullKeyControllerEnabled;
         private readonly bool _isFirmwareUpdateAvailableForSixAxisSensor;
@@ -1108,19 +1107,6 @@ namespace Ryujinx.HLE.HOS.Services.Hid
             //       If not, it returns nothing.
         }
 
-        [CommandCmif(134)] // 6.1.0+
-        // SetNpadUseAnalogStickUseCenterClamp(bool Enable, nn::applet::AppletResourceUserId)
-        public ResultCode SetNpadUseAnalogStickUseCenterClamp(ServiceCtx context)
-        {
-            ulong pid = context.RequestData.ReadUInt64();
-            _npadAnalogStickCenterClampEnabled = context.RequestData.ReadUInt32() != 0;
-            long appletResourceUserId = context.RequestData.ReadInt64();
-
-            Logger.Stub?.PrintStub(LogClass.ServiceHid, new { pid, appletResourceUserId, _npadAnalogStickCenterClampEnabled });
-
-            return ResultCode.Success;
-        }
-
         [CommandCmif(200)]
         // GetVibrationDeviceInfo(nn::hid::VibrationDeviceHandle) -> nn::hid::VibrationDeviceInfo
         public ResultCode GetVibrationDeviceInfo(ServiceCtx context)

src/Ryujinx.Headless.SDL2/Ryujinx.Headless.SDL2.csproj

@@ -48,7 +48,7 @@
     </Content>
   </ItemGroup>
 
-  <ItemGroup Condition="'$(RuntimeIdentifier)' == 'linux-x64' OR '$(RuntimeIdentifier)' == 'linux-arm64' OR ('$(RuntimeIdentifier)' == '' AND $([MSBuild]::IsOSPlatform('Linux')))">
+  <ItemGroup Condition="'$(RuntimeIdentifier)' == 'linux-x64' OR '$(RuntimeIdentifier)' == 'linux-arm64'">
     <Content Include="..\..\distribution\linux\Ryujinx.sh">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

src/Ryujinx.Horizon/Ryujinx.Horizon.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
@@ -16,4 +16,10 @@
     <PackageReference Include="Concentus" />
     <PackageReference Include="LibHac" />
   </ItemGroup>
+
+  <!-- Due to Concentus. -->
+  <PropertyGroup>
+    <NoWarn>NU1605</NoWarn>
+  </PropertyGroup>
+
 </Project>

src/Ryujinx.Horizon/Sdk/Codec/Detail/HardwareOpusDecoder.cs

@@ -14,11 +14,6 @@ namespace Ryujinx.Horizon.Sdk.Codec.Detail
 {
     partial class HardwareOpusDecoder : IHardwareOpusDecoder, IDisposable
     {
-        static HardwareOpusDecoder()
-        {
-            OpusCodecFactory.AttemptToUseNativeLibrary = false;
-        }
-
         [StructLayout(LayoutKind.Sequential)]
         private struct OpusPacketHeader
         {
@@ -35,87 +30,60 @@ namespace Ryujinx.Horizon.Sdk.Codec.Detail
             }
         }
 
-        private interface IDecoder : IDisposable
+        private interface IDecoder
         {
             int SampleRate { get; }
             int ChannelsCount { get; }
 
-            int Decode(ReadOnlySpan<byte> inData, Span<short> outPcm, int frameSize);
+            int Decode(byte[] inData, int inDataOffset, int len, short[] outPcm, int outPcmOffset, int frameSize);
             void ResetState();
         }
 
         private class Decoder : IDecoder
         {
-            private readonly IOpusDecoder _decoder;
+            private readonly OpusDecoder _decoder;
 
             public int SampleRate => _decoder.SampleRate;
             public int ChannelsCount => _decoder.NumChannels;
 
             public Decoder(int sampleRate, int channelsCount)
             {
-                _decoder = OpusCodecFactory.CreateDecoder(sampleRate, channelsCount);
+                _decoder = new OpusDecoder(sampleRate, channelsCount);
             }
 
-            public int Decode(ReadOnlySpan<byte> inData, Span<short> outPcm, int frameSize)
+            public int Decode(byte[] inData, int inDataOffset, int len, short[] outPcm, int outPcmOffset, int frameSize)
             {
-                return _decoder.Decode(inData, outPcm, frameSize);
+                return _decoder.Decode(inData, inDataOffset, len, outPcm, outPcmOffset, frameSize);
             }
 
             public void ResetState()
             {
                 _decoder.ResetState();
             }
-
-            public void Dispose()
-            {
-                Dispose(disposing: true);
-                GC.SuppressFinalize(this);
-            }
-
-            protected virtual void Dispose(bool disposing)
-            {
-                if (disposing)
-                {
-                    _decoder?.Dispose();
-                }
-            }
         }
 
         private class MultiSampleDecoder : IDecoder
         {
-            private readonly IOpusMultiStreamDecoder _decoder;
+            private readonly OpusMSDecoder _decoder;
 
             public int SampleRate => _decoder.SampleRate;
-            public int ChannelsCount => _decoder.NumChannels;
+            public int ChannelsCount { get; }
 
             public MultiSampleDecoder(int sampleRate, int channelsCount, int streams, int coupledStreams, byte[] mapping)
             {
-                _decoder = OpusCodecFactory.CreateMultiStreamDecoder(sampleRate, channelsCount, streams, coupledStreams, mapping);
+                ChannelsCount = channelsCount;
+                _decoder = new OpusMSDecoder(sampleRate, channelsCount, streams, coupledStreams, mapping);
             }
 
-            public int Decode(ReadOnlySpan<byte> inData, Span<short> outPcm, int frameSize)
+            public int Decode(byte[] inData, int inDataOffset, int len, short[] outPcm, int outPcmOffset, int frameSize)
             {
-                return _decoder.DecodeMultistream(inData, outPcm, frameSize, false);
+                return _decoder.DecodeMultistream(inData, inDataOffset, len, outPcm, outPcmOffset, frameSize, 0);
             }
 
             public void ResetState()
             {
                 _decoder.ResetState();
             }
-
-            public void Dispose()
-            {
-                Dispose(disposing: true);
-                GC.SuppressFinalize(this);
-            }
-
-            protected virtual void Dispose(bool disposing)
-            {
-                if (disposing)
-                {
-                    _decoder?.Dispose();
-                }
-            }
         }
 
         private readonly IDecoder _decoder;
@@ -253,8 +221,7 @@ namespace Ryujinx.Horizon.Sdk.Codec.Detail
         {
             timeTaken = 0;
 
-            Span<short> outPcmSpace = MemoryMarshal.Cast<byte, short>(output);
-            Result result = DecodeInterleaved(_decoder, reset, input, outPcmSpace, output.Length, out outConsumed, out outSamples);
+            Result result = DecodeInterleaved(_decoder, reset, input, out short[] outPcmData, output.Length, out outConsumed, out outSamples);
 
             if (withPerf)
             {
@@ -262,12 +229,14 @@ namespace Ryujinx.Horizon.Sdk.Codec.Detail
                 timeTaken = 0;
             }
 
+            MemoryMarshal.Cast<short, byte>(outPcmData).CopyTo(output[..(outPcmData.Length * sizeof(short))]);
+
             return result;
         }
 
-        private static Result GetPacketNumSamples(IDecoder decoder, out int numSamples, ReadOnlySpan<byte> packet)
+        private static Result GetPacketNumSamples(IDecoder decoder, out int numSamples, byte[] packet)
         {
-            int result = OpusPacketInfo.GetNumSamples(packet, decoder.SampleRate);
+            int result = OpusPacketInfo.GetNumSamples(packet, 0, packet.Length, decoder.SampleRate);
 
             numSamples = result;
 
@@ -287,11 +256,12 @@ namespace Ryujinx.Horizon.Sdk.Codec.Detail
             IDecoder decoder,
             bool reset,
             ReadOnlySpan<byte> input,
-            Span<short> outPcmData,
+            out short[] outPcmData,
             int outputSize,
             out int outConsumed,
             out int outSamples)
         {
+            outPcmData = null;
             outConsumed = 0;
             outSamples = 0;
 
@@ -311,7 +281,7 @@ namespace Ryujinx.Horizon.Sdk.Codec.Detail
                 return CodecResult.InvalidLength;
             }
 
-            ReadOnlySpan<byte> opusData = input.Slice(headerSize, (int)header.Length);
+            byte[] opusData = input.Slice(headerSize, (int)header.Length).ToArray();
 
             Result result = GetPacketNumSamples(decoder, out int numSamples, opusData);
 
@@ -322,6 +292,8 @@ namespace Ryujinx.Horizon.Sdk.Codec.Detail
                     return CodecResult.InvalidLength;
                 }
 
+                outPcmData = new short[numSamples * decoder.ChannelsCount];
+
                 if (reset)
                 {
                     decoder.ResetState();
@@ -329,22 +301,13 @@ namespace Ryujinx.Horizon.Sdk.Codec.Detail
 
                 try
                 {
-                    outSamples = decoder.Decode(opusData, outPcmData, numSamples);
+                    outSamples = decoder.Decode(opusData, 0, opusData.Length, outPcmData, 0, outPcmData.Length / decoder.ChannelsCount);
                     outConsumed = (int)totalSize;
                 }
-                catch (OpusException e)
+                catch (OpusException)
                 {
-                    switch (e.OpusErrorCode)
-                    {
-                        case OpusError.OPUS_BUFFER_TOO_SMALL:
-                            return CodecResult.InvalidLength;
-                        case OpusError.OPUS_BAD_ARG:
-                            return CodecResult.OpusBadArg;
-                        case OpusError.OPUS_INVALID_PACKET:
-                            return CodecResult.OpusInvalidPacket;
-                        default:
-                            return CodecResult.InvalidLength;
-                    }
+                    // TODO: As OpusException doesn't return the exact error code, this is inaccurate in some cases...
+                    return CodecResult.InvalidLength;
                 }
             }
 
@@ -361,8 +324,6 @@ namespace Ryujinx.Horizon.Sdk.Codec.Detail
 
                     _workBufferHandle = 0;
                 }
-
-                _decoder?.Dispose();
             }
         }
 

src/Ryujinx.Input/HLE/NpadManager.cs

@@ -174,11 +174,6 @@ namespace Ryujinx.Input.HLE
         {
             lock (_lock)
             {
-                foreach (InputConfig inputConfig in _inputConfig)
-                {
-                    _controllers[(int)inputConfig.PlayerIndex]?.GamepadDriver?.Clear();
-                }
-
                 _blockInputUpdates = false;
             }
         }

src/Ryujinx.Input/IGamepadDriver.cs

@@ -33,11 +33,5 @@ namespace Ryujinx.Input
         /// <param name="id">The unique id of the gamepad</param>
         /// <returns>An instance of <see cref="IGamepad"/> associated to the gamepad id given or null if not found</returns>
         IGamepad GetGamepad(string id);
-
-        /// <summary>
-        /// Clear the internal state of the driver.
-        /// </summary>
-        /// <remarks>Does nothing by default.</remarks>
-        void Clear() { }
     }
 }

src/Ryujinx.Tests/Audio/Renderer/Server/BehaviourContextTests.cs

@@ -52,9 +52,7 @@ namespace Ryujinx.Tests.Audio.Renderer.Server
             Assert.IsFalse(behaviourContext.IsMixInParameterDirtyOnlyUpdateSupported());
             Assert.IsFalse(behaviourContext.IsWaveBufferVersion2Supported());
             Assert.IsFalse(behaviourContext.IsEffectInfoVersion2Supported());
-            Assert.IsFalse(behaviourContext.UseMultiTapBiquadFilterProcessing());
-            Assert.IsFalse(behaviourContext.IsNewEffectChannelMappingSupported());
-            Assert.IsFalse(behaviourContext.IsBiquadFilterParameterForSplitterEnabled());
+            Assert.IsFalse(behaviourContext.IsBiquadFilterGroupedOptimizationSupported());
 
             Assert.AreEqual(0.70f, behaviourContext.GetAudioRendererProcessingTimeLimit());
             Assert.AreEqual(1, behaviourContext.GetCommandProcessingTimeEstimatorVersion());
@@ -80,9 +78,7 @@ namespace Ryujinx.Tests.Audio.Renderer.Server
             Assert.IsFalse(behaviourContext.IsMixInParameterDirtyOnlyUpdateSupported());
             Assert.IsFalse(behaviourContext.IsWaveBufferVersion2Supported());
             Assert.IsFalse(behaviourContext.IsEffectInfoVersion2Supported());
-            Assert.IsFalse(behaviourContext.UseMultiTapBiquadFilterProcessing());
-            Assert.IsFalse(behaviourContext.IsNewEffectChannelMappingSupported());
-            Assert.IsFalse(behaviourContext.IsBiquadFilterParameterForSplitterEnabled());
+            Assert.IsFalse(behaviourContext.IsBiquadFilterGroupedOptimizationSupported());
 
             Assert.AreEqual(0.70f, behaviourContext.GetAudioRendererProcessingTimeLimit());
             Assert.AreEqual(1, behaviourContext.GetCommandProcessingTimeEstimatorVersion());
@@ -108,9 +104,7 @@ namespace Ryujinx.Tests.Audio.Renderer.Server
             Assert.IsFalse(behaviourContext.IsMixInParameterDirtyOnlyUpdateSupported());
             Assert.IsFalse(behaviourContext.IsWaveBufferVersion2Supported());
             Assert.IsFalse(behaviourContext.IsEffectInfoVersion2Supported());
-            Assert.IsFalse(behaviourContext.UseMultiTapBiquadFilterProcessing());
-            Assert.IsFalse(behaviourContext.IsNewEffectChannelMappingSupported());
-            Assert.IsFalse(behaviourContext.IsBiquadFilterParameterForSplitterEnabled());
+            Assert.IsFalse(behaviourContext.IsBiquadFilterGroupedOptimizationSupported());
 
             Assert.AreEqual(0.70f, behaviourContext.GetAudioRendererProcessingTimeLimit());
             Assert.AreEqual(1, behaviourContext.GetCommandProcessingTimeEstimatorVersion());
@@ -136,9 +130,7 @@ namespace Ryujinx.Tests.Audio.Renderer.Server
             Assert.IsFalse(behaviourContext.IsMixInParameterDirtyOnlyUpdateSupported());
             Assert.IsFalse(behaviourContext.IsWaveBufferVersion2Supported());
             Assert.IsFalse(behaviourContext.IsEffectInfoVersion2Supported());
-            Assert.IsFalse(behaviourContext.UseMultiTapBiquadFilterProcessing());
-            Assert.IsFalse(behaviourContext.IsNewEffectChannelMappingSupported());
-            Assert.IsFalse(behaviourContext.IsBiquadFilterParameterForSplitterEnabled());
+            Assert.IsFalse(behaviourContext.IsBiquadFilterGroupedOptimizationSupported());
 
             Assert.AreEqual(0.75f, behaviourContext.GetAudioRendererProcessingTimeLimit());
             Assert.AreEqual(1, behaviourContext.GetCommandProcessingTimeEstimatorVersion());
@@ -164,9 +156,7 @@ namespace Ryujinx.Tests.Audio.Renderer.Server
             Assert.IsFalse(behaviourContext.IsMixInParameterDirtyOnlyUpdateSupported());
             Assert.IsFalse(behaviourContext.IsWaveBufferVersion2Supported());
             Assert.IsFalse(behaviourContext.IsEffectInfoVersion2Supported());
-            Assert.IsFalse(behaviourContext.UseMultiTapBiquadFilterProcessing());
-            Assert.IsFalse(behaviourContext.IsNewEffectChannelMappingSupported());
-            Assert.IsFalse(behaviourContext.IsBiquadFilterParameterForSplitterEnabled());
+            Assert.IsFalse(behaviourContext.IsBiquadFilterGroupedOptimizationSupported());
 
             Assert.AreEqual(0.80f, behaviourContext.GetAudioRendererProcessingTimeLimit());
             Assert.AreEqual(2, behaviourContext.GetCommandProcessingTimeEstimatorVersion());
@@ -192,9 +182,7 @@ namespace Ryujinx.Tests.Audio.Renderer.Server
             Assert.IsFalse(behaviourContext.IsMixInParameterDirtyOnlyUpdateSupported());
             Assert.IsFalse(behaviourContext.IsWaveBufferVersion2Supported());
             Assert.IsFalse(behaviourContext.IsEffectInfoVersion2Supported());
-            Assert.IsFalse(behaviourContext.UseMultiTapBiquadFilterProcessing());
-            Assert.IsFalse(behaviourContext.IsNewEffectChannelMappingSupported());
-            Assert.IsFalse(behaviourContext.IsBiquadFilterParameterForSplitterEnabled());
+            Assert.IsFalse(behaviourContext.IsBiquadFilterGroupedOptimizationSupported());
 
             Assert.AreEqual(0.80f, behaviourContext.GetAudioRendererProcessingTimeLimit());
             Assert.AreEqual(2, behaviourContext.GetCommandProcessingTimeEstimatorVersion());
@@ -220,9 +208,7 @@ namespace Ryujinx.Tests.Audio.Renderer.Server
             Assert.IsTrue(behaviourContext.IsMixInParameterDirtyOnlyUpdateSupported());
             Assert.IsFalse(behaviourContext.IsWaveBufferVersion2Supported());
             Assert.IsFalse(behaviourContext.IsEffectInfoVersion2Supported());
-            Assert.IsFalse(behaviourContext.UseMultiTapBiquadFilterProcessing());
-            Assert.IsFalse(behaviourContext.IsNewEffectChannelMappingSupported());
-            Assert.IsFalse(behaviourContext.IsBiquadFilterParameterForSplitterEnabled());
+            Assert.IsFalse(behaviourContext.IsBiquadFilterGroupedOptimizationSupported());
 
             Assert.AreEqual(0.80f, behaviourContext.GetAudioRendererProcessingTimeLimit());
             Assert.AreEqual(2, behaviourContext.GetCommandProcessingTimeEstimatorVersion());
@@ -248,9 +234,7 @@ namespace Ryujinx.Tests.Audio.Renderer.Server
             Assert.IsTrue(behaviourContext.IsMixInParameterDirtyOnlyUpdateSupported());
             Assert.IsTrue(behaviourContext.IsWaveBufferVersion2Supported());
             Assert.IsFalse(behaviourContext.IsEffectInfoVersion2Supported());
-            Assert.IsFalse(behaviourContext.UseMultiTapBiquadFilterProcessing());
-            Assert.IsFalse(behaviourContext.IsNewEffectChannelMappingSupported());
-            Assert.IsFalse(behaviourContext.IsBiquadFilterParameterForSplitterEnabled());
+            Assert.IsFalse(behaviourContext.IsBiquadFilterGroupedOptimizationSupported());
 
             Assert.AreEqual(0.80f, behaviourContext.GetAudioRendererProcessingTimeLimit());
             Assert.AreEqual(3, behaviourContext.GetCommandProcessingTimeEstimatorVersion());
@@ -276,9 +260,7 @@ namespace Ryujinx.Tests.Audio.Renderer.Server
             Assert.IsTrue(behaviourContext.IsMixInParameterDirtyOnlyUpdateSupported());
             Assert.IsTrue(behaviourContext.IsWaveBufferVersion2Supported());
             Assert.IsTrue(behaviourContext.IsEffectInfoVersion2Supported());
-            Assert.IsFalse(behaviourContext.UseMultiTapBiquadFilterProcessing());
-            Assert.IsFalse(behaviourContext.IsNewEffectChannelMappingSupported());
-            Assert.IsFalse(behaviourContext.IsBiquadFilterParameterForSplitterEnabled());
+            Assert.IsFalse(behaviourContext.IsBiquadFilterGroupedOptimizationSupported());
 
             Assert.AreEqual(0.80f, behaviourContext.GetAudioRendererProcessingTimeLimit());
             Assert.AreEqual(3, behaviourContext.GetCommandProcessingTimeEstimatorVersion());
@@ -304,69 +286,11 @@ namespace Ryujinx.Tests.Audio.Renderer.Server
             Assert.IsTrue(behaviourContext.IsMixInParameterDirtyOnlyUpdateSupported());
             Assert.IsTrue(behaviourContext.IsWaveBufferVersion2Supported());
             Assert.IsTrue(behaviourContext.IsEffectInfoVersion2Supported());
-            Assert.IsTrue(behaviourContext.UseMultiTapBiquadFilterProcessing());
-            Assert.IsFalse(behaviourContext.IsNewEffectChannelMappingSupported());
-            Assert.IsFalse(behaviourContext.IsBiquadFilterParameterForSplitterEnabled());
+            Assert.IsTrue(behaviourContext.IsBiquadFilterGroupedOptimizationSupported());
 
             Assert.AreEqual(0.80f, behaviourContext.GetAudioRendererProcessingTimeLimit());
             Assert.AreEqual(4, behaviourContext.GetCommandProcessingTimeEstimatorVersion());
             Assert.AreEqual(2, behaviourContext.GetPerformanceMetricsDataFormat());
         }
-
-        [Test]
-        public void TestRevision11()
-        {
-            BehaviourContext behaviourContext = new();
-
-            behaviourContext.SetUserRevision(BehaviourContext.BaseRevisionMagic + BehaviourContext.Revision11);
-
-            Assert.IsTrue(behaviourContext.IsAdpcmLoopContextBugFixed());
-            Assert.IsTrue(behaviourContext.IsSplitterSupported());
-            Assert.IsTrue(behaviourContext.IsLongSizePreDelaySupported());
-            Assert.IsTrue(behaviourContext.IsAudioUsbDeviceOutputSupported());
-            Assert.IsTrue(behaviourContext.IsFlushVoiceWaveBuffersSupported());
-            Assert.IsTrue(behaviourContext.IsSplitterBugFixed());
-            Assert.IsTrue(behaviourContext.IsElapsedFrameCountSupported());
-            Assert.IsTrue(behaviourContext.IsDecodingBehaviourFlagSupported());
-            Assert.IsTrue(behaviourContext.IsBiquadFilterEffectStateClearBugFixed());
-            Assert.IsTrue(behaviourContext.IsMixInParameterDirtyOnlyUpdateSupported());
-            Assert.IsTrue(behaviourContext.IsWaveBufferVersion2Supported());
-            Assert.IsTrue(behaviourContext.IsEffectInfoVersion2Supported());
-            Assert.IsTrue(behaviourContext.UseMultiTapBiquadFilterProcessing());
-            Assert.IsTrue(behaviourContext.IsNewEffectChannelMappingSupported());
-            Assert.IsFalse(behaviourContext.IsBiquadFilterParameterForSplitterEnabled());
-
-            Assert.AreEqual(0.80f, behaviourContext.GetAudioRendererProcessingTimeLimit());
-            Assert.AreEqual(5, behaviourContext.GetCommandProcessingTimeEstimatorVersion());
-            Assert.AreEqual(2, behaviourContext.GetPerformanceMetricsDataFormat());
-        }
-
-        [Test]
-        public void TestRevision12()
-        {
-            BehaviourContext behaviourContext = new();
-
-            behaviourContext.SetUserRevision(BehaviourContext.BaseRevisionMagic + BehaviourContext.Revision12);
-
-            Assert.IsTrue(behaviourContext.IsAdpcmLoopContextBugFixed());
-            Assert.IsTrue(behaviourContext.IsSplitterSupported());
-            Assert.IsTrue(behaviourContext.IsLongSizePreDelaySupported());
-            Assert.IsTrue(behaviourContext.IsAudioUsbDeviceOutputSupported());
-            Assert.IsTrue(behaviourContext.IsFlushVoiceWaveBuffersSupported());
-            Assert.IsTrue(behaviourContext.IsSplitterBugFixed());
-            Assert.IsTrue(behaviourContext.IsElapsedFrameCountSupported());
-            Assert.IsTrue(behaviourContext.IsDecodingBehaviourFlagSupported());
-            Assert.IsTrue(behaviourContext.IsBiquadFilterEffectStateClearBugFixed());
-            Assert.IsTrue(behaviourContext.IsMixInParameterDirtyOnlyUpdateSupported());
-            Assert.IsTrue(behaviourContext.IsWaveBufferVersion2Supported());
-            Assert.IsTrue(behaviourContext.IsEffectInfoVersion2Supported());
-            Assert.IsTrue(behaviourContext.UseMultiTapBiquadFilterProcessing());
-            Assert.IsTrue(behaviourContext.IsNewEffectChannelMappingSupported());
-            Assert.IsTrue(behaviourContext.IsBiquadFilterParameterForSplitterEnabled());
-
-            Assert.AreEqual(0.80f, behaviourContext.GetAudioRendererProcessingTimeLimit());
-            Assert.AreEqual(5, behaviourContext.GetCommandProcessingTimeEstimatorVersion());
-            Assert.AreEqual(2, behaviourContext.GetPerformanceMetricsDataFormat());
-        }
     }
 }

src/Ryujinx.Tests/Audio/Renderer/Server/SplitterDestinationTests.cs

@@ -9,8 +9,7 @@ namespace Ryujinx.Tests.Audio.Renderer.Server
         [Test]
         public void EnsureTypeSize()
         {
-            Assert.AreEqual(0xE0, Unsafe.SizeOf<SplitterDestinationVersion1>());
-            Assert.AreEqual(0x110, Unsafe.SizeOf<SplitterDestinationVersion2>());
+            Assert.AreEqual(0xE0, Unsafe.SizeOf<SplitterDestination>());
         }
     }
 }

src/Ryujinx.UI.Common/App/ApplicationData.cs

@@ -45,7 +45,7 @@ namespace Ryujinx.UI.App.Common
 
             if (!System.IO.Path.Exists(titleFilePath))
             {
-                Logger.Error?.Print(LogClass.Application, $"File \"{titleFilePath}\" does not exist.");
+                Logger.Error?.Print(LogClass.Application, $"File does not exists. {titleFilePath}");
                 return string.Empty;
             }