From 646d4dd5c715492a192efa234741ae40b846593f Mon Sep 17 00:00:00 2001 From: riperiperi Date: Fri, 21 Jan 2022 22:19:15 +0000 Subject: [PATCH] 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. --- Ryujinx.Graphics.OpenGL/Queries/BufferedQuery.cs | 5 +++++ Ryujinx.Graphics.OpenGL/Queries/CounterQueue.cs | 15 +++------------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/Ryujinx.Graphics.OpenGL/Queries/BufferedQuery.cs b/Ryujinx.Graphics.OpenGL/Queries/BufferedQuery.cs index 7323abfea4..027495cdd5 100644 --- a/Ryujinx.Graphics.OpenGL/Queries/BufferedQuery.cs +++ b/Ryujinx.Graphics.OpenGL/Queries/BufferedQuery.cs @@ -56,6 +56,11 @@ namespace Ryujinx.Graphics.OpenGL.Queries GL.GetQueryObject(Query, GetQueryObjectParam.QueryResult, (long*)0); GL.MemoryBarrier(MemoryBarrierFlags.QueryBufferBarrierBit | MemoryBarrierFlags.ClientMappedBufferBarrierBit); } + else + { + // Dummy result, just return 0. + Marshal.WriteInt64(_bufferMap, 0L); + } } public bool TryGetResult(out long result) diff --git a/Ryujinx.Graphics.OpenGL/Queries/CounterQueue.cs b/Ryujinx.Graphics.OpenGL/Queries/CounterQueue.cs index f4ab02fb12..84b2bfdc90 100644 --- a/Ryujinx.Graphics.OpenGL/Queries/CounterQueue.cs +++ b/Ryujinx.Graphics.OpenGL/Queries/CounterQueue.cs @@ -119,19 +119,10 @@ namespace Ryujinx.Graphics.OpenGL.Queries _current.ReserveForHostAccess(); } - if (draws > 0) - { - _current.Complete(true); - _events.Enqueue(_current); + _current.Complete(draws > 0); + _events.Enqueue(_current); - _current.OnResult += resultHandler; - } - else - { - _current.Complete(false); - _current.Dispose(); - resultHandler(_current, 0); - } + _current.OnResult += resultHandler; result = _current;