Implement Counter Queue and Partial Host Conditional Rendering (#1167)

* Implementation of query queue and host conditional rendering

* Resolve some comments.

* Use overloads instead of passing object.

* Wake the consumer threads when incrementing syncpoints.

Also, do a busy loop when awaiting the counter for a blocking flush, rather than potentially sleeping the thread.

* Ensure there's a command between begin and end query.
This commit is contained in:
riperiperi 2020-05-04 03:24:59 +01:00 committed by GitHub
parent 651a07c6c2
commit cd48576f58
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 724 additions and 136 deletions

View file

@ -1,4 +1,5 @@
using System.Collections.Generic;
using Ryujinx.Graphics.GAL;
using System.Collections.Generic;
namespace Ryujinx.Graphics.Gpu.Memory
{
@ -10,10 +11,12 @@ namespace Ryujinx.Graphics.Gpu.Memory
private struct CounterEntry
{
public ulong Address { get; }
public ICounterEvent Event { get; }
public CounterEntry(ulong address)
public CounterEntry(ulong address, ICounterEvent evt)
{
Address = address;
Event = evt;
}
}
@ -31,11 +34,11 @@ namespace Ryujinx.Graphics.Gpu.Memory
/// Adds a new counter to the counter cache, or updates a existing one.
/// </summary>
/// <param name="gpuVa">GPU virtual address where the counter will be written in memory</param>
public void AddOrUpdate(ulong gpuVa)
public void AddOrUpdate(ulong gpuVa, ICounterEvent evt)
{
int index = BinarySearch(gpuVa);
CounterEntry entry = new CounterEntry(gpuVa);
CounterEntry entry = new CounterEntry(gpuVa, evt);
if (index < 0)
{
@ -76,6 +79,16 @@ namespace Ryujinx.Graphics.Gpu.Memory
count++;
}
// Notify the removed counter events that their result should no longer be written out.
for (int i = 0; i < count; i++)
{
ICounterEvent evt = _items[index + i].Event;
if (evt != null)
{
evt.Invalid = true;
}
}
_items.RemoveRange(index, count);
}
@ -101,6 +114,44 @@ namespace Ryujinx.Graphics.Gpu.Memory
return BinarySearch(gpuVa) >= 0;
}
/// <summary>
/// Flush any counter value written to the specified GPU virtual memory address.
/// </summary>
/// <param name="gpuVa">GPU virtual address</param>
/// <returns>True if any counter value was written on the specified address, false otherwise</returns>
public bool FindAndFlush(ulong gpuVa)
{
int index = BinarySearch(gpuVa);
if (index > 0)
{
_items[index].Event?.Flush();
return true;
}
else
{
return false;
}
}
/// <summary>
/// Find any counter event that would write to the specified GPU virtual memory address.
/// </summary>
/// <param name="gpuVa">GPU virtual address</param>
/// <returns>The counter event, or null if not present</returns>
public ICounterEvent FindEvent(ulong gpuVa)
{
int index = BinarySearch(gpuVa);
if (index > 0)
{
return _items[index].Event;
}
else
{
return null;
}
}
/// <summary>
/// Performs binary search of an address on the list.
/// </summary>