2020-05-04 04:24:59 +02:00
|
|
|
|
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;
|
2023-03-12 18:01:15 +01:00
|
|
|
|
private const ulong HighMask = 0xFFFFFFFF00000000;
|
2020-05-04 04:24:59 +02:00
|
|
|
|
|
|
|
|
|
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);
|
|
|
|
|
}
|
|
|
|
|
|
2020-12-12 00:31:39 +01:00
|
|
|
|
public unsafe void End(bool withResult)
|
2020-05-04 04:24:59 +02:00
|
|
|
|
{
|
|
|
|
|
GL.EndQuery(_type);
|
|
|
|
|
|
2020-12-12 00:31:39 +01:00
|
|
|
|
if (withResult)
|
|
|
|
|
{
|
|
|
|
|
GL.BindBuffer(BufferTarget.QueryBuffer, _buffer);
|
2020-05-04 04:24:59 +02:00
|
|
|
|
|
2020-12-12 00:31:39 +01:00
|
|
|
|
Marshal.WriteInt64(_bufferMap, -1L);
|
|
|
|
|
GL.GetQueryObject(Query, GetQueryObjectParam.QueryResult, (long*)0);
|
Add a Multithreading layer for the GAL, multi-thread shader compilation at runtime (#2501)
* Initial Implementation
About as fast as nvidia GL multithreading, can be improved with faster command queuing.
* Struct based command list
Speeds up a bit. Still a lot of time lost to resource copy.
* Do shader init while the render thread is active.
* Introduce circular span pool V1
Ideally should be able to use structs instead of references for storing these spans on commands. Will try that next.
* Refactor SpanRef some more
Use a struct to represent SpanRef, rather than a reference.
* Flush buffers on background thread
* Use a span for UpdateRenderScale.
Much faster than copying the array.
* Calculate command size using reflection
* WIP parallel shaders
* Some minor optimisation
* Only 2 max refs per command now.
The command with 3 refs is gone. :relieved:
* Don't cast on the GPU side
* Remove redundant casts, force sync on window present
* Fix Shader Cache
* Fix host shader save.
* Fixup to work with new renderer stuff
* Make command Run static, use array of delegates as lookup
Profile says this takes less time than the previous way.
* Bring up to date
* Add settings toggle. Fix Muiltithreading Off mode.
* Fix warning.
* Release tracking lock for flushes
* Fix Conditional Render fast path with threaded gal
* Make handle iteration safe when releasing the lock
This is mostly temporary.
* Attempt to set backend threading on driver
Only really works on nvidia before launching a game.
* Fix race condition with BufferModifiedRangeList, exceptions in tracking actions
* Update buffer set commands
* Some cleanup
* Only use stutter workaround when using opengl renderer non-threaded
* Add host-conditional reservation of counter events
There has always been the possibility that conditional rendering could use a query object just as it is disposed by the counter queue. This change makes it so that when the host decides to use host conditional rendering, the query object is reserved so that it cannot be deleted. Counter events can optionally start reserved, as the threaded implementation can reserve them before the backend creates them, and there would otherwise be a short amount of time where the counter queue could dispose the event before a call to reserve it could be made.
* Address Feedback
* Make counter flush tracked again.
Hopefully does not cause any issues this time.
* Wait for FlushTo on the main queue thread.
Currently assumes only one thread will want to FlushTo (in this case, the GPU thread)
* Add SDL2 headless integration
* Add HLE macro commands.
Co-authored-by: Mary <mary@mary.zone>
2021-08-27 00:31:29 +02:00
|
|
|
|
GL.MemoryBarrier(MemoryBarrierFlags.QueryBufferBarrierBit | MemoryBarrierFlags.ClientMappedBufferBarrierBit);
|
2020-12-12 00:31:39 +01:00
|
|
|
|
}
|
Fix deadlock for GPU counter report when 0 draws are done (#3019)
This fixes a rare bug where reporting a counter for a region containing 0 draws could deadlock the GPU. If this write overlaps with a tracking action, then the GPU could end up waiting on something that it's meant to do in the future, so it would just get stuck.
Before, this reported immediately and wrote the result to guest memory (tracked) from the backend thread.
The backend thread cannot be allowed to trigger read actions that wait on the GPU, as it will end up waiting on itself, and never advancing.
In the case of backend multithreading's `SyncMap`, it would try to wait for a backend sync object that does not yet exist, as the sync object would exist according to the GPU and tracking, but it has not yet been created by the backend (and never will be, since it's stuck).
The fix is to queue the 0 draw event just like any other, its _bufferMap value is just forced to 0.
This affects games that use Conditional Rendering: SMO, Splatoon 2, MK8. Was generally indicated by a red message in log saying that the query result timed out after 5000 tries, but not always the cause.
2022-01-21 23:19:15 +01:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
// Dummy result, just return 0.
|
|
|
|
|
Marshal.WriteInt64(_bufferMap, 0L);
|
|
|
|
|
}
|
2020-05-04 04:24:59 +02:00
|
|
|
|
}
|
|
|
|
|
|
2023-03-12 18:01:15 +01:00
|
|
|
|
private bool WaitingForValue(long data)
|
|
|
|
|
{
|
|
|
|
|
return data == DefaultValue ||
|
|
|
|
|
((ulong)data & HighMask) == (unchecked((ulong)DefaultValue) & HighMask);
|
|
|
|
|
}
|
|
|
|
|
|
2020-05-04 04:24:59 +02:00
|
|
|
|
public bool TryGetResult(out long result)
|
|
|
|
|
{
|
|
|
|
|
result = Marshal.ReadInt64(_bufferMap);
|
|
|
|
|
|
2023-03-12 18:01:15 +01:00
|
|
|
|
return WaitingForValue(result);
|
2020-05-04 04:24:59 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public long AwaitResult(AutoResetEvent wakeSignal = null)
|
|
|
|
|
{
|
|
|
|
|
long data = DefaultValue;
|
|
|
|
|
|
|
|
|
|
if (wakeSignal == null)
|
|
|
|
|
{
|
2023-03-12 18:01:15 +01:00
|
|
|
|
while (WaitingForValue(data))
|
2020-05-04 04:24:59 +02:00
|
|
|
|
{
|
|
|
|
|
data = Marshal.ReadInt64(_bufferMap);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
int iterations = 0;
|
2023-03-12 18:01:15 +01:00
|
|
|
|
while (WaitingForValue(data) && iterations++ < MaxQueryRetries)
|
2020-05-04 04:24:59 +02:00
|
|
|
|
{
|
|
|
|
|
data = Marshal.ReadInt64(_bufferMap);
|
2023-03-12 18:01:15 +01:00
|
|
|
|
if (WaitingForValue(data))
|
2020-05-04 04:24:59 +02:00
|
|
|
|
{
|
|
|
|
|
wakeSignal.WaitOne(1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (iterations >= MaxQueryRetries)
|
|
|
|
|
{
|
2020-08-04 01:32:53 +02:00
|
|
|
|
Logger.Error?.Print(LogClass.Gpu, $"Error: Query result timed out. Took more than {MaxQueryRetries} tries.");
|
2020-05-04 04:24:59 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return data;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void Dispose()
|
|
|
|
|
{
|
|
|
|
|
GL.BindBuffer(BufferTarget.QueryBuffer, _buffer);
|
|
|
|
|
GL.UnmapBuffer(BufferTarget.QueryBuffer);
|
|
|
|
|
GL.DeleteBuffer(_buffer);
|
|
|
|
|
GL.DeleteQuery(Query);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|