From 2c39a4f15d44156779c6c926d8feda26a4a24605 Mon Sep 17 00:00:00 2001
From: riperiperi <rhy3756547@hotmail.com>
Date: Thu, 3 Dec 2020 18:34:32 +0000
Subject: Cache delegate for QueryModified, use regular multi handle. (#1771)

---
 Ryujinx.Graphics.Gpu/Memory/Buffer.cs | 50 +++++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 20 deletions(-)

(limited to 'Ryujinx.Graphics.Gpu/Memory')

diff --git a/Ryujinx.Graphics.Gpu/Memory/Buffer.cs b/Ryujinx.Graphics.Gpu/Memory/Buffer.cs
index 3cc96432..bf245283 100644
--- a/Ryujinx.Graphics.Gpu/Memory/Buffer.cs
+++ b/Ryujinx.Graphics.Gpu/Memory/Buffer.cs
@@ -34,8 +34,9 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// </summary>
         public ulong EndAddress => Address + Size;
 
-        private CpuSmartMultiRegionHandle _memoryTrackingGranular;
+        private CpuMultiRegionHandle _memoryTrackingGranular;
         private CpuRegionHandle _memoryTracking;
+        private readonly Action<ulong, ulong> _modifiedDelegate;
         private int _sequenceNumber;
 
         private bool _useGranular;
@@ -58,12 +59,14 @@ namespace Ryujinx.Graphics.Gpu.Memory
 
             if (_useGranular)
             {
-                _memoryTrackingGranular = context.PhysicalMemory.BeginSmartGranularTracking(address, size);
+                _memoryTrackingGranular = context.PhysicalMemory.BeginGranularTracking(address, size);
             }
             else
             {
                 _memoryTracking = context.PhysicalMemory.BeginTracking(address, size);
             }
+
+            _modifiedDelegate = new Action<ulong, ulong>(RegionModified);
         }
 
         /// <summary>
@@ -106,24 +109,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
         {
             if (_useGranular)
             {
-                _memoryTrackingGranular.QueryModified(address, size, (ulong mAddress, ulong mSize) =>
-                {
-                    if (mAddress < Address)
-                    {
-                        mAddress = Address;
-                    }
-
-                    ulong maxSize = Address + Size - mAddress;
-
-                    if (mSize > maxSize)
-                    {
-                        mSize = maxSize;
-                    }
-
-                    int offset = (int)(mAddress - Address);
-
-                    _context.Renderer.SetBufferData(Handle, offset, _context.PhysicalMemory.GetSpan(mAddress, (int)mSize));
-                }, _context.SequenceNumber);
+                _memoryTrackingGranular.QueryModified(address, size, _modifiedDelegate, _context.SequenceNumber);
             }
             else
             {
@@ -136,6 +122,30 @@ namespace Ryujinx.Graphics.Gpu.Memory
             }
         }
 
+        /// <summary>
+        /// Indicate that a region of the buffer was modified, and must be loaded from memory.
+        /// </summary>
+        /// <param name="mAddress">Start address of the modified region</param>
+        /// <param name="mSize">Size of the modified region</param>
+        private void RegionModified(ulong mAddress, ulong mSize)
+        {
+            if (mAddress < Address)
+            {
+                mAddress = Address;
+            }
+
+            ulong maxSize = Address + Size - mAddress;
+
+            if (mSize > maxSize)
+            {
+                mSize = maxSize;
+            }
+
+            int offset = (int)(mAddress - Address);
+
+            _context.Renderer.SetBufferData(Handle, offset, _context.PhysicalMemory.GetSpan(mAddress, (int)mSize));
+        }
+
         /// <summary>
         /// Performs copy of all the buffer data from one buffer to another.
         /// </summary>
-- 
cgit v1.2.3