Merge pull request #2713 from riperiperi/fix/modified-inherit

Reregister flush actions when taking a buffer's modified range list.

1 files changed, 15 insertions, 11 deletions

diff --git a/Ryujinx.Graphics.Gpu/Memory/Buffer.cs b/Ryujinx.Graphics.Gpu/Memory/Buffer.cs
index 0eaf0123..81f70684 100644
--- a/Ryujinx.Graphics.Gpu/Memory/Buffer.cs
+++ b/Ryujinx.Graphics.Gpu/Memory/Buffer.cs
@@ -299,24 +299,28 @@ namespace Ryujinx.Graphics.Gpu.Memory
                     _syncActionRegistered = true;
                 }
 
+                Action<ulong, ulong> registerRangeAction = (ulong address, ulong size) =>
+                {
+                    if (_useGranular)
+                    {
+                        _memoryTrackingGranular.RegisterAction(address, size, _externalFlushDelegate);
+                    }
+                    else
+                    {
+                        _memoryTracking.RegisterAction(_externalFlushDelegate);
+                    }
+                };
+
                 if (_modifiedRanges == null)
                 {
                     _modifiedRanges = from._modifiedRanges;
+                    _modifiedRanges.ReregisterRanges(registerRangeAction);
+
                     from._modifiedRanges = null;
                 }
                 else
                 {
-                    _modifiedRanges.InheritRanges(from._modifiedRanges, (ulong address, ulong size) =>
-                    {
-                        if (_useGranular)
-                        {
-                            _memoryTrackingGranular.RegisterAction(address, size, _externalFlushDelegate);
-                        }
-                        else
-                        {
-                            _memoryTracking.RegisterAction(_externalFlushDelegate);
-                        }
-                    });
+                    _modifiedRanges.InheritRanges(from._modifiedRanges, registerRangeAction);
                 }
             }
         }