drashna/ryujinx
1
0
Fork 0
Code Activity Actions

Texture/Buffer Memory Management Improvements (#1408)

Browse source 
* Initial implementation. Still pending better valid-overlap handling,
disposed pool, compressed format flush fix.

* Very messy backend resource cache.

* Oops

* Dispose -> Release

* Improve Release/Dispose.

* More rule refinement.

* View compatibility levels as an enum - you can always know if a view is only copy compatible.

* General cleanup.

Use locking on the resource cache, as it is likely to be used by other threads in future.

* Rename resource cache to resource pool.

* Address some of the smaller nits.

* Fix regression with MK8 lens flare

Texture flushes done the old way should trigger memory tracking.

* Use TextureCreateInfo as a key.

It now implements IEquatable and generates a hashcode based on width/height.

* Fix size change for compressed+non-compressed view combos.

Before, this could set either the compressed or non compressed texture with a size with the wrong size, depending on which texture had its size changed. This caused exceptions when flushing the texture.

Now it correctly takes the block size into account, assuming that these textures are only related because a pixel in the non-compressed texture represents a block in the compressed one.

* Implement JD's suggestion for HashCode Combine

Co-authored-by: jduncanator <1518948+jduncanator@users.noreply.github.com>

* Address feedback

* Address feedback.

Co-authored-by: jduncanator <1518948+jduncanator@users.noreply.github.com>
This commit is contained in:
riperiperi 2020-09-10 20:44:04 +01:00 • committed by GitHub
parent 4c7bebf3e6
commit 5d69d9103e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 725 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Ryujinx.Graphics.OpenGL/Renderer.cs
View file

@ -23,6 +23,8 @@ namespace Ryujinx.Graphics.OpenGL
internal TextureCopy TextureCopy { get; }
internal ResourcePool ResourcePool { get; }
public string GpuVendor { get; private set; }
public string GpuRenderer { get; private set; }
public string GpuVersion { get; private set; }
@ -33,6 +35,7 @@ namespace Ryujinx.Graphics.OpenGL
_counters = new Counters();
_window = new Window(this);
TextureCopy = new TextureCopy(this);
ResourcePool = new ResourcePool();
}
public IShader CompileShader(ShaderProgram shader)
@ -57,7 +60,14 @@ namespace Ryujinx.Graphics.OpenGL
public ITexture CreateTexture(TextureCreateInfo info, float scaleFactor)
{
return info.Target == Target.TextureBuffer ? new TextureBuffer(info) : new TextureStorage(this, info, scaleFactor).CreateDefaultView();
if (info.Target == Target.TextureBuffer)
{
return new TextureBuffer(info);
}
else
{
return ResourcePool.GetTextureOrNull(info, scaleFactor) ?? new TextureStorage(this, info, scaleFactor).CreateDefaultView();
}
}
public void DeleteBuffer(BufferHandle buffer)
@ -92,6 +102,11 @@ namespace Ryujinx.Graphics.OpenGL
_counters.Update();
}
public void PreFrame()
{
ResourcePool.Tick();
}
public ICounterEvent ReportCounter(CounterType type, EventHandler<ulong> resultHandler)
{
return _counters.QueueReport(type, resultHandler);
@ -123,6 +138,7 @@ namespace Ryujinx.Graphics.OpenGL
public void Dispose()
{
TextureCopy.Dispose();
ResourcePool.Dispose();
_pipeline.Dispose();
_window.Dispose();
_counters.Dispose();