mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ensure that all resources that will be used are properly updated and removed from the pool to avoid invalid re-use

Browse source
This commit is contained in:
gdkchan 2018-12-09 22:10:14 -03:00
commit f7f017e428
1 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Ryujinx.Graphics/Gal/OpenGL/OGLResourceCache.cs
View file

@ -168,14 +168,10 @@ namespace Ryujinx.Graphics.Gal.OpenGL
{ {
if (_cache.TryGetValue(key, out CacheBucket bucket)) if (_cache.TryGetValue(key, out CacheBucket bucket))
{ {
AcquireResource(bucket);
value = bucket.Value; value = bucket.Value;
RemoveFromSortedCache(bucket.CacheNode);
bucket.UpdateCacheNode(_sortedCache.AddLast(bucket.CacheNode.Value));
RemoveFromResourcePool(bucket);
return true; return true;
} }
@ -189,6 +185,8 @@ namespace Ryujinx.Graphics.Gal.OpenGL
if (_cache.TryGetValue(key, out CacheBucket bucket) && bucket.PoolKey.Equals(poolKey)) if (_cache.TryGetValue(key, out CacheBucket bucket) && bucket.PoolKey.Equals(poolKey))
{ {
//Value on key is already compatible, we don't need to do anything. //Value on key is already compatible, we don't need to do anything.
AcquireResource(bucket);
value = bucket.Value; value = bucket.Value;
return true; return true;
@ -218,6 +216,8 @@ namespace Ryujinx.Graphics.Gal.OpenGL
{ {
if (_cache.TryGetValue(key, out CacheBucket bucket)) if (_cache.TryGetValue(key, out CacheBucket bucket))
{ {
AcquireResource(bucket);
size = bucket.Size; size = bucket.Size;
return true; return true;
@ -232,6 +232,8 @@ namespace Ryujinx.Graphics.Gal.OpenGL
{ {
if (_cache.TryGetValue(key, out CacheBucket bucket)) if (_cache.TryGetValue(key, out CacheBucket bucket))
{ {
AcquireResource(bucket);
size = bucket.Size; size = bucket.Size;
value = bucket.Value; value = bucket.Value;
@ -244,6 +246,15 @@ namespace Ryujinx.Graphics.Gal.OpenGL
return false; return false;
} }
private void AcquireResource(CacheBucket bucket)
{
RemoveFromSortedCache(bucket.CacheNode);
bucket.UpdateCacheNode(_sortedCache.AddLast(bucket.CacheNode.Value));
RemoveFromResourcePool(bucket);
}
private void ClearCacheIfNeeded() private void ClearCacheIfNeeded()
{ {
long timestamp = PerformanceCounter.ElapsedMilliseconds; long timestamp = PerformanceCounter.ElapsedMilliseconds;