aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Ryujinx.Graphics.Gpu/Image/TextureGroup.cs6
-rw-r--r--Ryujinx.Graphics.Gpu/Image/TextureGroupHandle.cs35
-rw-r--r--Ryujinx.Memory/Tracking/RegionHandle.cs7
3 files changed, 34 insertions, 14 deletions
diff --git a/Ryujinx.Graphics.Gpu/Image/TextureGroup.cs b/Ryujinx.Graphics.Gpu/Image/TextureGroup.cs
index be0abea2..4bdc5078 100644
--- a/Ryujinx.Graphics.Gpu/Image/TextureGroup.cs
+++ b/Ryujinx.Graphics.Gpu/Image/TextureGroup.cs
@@ -1393,6 +1393,12 @@ namespace Ryujinx.Graphics.Gpu.Image
/// <param name="size">The size of the flushing memory access</param>
public void FlushAction(TextureGroupHandle handle, ulong address, ulong size)
{
+ // There is a small gap here where the action is removed but _actionRegistered is still 1.
+ // In this case it will skip registering the action, but here we are already handling it,
+ // so there shouldn't be any issue as it's the same handler for all actions.
+
+ handle.ClearActionRegistered();
+
if (!handle.Modified)
{
return;
diff --git a/Ryujinx.Graphics.Gpu/Image/TextureGroupHandle.cs b/Ryujinx.Graphics.Gpu/Image/TextureGroupHandle.cs
index 7d4aec41..34b59cff 100644
--- a/Ryujinx.Graphics.Gpu/Image/TextureGroupHandle.cs
+++ b/Ryujinx.Graphics.Gpu/Image/TextureGroupHandle.cs
@@ -2,6 +2,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Threading;
namespace Ryujinx.Graphics.Gpu.Image
{
@@ -32,9 +33,9 @@ namespace Ryujinx.Graphics.Gpu.Image
private ulong _modifiedSync;
/// <summary>
- /// Whether a tracking action is currently registered or not.
+ /// Whether a tracking action is currently registered or not. (0/1)
/// </summary>
- private bool _actionRegistered;
+ private int _actionRegistered;
/// <summary>
/// Whether a sync action is currently registered or not.
@@ -171,11 +172,9 @@ namespace Ryujinx.Graphics.Gpu.Image
_syncActionRegistered = true;
}
- if (!_actionRegistered)
+ if (Interlocked.Exchange(ref _actionRegistered, 1) == 0)
{
_group.RegisterAction(this);
-
- _actionRegistered = true;
}
}
@@ -233,8 +232,6 @@ namespace Ryujinx.Graphics.Gpu.Image
/// <param name="context">The GPU context used to wait for sync</param>
public void Sync(GpuContext context)
{
- _actionRegistered = false;
-
bool needsSync = !context.IsGpuThread();
if (needsSync)
@@ -264,20 +261,38 @@ namespace Ryujinx.Graphics.Gpu.Image
}
/// <summary>
+ /// Clears the action registered variable, indicating that the tracking action should be
+ /// re-registered on the next modification.
+ /// </summary>
+ public void ClearActionRegistered()
+ {
+ Interlocked.Exchange(ref _actionRegistered, 0);
+ }
+
+ /// <summary>
/// Action to perform when a sync number is registered after modification.
/// This action will register a read tracking action on the memory tracking handle so that a flush from CPU can happen.
/// </summary>
private void SyncAction()
{
+ // The storage will need to signal modified again to update the sync number in future.
+ _group.Storage.SignalModifiedDirty();
+
+ lock (Overlaps)
+ {
+ foreach (Texture texture in Overlaps)
+ {
+ texture.SignalModifiedDirty();
+ }
+ }
+
// Register region tracking for CPU? (again)
_registeredSync = _modifiedSync;
_syncActionRegistered = false;
- if (!_actionRegistered)
+ if (Interlocked.Exchange(ref _actionRegistered, 1) == 0)
{
_group.RegisterAction(this);
-
- _actionRegistered = true;
}
}
diff --git a/Ryujinx.Memory/Tracking/RegionHandle.cs b/Ryujinx.Memory/Tracking/RegionHandle.cs
index 5ecd53a2..b30dcbc2 100644
--- a/Ryujinx.Memory/Tracking/RegionHandle.cs
+++ b/Ryujinx.Memory/Tracking/RegionHandle.cs
@@ -144,9 +144,9 @@ namespace Ryujinx.Memory.Tracking
{
lock (_preActionLock)
{
- _preAction?.Invoke(address, size);
+ RegionSignal action = Interlocked.Exchange(ref _preAction, null);
- _preAction = null;
+ action?.Invoke(address, size);
}
}
finally
@@ -252,8 +252,7 @@ namespace Ryujinx.Memory.Tracking
lock (_preActionLock)
{
- RegionSignal lastAction = _preAction;
- _preAction = action;
+ RegionSignal lastAction = Interlocked.Exchange(ref _preAction, action);
if (lastAction == null && action != lastAction)
{