e7cf4e6eaf
* Reset queries on same command buffer Vulkan seems to complain when the queries are reset on another command buffer. No idea why, the spec really could be written better in this regard. This fixes complaints, and hopefully any implementations that care extensively about them. This change _guesses_ how many queries need to be reset and resets as many as possible at the same time to avoid splitting render passes. If it resets too many queries, we didn't waste too much time - if it runs out of resets it will batch reset 10 more. The number of queries reset is the maximum number of queries in the last 3 frames. This has been worked into the AutoFlushCounter so that it only resets up to 32 if it is yet to force a command buffer submission in this attachment. This is only done for samples passed queries right now, as they have by far the most resets. * Address Feedback
106 lines
2.6 KiB
C#
106 lines
2.6 KiB
C#
using System;
|
|
using System.Diagnostics;
|
|
using System.Linq;
|
|
|
|
namespace Ryujinx.Graphics.Vulkan
|
|
{
|
|
internal class AutoFlushCounter
|
|
{
|
|
// How often to flush on framebuffer change.
|
|
private readonly static long FramebufferFlushTimer = Stopwatch.Frequency / 1000;
|
|
|
|
private const int MinDrawCountForFlush = 10;
|
|
private const int InitialQueryCountForFlush = 32;
|
|
|
|
private long _lastFlush;
|
|
private ulong _lastDrawCount;
|
|
private bool _hasPendingQuery;
|
|
private int _queryCount;
|
|
|
|
private int[] _queryCountHistory = new int[3];
|
|
private int _queryCountHistoryIndex;
|
|
private int _remainingQueries;
|
|
|
|
public void RegisterFlush(ulong drawCount)
|
|
{
|
|
_lastFlush = Stopwatch.GetTimestamp();
|
|
_lastDrawCount = drawCount;
|
|
|
|
_hasPendingQuery = false;
|
|
}
|
|
|
|
public bool RegisterPendingQuery()
|
|
{
|
|
_hasPendingQuery = true;
|
|
_remainingQueries--;
|
|
|
|
_queryCountHistory[_queryCountHistoryIndex]++;
|
|
|
|
// Interrupt render passes to flush queries, so that early results arrive sooner.
|
|
if (++_queryCount == InitialQueryCountForFlush)
|
|
{
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
public int GetRemainingQueries()
|
|
{
|
|
if (_remainingQueries <= 0)
|
|
{
|
|
_remainingQueries = 16;
|
|
}
|
|
|
|
if (_queryCount < InitialQueryCountForFlush)
|
|
{
|
|
return Math.Min(InitialQueryCountForFlush - _queryCount, _remainingQueries);
|
|
}
|
|
|
|
return _remainingQueries;
|
|
}
|
|
|
|
public bool ShouldFlushQuery()
|
|
{
|
|
return _hasPendingQuery;
|
|
}
|
|
|
|
public bool ShouldFlush(ulong drawCount)
|
|
{
|
|
_queryCount = 0;
|
|
|
|
if (_hasPendingQuery)
|
|
{
|
|
return true;
|
|
}
|
|
|
|
long draws = (long)(drawCount - _lastDrawCount);
|
|
|
|
if (draws < MinDrawCountForFlush)
|
|
{
|
|
if (draws == 0)
|
|
{
|
|
_lastFlush = Stopwatch.GetTimestamp();
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
long flushTimeout = FramebufferFlushTimer;
|
|
|
|
long now = Stopwatch.GetTimestamp();
|
|
|
|
return now > _lastFlush + flushTimeout;
|
|
}
|
|
|
|
public void Present()
|
|
{
|
|
_queryCountHistoryIndex = (_queryCountHistoryIndex + 1) % 3;
|
|
|
|
_remainingQueries = _queryCountHistory.Max() + 10;
|
|
|
|
_queryCountHistory[_queryCountHistoryIndex] = 0;
|
|
}
|
|
}
|
|
}
|