From e48530e9d9f0bbaeb8fa5978d1a66c99e6fecbac Mon Sep 17 00:00:00 2001 From: gdkchan Date: Mon, 1 Nov 2021 19:10:02 -0300 Subject: [PATCH] When waiting on CPU, do not return a time out error from EventWait (#2780) * When waiting on CPU, do not return a time out error from EventWait * And while I'm at it... --- Ryujinx.Graphics.Gpu/Synchronization/SyncpointWaiterHandle.cs | 2 +- .../Services/Nv/NvDrvServices/NvHostCtrl/Types/NvHostEvent.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Ryujinx.Graphics.Gpu/Synchronization/SyncpointWaiterHandle.cs b/Ryujinx.Graphics.Gpu/Synchronization/SyncpointWaiterHandle.cs index 027b5141..dd2a5812 100644 --- a/Ryujinx.Graphics.Gpu/Synchronization/SyncpointWaiterHandle.cs +++ b/Ryujinx.Graphics.Gpu/Synchronization/SyncpointWaiterHandle.cs @@ -4,7 +4,7 @@ namespace Ryujinx.Graphics.Gpu.Synchronization { public class SyncpointWaiterHandle { - internal uint Threshold; + internal uint Threshold; internal Action Callback; } } diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostCtrl/Types/NvHostEvent.cs b/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostCtrl/Types/NvHostEvent.cs index f57a4eff..f361b937 100644 --- a/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostCtrl/Types/NvHostEvent.cs +++ b/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostCtrl/Types/NvHostEvent.cs @@ -130,11 +130,11 @@ namespace Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostCtrl { Logger.Warning?.Print(LogClass.ServiceNv, "GPU processing thread is too slow, waiting on CPU..."); - bool timedOut = Fence.Wait(gpuContext, Timeout.InfiniteTimeSpan); + Fence.Wait(gpuContext, Timeout.InfiniteTimeSpan); ResetFailingState(); - return timedOut; + return false; } else {