vance/ryujinx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix deadlock for GPU counter report when 0 draws are done (#3019)

Browse Source 
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.
This commit is contained in:
riperiperi 2022-01-21 22:19:15 +00:00 committed by GitHub
parent f0824fde9f
commit 646d4dd5c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Ryujinx.Graphics.OpenGL/Queries/BufferedQuery.cs
View File

@ -56,6 +56,11 @@ namespace Ryujinx.Graphics.OpenGL.Queries
GL.GetQueryObject(Query, GetQueryObjectParam.QueryResult, (long*)0); GL.GetQueryObject(Query, GetQueryObjectParam.QueryResult, (long*)0);
GL.MemoryBarrier(MemoryBarrierFlags.QueryBufferBarrierBit | MemoryBarrierFlags.ClientMappedBufferBarrierBit); GL.MemoryBarrier(MemoryBarrierFlags.QueryBufferBarrierBit | MemoryBarrierFlags.ClientMappedBufferBarrierBit);
} }
else
{
// Dummy result, just return 0.
Marshal.WriteInt64(_bufferMap, 0L);
}
} }
public bool TryGetResult(out long result) public bool TryGetResult(out long result)

15
Ryujinx.Graphics.OpenGL/Queries/CounterQueue.cs
View File

@ -119,19 +119,10 @@ namespace Ryujinx.Graphics.OpenGL.Queries
_current.ReserveForHostAccess(); _current.ReserveForHostAccess();
} }
if (draws > 0) _current.Complete(draws > 0);
{ _events.Enqueue(_current);
_current.Complete(true);
_events.Enqueue(_current);
_current.OnResult += resultHandler; _current.OnResult += resultHandler;
}
else
{
_current.Complete(false);
_current.Dispose();
resultHandler(_current, 0);
}
result = _current; result = _current;