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

Address feedback

Browse source
This commit is contained in:
ReinUsesLisp 2018-09-24 18:21:46 -03:00
commit e64941d143
2 changed files with 47 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Ryujinx.Graphics/Gal/OpenGL/OGLCachedResource.cs
View file

@ -27,8 +27,8 @@ namespace Ryujinx.Graphics.Gal.OpenGL
private bool Locked; private bool Locked;
public OGLCachedResource( public OGLCachedResource(
ResourcePool<TKey, TValue>.CreateValue CreateValueCallback, Func<TKey, TValue> CreateValueCallback,
ResourcePool<TKey, TValue>.DeleteValue DeleteValueCallback) Action<TValue> DeleteValueCallback)
{ {
Cache = new Dictionary<long, CacheBucket>(); Cache = new Dictionary<long, CacheBucket>();

67
Ryujinx.Graphics/ResourcePool.cs
View file

@ -36,28 +36,50 @@ namespace Ryujinx.Graphics
where TKey : ICompatible<TKey> where TKey : ICompatible<TKey>
where TValue : Resource where TValue : Resource
{ {
struct Entry
{
public TKey Params;
public LinkedList<TValue> Resources;
public Entry(TKey Params, LinkedList<TValue> Resources)
{
this.Params = Params;
this.Resources = Resources;
}
}
struct DeletionEntry
{
public TValue Resource;
public LinkedList<TValue> Siblings;
public DeletionEntry(TValue Resource, LinkedList<TValue> Siblings)
{
this.Resource = Resource;
this.Siblings = Siblings;
}
}
private const int MaxTimeDelta = 5 * 60000; private const int MaxTimeDelta = 5 * 60000;
private const int MaxRemovalsPerRun = 10; private const int MaxRemovalsPerRun = 10;
public delegate TValue CreateValue(TKey Params); private LinkedList<Entry> Entries;
public delegate void DeleteValue(TValue Resource); private Queue<DeletionEntry> SortedCache;
private LinkedList<(TKey, LinkedList<TValue>)> Entries; private Func<TKey, TValue> CreateValueCallback;
private Action<TValue> DeleteValueCallback;
private Queue<(TValue, LinkedList<TValue>)> SortedCache; public ResourcePool(
Func<TKey, TValue> CreateValueCallback,
private CreateValue CreateValueCallback; Action<TValue> DeleteValueCallback)
private DeleteValue DeleteValueCallback;
public ResourcePool(CreateValue CreateValueCallback, DeleteValue DeleteValueCallback)
{ {
this.CreateValueCallback = CreateValueCallback; this.CreateValueCallback = CreateValueCallback;
this.DeleteValueCallback = DeleteValueCallback; this.DeleteValueCallback = DeleteValueCallback;
Entries = new LinkedList<(TKey, LinkedList<TValue>)>(); Entries = new LinkedList<Entry>();
SortedCache = new Queue<(TValue, LinkedList<TValue>)>(); SortedCache = new Queue<DeletionEntry>();
} }
public TValue CreateOrRecycle(TKey Params) public TValue CreateOrRecycle(TKey Params)
@ -80,7 +102,7 @@ namespace Ryujinx.Graphics
Siblings.AddLast(Resource); Siblings.AddLast(Resource);
SortedCache.Enqueue((Resource, Siblings)); SortedCache.Enqueue(new DeletionEntry(Resource, Siblings));
return Resource; return Resource;
} }
@ -91,12 +113,13 @@ namespace Ryujinx.Graphics
for (int Count = 0; Count < MaxRemovalsPerRun; Count++) for (int Count = 0; Count < MaxRemovalsPerRun; Count++)
{ {
if (!SortedCache.TryDequeue(out (TValue Resource, LinkedList<TValue> Siblings) Tuple)) if (!SortedCache.TryDequeue(out DeletionEntry DeletionEntry))
{ {
break; break;
} }
(TValue Resource, LinkedList <TValue> Siblings) = Tuple; TValue Resource = DeletionEntry.Resource;
LinkedList <TValue> Siblings = DeletionEntry.Siblings;
if (!Resource.IsUsed) if (!Resource.IsUsed)
{ {
@ -109,31 +132,31 @@ namespace Ryujinx.Graphics
throw new InvalidOperationException(); throw new InvalidOperationException();
} }
DeleteValueCallback(Resource); DeleteValueCallback.Invoke(Resource);
continue; continue;
} }
} }
SortedCache.Enqueue((Resource, Siblings)); SortedCache.Enqueue(DeletionEntry);
} }
} }
private LinkedList<TValue> GetOrAddSiblings(TKey Params) private LinkedList<TValue> GetOrAddSiblings(TKey Params)
{ {
LinkedListNode<(TKey, LinkedList<TValue>)> Node = Entries.First; LinkedListNode<Entry> Node = Entries.First;
while (Node != null) while (Node != null)
{ {
(TKey Params, LinkedList<TValue> Resources) Tuple = Node.Value; Entry Entry = Node.Value;
if (Tuple.Params.IsCompatible(Params)) if (Entry.Params.IsCompatible(Params))
{ {
Entries.Remove(Node); Entries.Remove(Node);
Entries.AddFirst(Tuple); Entries.AddFirst(Entry);
return Tuple.Resources; return Entry.Resources;
} }
Node = Node.Next; Node = Node.Next;
@ -141,7 +164,7 @@ namespace Ryujinx.Graphics
LinkedList<TValue> Siblings = new LinkedList<TValue>(); LinkedList<TValue> Siblings = new LinkedList<TValue>();
Entries.AddFirst((Params, Siblings)); Entries.AddFirst(new Entry(Params, Siblings));
return Siblings; return Siblings;
} }