Only enumarate cached textures that are modified when flushing, rather than all of them.

This commit is contained in:
riperiperi 2020-02-02 16:46:01 +00:00
commit 0914001177
4 changed files with 45 additions and 15 deletions

View file

@ -94,7 +94,7 @@ namespace Ryujinx.Graphics.Gpu.Engine
srcTexture.HostTexture.CopyTo(dstTexture.HostTexture, srcRegion, dstRegion, linearFilter); srcTexture.HostTexture.CopyTo(dstTexture.HostTexture, srcRegion, dstRegion, linearFilter);
} }
dstTexture.Modified = true; dstTexture.SignalModified();
} }
} }
} }

View file

@ -286,7 +286,7 @@ namespace Ryujinx.Graphics.Gpu.Engine
if (color != null) if (color != null)
{ {
color.Modified = true; color.SignalModified();
} }
} }
@ -306,7 +306,7 @@ namespace Ryujinx.Graphics.Gpu.Engine
if (depthStencil != null) if (depthStencil != null)
{ {
depthStencil.Modified = true; depthStencil.SignalModified();
} }
} }

View file

@ -54,9 +54,9 @@ namespace Ryujinx.Graphics.Gpu.Image
public LinkedListNode<Texture> CacheNode { get; set; } public LinkedListNode<Texture> CacheNode { get; set; }
/// <summary> /// <summary>
/// Texture data modified by the GPU. /// Event to fire when texture data modified by the GPU.
/// </summary> /// </summary>
public bool Modified { get; set; } public event Action<Texture> Modified;
/// <summary> /// <summary>
/// Start address of the texture in guest memory. /// Start address of the texture in guest memory.
@ -933,6 +933,14 @@ namespace Ryujinx.Graphics.Gpu.Image
_layers = info.GetLayers(); _layers = info.GetLayers();
} }
/// <summary>
/// Signals that the texture has been modified.
/// </summary>
public void SignalModified()
{
Modified?.Invoke(this);
}
/// <summary> /// <summary>
/// Replaces the host texture, while disposing of the old one if needed. /// Replaces the host texture, while disposing of the old one if needed.
/// </summary> /// </summary>

View file

@ -5,6 +5,7 @@ using Ryujinx.Graphics.Gpu.Memory;
using Ryujinx.Graphics.Gpu.State; using Ryujinx.Graphics.Gpu.State;
using Ryujinx.Graphics.Texture; using Ryujinx.Graphics.Texture;
using System; using System;
using System.Collections.Generic;
namespace Ryujinx.Graphics.Gpu.Image namespace Ryujinx.Graphics.Gpu.Image
{ {
@ -35,6 +36,8 @@ namespace Ryujinx.Graphics.Gpu.Image
private readonly AutoDeleteCache _cache; private readonly AutoDeleteCache _cache;
private readonly HashSet<Texture> _modified;
/// <summary> /// <summary>
/// Constructs a new instance of the texture manager. /// Constructs a new instance of the texture manager.
/// </summary> /// </summary>
@ -57,6 +60,8 @@ namespace Ryujinx.Graphics.Gpu.Image
_textureOverlaps = new Texture[OverlapsBufferInitialCapacity]; _textureOverlaps = new Texture[OverlapsBufferInitialCapacity];
_cache = new AutoDeleteCache(); _cache = new AutoDeleteCache();
_modified = new HashSet<Texture>();
} }
/// <summary> /// <summary>
@ -579,6 +584,7 @@ namespace Ryujinx.Graphics.Gpu.Image
if (!isSamplerTexture) if (!isSamplerTexture)
{ {
_cache.Add(texture); _cache.Add(texture);
texture.Modified += CacheTextureModified;
} }
_textures.Add(texture); _textures.Add(texture);
@ -588,6 +594,18 @@ namespace Ryujinx.Graphics.Gpu.Image
return texture; return texture;
} }
/// <summary>
/// Signaled when a cache texture is modified, and adds it to a set to be enumerated when flushing textures.
/// </summary>
/// <param name="texture">The texture that was modified.</param>
private void CacheTextureModified(Texture texture)
{
lock (_modified)
{
_modified.Add(texture);
}
}
/// <summary> /// <summary>
/// Resizes the temporary buffer used for range list intersection results, if it has grown too much. /// Resizes the temporary buffer used for range list intersection results, if it has grown too much.
/// </summary> /// </summary>
@ -722,14 +740,16 @@ namespace Ryujinx.Graphics.Gpu.Image
/// </summary> /// </summary>
public void Flush() public void Flush()
{ {
foreach (Texture texture in _cache) lock (_modified)
{ {
if (texture.Info.IsLinear && texture.Modified) foreach (Texture texture in _modified)
{ {
texture.Flush(); if (texture.Info.IsLinear)
{
texture.Modified = false; texture.Flush();
}
} }
_modified.Clear();
} }
} }
@ -740,14 +760,16 @@ namespace Ryujinx.Graphics.Gpu.Image
/// <param name="size">The range size</param> /// <param name="size">The range size</param>
public void Flush(ulong address, ulong size) public void Flush(ulong address, ulong size)
{ {
foreach (Texture texture in _cache) lock (_modified)
{ {
if (texture.OverlapsWith(address, size) && texture.Modified) foreach (Texture texture in _modified)
{ {
texture.Flush(); if (texture.OverlapsWith(address, size))
{
texture.Modified = false; texture.Flush();
}
} }
_modified.Clear();
} }
} }