piwalker/Ryujinx
1
0
Fork 0
mirror of https://github.com/Ryujinx-NX/Ryujinx.git synced 2024-11-14 21:17:43 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Force copy when auto-deleting a texture with dependencies (#2687)

Browse Source 
When a texture is deleted by falling to the bottom of the AutoDeleteCache, its data is flushed to preserve any GPU writes that occurred. This ensures that the data appears in any textures recreated in the future, but didn't account for a texture that already existed with a copy dependency.

This change forces copy dependencies to complete if a texture falls out from from the AutoDeleteCache. (not removed via overlap, as that would be wasted effort)

Fixes broken lighting caused by pausing in SMO's Metro Kingdom. May fix some other issues.
This commit is contained in:
riperiperi 2021-09-29 01:11:05 +01:00 committed by GitHub
parent fd7567a6b5
commit b6e093b0fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Ryujinx.Graphics.Gpu/Image/AutoDeleteCache.cs
View File

@ -41,14 +41,14 @@ namespace Ryujinx.Graphics.Gpu.Image
{
Texture oldestTexture = _textures.First.Value;
oldestTexture.SynchronizeMemory();
if (oldestTexture.IsModified && !oldestTexture.CheckModified(true))
if (oldestTexture.IsModified && !oldestTexture.CheckModified(false))
{
// The texture must be flushed if it falls out of the auto delete cache.
// Flushes out of the auto delete cache do not trigger write tracking,
// as it is expected that other overlapping textures exist that have more up-to-date contents.
oldestTexture.Flush(false);
oldestTexture.Group.SynchronizeDependents(oldestTexture);
oldestTexture.Flush(false);
}
_textures.RemoveFirst();

17
Ryujinx.Graphics.Gpu/Image/TextureGroup.cs
View File

@ -234,6 +234,23 @@ namespace Ryujinx.Graphics.Gpu.Image
}
}
/// <summary>
/// Synchronize dependent textures, if any of them have deferred a copy from the given texture.
/// </summary>
/// <param name="texture">The texture to synchronize dependents of</param>
public void SynchronizeDependents(Texture texture)
{
EvaluateRelevantHandles(texture, (baseHandle, regionCount, split) =>
{
for (int i = 0; i < regionCount; i++)
{
TextureGroupHandle group = _handles[baseHandle + i];
group.SynchronizeDependents();
}
});
}
/// <summary>
/// Signal that a texture in the group has been modified by the GPU.
/// </summary>

16
Ryujinx.Graphics.Gpu/Image/TextureGroupHandle.cs
View File

@ -140,6 +140,22 @@ namespace Ryujinx.Graphics.Gpu.Image
_bindCount = Math.Max(0, _bindCount + (bound ? 1 : -1));
}
/// <summary>
/// Synchronize dependent textures, if any of them have deferred a copy from this texture.
/// </summary>
public void SynchronizeDependents()
{
foreach (TextureDependency dependency in Dependencies)
{
TextureGroupHandle otherHandle = dependency.Other.Handle;
if (otherHandle.DeferredCopy == this)
{
otherHandle._group.Storage.SynchronizeMemory();
}
}
}
/// <summary>
/// Signal that a copy dependent texture has been modified, and must have its data copied to this one.
/// </summary>