ryujinx/Ryujinx
1
0
Fork 0
mirror of https://github.com/Ryujinx/Ryujinx.git synced 2024-07-08 19:43:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Lift textures in the AutoDeleteCache for all modifications. (#2615)

Browse source 
* Lift textures in the AutoDeleteCache for all modifications.

Before, this would only apply to render targets and texture blit. Now it applies to image stores, the fast dma copy path and any other type of modification.

Image store always at least has one reference in the texture pool, so the function of the AutoDeleteCache keeping textures _alive_ is not useful, but a very important function for a while has been its use to flush textures in order of modification when they are dereferenced, so that their data is not lost.

Before, textures populated using image stores were being dereferenced and reloaded as garbage. Now, when these textures are dereferenced, their data will be put back into memory, and everything stays intact.

Fixes lighting breaking when switching levels in THPS1+2, and potentially some more UE4 games. I've tested a bunch more games for regressions and performance impact, but they all seem fine.

* Lift copy srcTexture so that it doesn't remain referenceless

* Perform lift before reference count change on unbind.

It's important to lift on unbind as that is the moment the texture was truly last modified, but definitely not after releasing every single reference.
This commit is contained in:
riperiperi 2021-09-11 20:52:54 +01:00 committed by GitHub
parent 197f587802
commit b0e410a828
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Ryujinx.Graphics.Gpu/Engine/Twod/TwodClass.cs
View file

@ -127,6 +127,8 @@ namespace Ryujinx.Graphics.Gpu.Engine.Twod
return;
}
memoryManager.Physical.TextureCache.Lift(srcTexture);
// When the source texture that was found has a depth format,
// we must enforce the target texture also has a depth format,
// as copies between depth and color formats are not allowed.

4
Ryujinx.Graphics.Gpu/Image/Texture.cs
View file

@ -1235,6 +1235,8 @@ namespace Ryujinx.Graphics.Gpu.Image
IsModified = true;
Group.SignalModified(this, !wasModified);
}
_physicalMemory.TextureCache.Lift(this);
}
/// <summary>
@ -1252,6 +1254,8 @@ namespace Ryujinx.Graphics.Gpu.Image
Group.SignalModifying(this, bound, !wasModified);
}
_physicalMemory.TextureCache.Lift(this);
if (bound)
{
IncrementReferenceCount();

20
Ryujinx.Graphics.Gpu/Image/TextureCache.cs
View file

@ -154,6 +154,17 @@ namespace Ryujinx.Graphics.Gpu.Image
return true;
}
/// <summary>
/// Lifts the texture to the top of the AutoDeleteCache. This is primarily used to enforce that
/// data written to a target will be flushed to memory should the texture be deleted, but also
/// keeps rendered textures alive without a pool reference.
/// </summary>
/// <param name="texture">Texture to lift</param>
public void Lift(Texture texture)
{
_cache.Lift(texture);
}
/// <summary>
/// Tries to find an existing texture, or create a new one if not found.
/// </summary>
@ -442,14 +453,6 @@ namespace Ryujinx.Graphics.Gpu.Image
if (texture != null)
{
if (!isSamplerTexture)
{
// If not a sampler texture, it is managed by the auto delete
// cache, ensure that it is on the "top" of the list to avoid
// deletion.
_cache.Lift(texture);
}
ChangeSizeIfNeeded(info, texture, isSamplerTexture, sizeHint);
texture.SynchronizeMemory();
@ -849,7 +852,6 @@ namespace Ryujinx.Graphics.Gpu.Image
if (match)
{
_cache.Lift(texture);
return texture;
}
}