From a4956591ec485e9b23ded32a853f2a63af92b769 Mon Sep 17 00:00:00 2001
From: riperiperi <rhy3756547@hotmail.com>
Date: Thu, 7 Oct 2021 01:13:51 +0100
Subject: [PATCH] Avoid potential race
---
.../Memory/BufferModifiedRangeList.cs | 22 +++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/Ryujinx.Graphics.Gpu/Memory/BufferModifiedRangeList.cs b/Ryujinx.Graphics.Gpu/Memory/BufferModifiedRangeList.cs
index faaccf13cf..b9b533fb73 100644
--- a/Ryujinx.Graphics.Gpu/Memory/BufferModifiedRangeList.cs
+++ b/Ryujinx.Graphics.Gpu/Memory/BufferModifiedRangeList.cs
@@ -324,9 +324,27 @@ namespace Ryujinx.Graphics.Gpu.Memory
/// <param name="rangeAction">The action to call for each modified range</param>
public void ReregisterRanges(Action<ulong, ulong> rangeAction)
{
- ulong currentSync = _context.SyncNumber;
- foreach (BufferModifiedRange range in this)
+ ref var ranges = ref ThreadStaticArray<BufferModifiedRange>.Get();
+
+ // Range list must be consistent for this operation.
+ lock (_lock)
{
+ if (ranges.Length < Count)
+ {
+ Array.Resize(ref ranges, Count);
+ }
+
+ int i = 0;
+ foreach (BufferModifiedRange range in this)
+ {
+ ranges[i++] = range;
+ }
+ }
+
+ ulong currentSync = _context.SyncNumber;
+ for (int i = 0; i < Count; i++)
+ {
+ BufferModifiedRange range = ranges[i];
if (range.SyncNumber != currentSync)
{
rangeAction(range.Address, range.Size);