mirror of
https://github.com/GreemDev/Ryujinx.git
synced 2024-12-18 12:55:54 +01:00
6e9bd4de13
* GPU: Scale counter results before addition Counter results were being scaled on ReportCounter, which meant that the _total_ value of the counter was being scaled. Not only could this result in very large numbers and weird overflows if the game doesn't clear the counter, but it also caused the result to change drastically. This PR changes scaling to be done when the value is added to the counter on the backend. This should evaluate the scale at the same time as before, on report counter, but avoiding the issue with scaling the total. Fixes scaling in Warioware, at least in the demo, where it seems to compare old/new counters and broke down when scaling was enabled. * Fix issues when result is partially uploaded. Drivers tend to write the low half first, then the high half. Retry if the high half is FFFFFFFF.
121 lines
3.6 KiB
C#
121 lines
3.6 KiB
C#
using OpenTK.Graphics.OpenGL;
|
|
using Ryujinx.Common.Logging;
|
|
using System;
|
|
using System.Runtime.InteropServices;
|
|
using System.Threading;
|
|
|
|
namespace Ryujinx.Graphics.OpenGL.Queries
|
|
{
|
|
class BufferedQuery : IDisposable
|
|
{
|
|
private const int MaxQueryRetries = 5000;
|
|
private const long DefaultValue = -1;
|
|
private const ulong HighMask = 0xFFFFFFFF00000000;
|
|
|
|
public int Query { get; }
|
|
|
|
private int _buffer;
|
|
private IntPtr _bufferMap;
|
|
private QueryTarget _type;
|
|
|
|
public BufferedQuery(QueryTarget type)
|
|
{
|
|
_buffer = GL.GenBuffer();
|
|
Query = GL.GenQuery();
|
|
_type = type;
|
|
|
|
GL.BindBuffer(BufferTarget.QueryBuffer, _buffer);
|
|
|
|
unsafe
|
|
{
|
|
long defaultValue = DefaultValue;
|
|
GL.BufferStorage(BufferTarget.QueryBuffer, sizeof(long), (IntPtr)(&defaultValue), BufferStorageFlags.MapReadBit | BufferStorageFlags.MapWriteBit | BufferStorageFlags.MapPersistentBit);
|
|
}
|
|
_bufferMap = GL.MapBufferRange(BufferTarget.QueryBuffer, IntPtr.Zero, sizeof(long), BufferAccessMask.MapReadBit | BufferAccessMask.MapWriteBit | BufferAccessMask.MapPersistentBit);
|
|
}
|
|
|
|
public void Reset()
|
|
{
|
|
GL.EndQuery(_type);
|
|
GL.BeginQuery(_type, Query);
|
|
}
|
|
|
|
public void Begin()
|
|
{
|
|
GL.BeginQuery(_type, Query);
|
|
}
|
|
|
|
public unsafe void End(bool withResult)
|
|
{
|
|
GL.EndQuery(_type);
|
|
|
|
if (withResult)
|
|
{
|
|
GL.BindBuffer(BufferTarget.QueryBuffer, _buffer);
|
|
|
|
Marshal.WriteInt64(_bufferMap, -1L);
|
|
GL.GetQueryObject(Query, GetQueryObjectParam.QueryResult, (long*)0);
|
|
GL.MemoryBarrier(MemoryBarrierFlags.QueryBufferBarrierBit | MemoryBarrierFlags.ClientMappedBufferBarrierBit);
|
|
}
|
|
else
|
|
{
|
|
// Dummy result, just return 0.
|
|
Marshal.WriteInt64(_bufferMap, 0L);
|
|
}
|
|
}
|
|
|
|
private bool WaitingForValue(long data)
|
|
{
|
|
return data == DefaultValue ||
|
|
((ulong)data & HighMask) == (unchecked((ulong)DefaultValue) & HighMask);
|
|
}
|
|
|
|
public bool TryGetResult(out long result)
|
|
{
|
|
result = Marshal.ReadInt64(_bufferMap);
|
|
|
|
return WaitingForValue(result);
|
|
}
|
|
|
|
public long AwaitResult(AutoResetEvent wakeSignal = null)
|
|
{
|
|
long data = DefaultValue;
|
|
|
|
if (wakeSignal == null)
|
|
{
|
|
while (WaitingForValue(data))
|
|
{
|
|
data = Marshal.ReadInt64(_bufferMap);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
int iterations = 0;
|
|
while (WaitingForValue(data) && iterations++ < MaxQueryRetries)
|
|
{
|
|
data = Marshal.ReadInt64(_bufferMap);
|
|
if (WaitingForValue(data))
|
|
{
|
|
wakeSignal.WaitOne(1);
|
|
}
|
|
}
|
|
|
|
if (iterations >= MaxQueryRetries)
|
|
{
|
|
Logger.Error?.Print(LogClass.Gpu, $"Error: Query result timed out. Took more than {MaxQueryRetries} tries.");
|
|
}
|
|
}
|
|
|
|
return data;
|
|
}
|
|
|
|
public void Dispose()
|
|
{
|
|
GL.BindBuffer(BufferTarget.QueryBuffer, _buffer);
|
|
GL.UnmapBuffer(BufferTarget.QueryBuffer);
|
|
GL.DeleteBuffer(_buffer);
|
|
GL.DeleteQuery(Query);
|
|
}
|
|
}
|
|
}
|