vance/ryujinx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GAL: Fix sampler leaks on exit (#2353)

Browse Source 
Before this, all samplers instance were leaking on exit because the
dispose method was never getting called.

This fix this issue by making TextureBindingsManager disposable and
calling the dispose method in the TextureManager.
This commit is contained in:
Mary 2021-06-09 01:00:28 +02:00 committed by GitHub
parent 60cf3dfebc
commit afd68d4c6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Ryujinx.Graphics.Gpu/Image/TextureBindingsManager.cs
View File

@ -1,13 +1,14 @@
using Ryujinx.Graphics.GAL;
using Ryujinx.Graphics.Gpu.State;
using Ryujinx.Graphics.Shader;
using System;
namespace Ryujinx.Graphics.Gpu.Image
{
/// <summary>
/// Texture bindings manager.
/// </summary>
class TextureBindingsManager
class TextureBindingsManager : IDisposable
{
private const int HandleHigh = 16;
private const int HandleMask = (1 << HandleHigh) - 1;
@ -505,5 +506,13 @@ namespace Ryujinx.Graphics.Gpu.Image
{
_rebind = true;
}
/// <summary>
/// Disposes all textures and samplers in the cache.
/// </summary>
public void Dispose()
{
_samplerPool?.Dispose();
}
}
}

5
Ryujinx.Graphics.Gpu/Image/TextureManager.cs
View File

@ -1286,7 +1286,7 @@ namespace Ryujinx.Graphics.Gpu.Image
}
/// <summary>
/// Disposes all textures in the cache.
/// Disposes all textures and samplers in the cache.
/// It's an error to use the texture manager after disposal.
/// </summary>
public void Dispose()
@ -1297,6 +1297,9 @@ namespace Ryujinx.Graphics.Gpu.Image
{
texture.Dispose();
}
_cpBindingsManager.Dispose();
_gpBindingsManager.Dispose();
}
}
}