From 521a07e6125d3a5d9781512639387a9be5f09107 Mon Sep 17 00:00:00 2001 From: riperiperi Date: Sun, 19 Dec 2021 14:32:52 +0000 Subject: [PATCH] Add support for releasing a semaphore to DmaClass (#2926) * Add support for releasing a semaphore to DmaClass Fixes freezes in OpenGL games, primarily GameMaker ones such as Undertale. * Address Feedback --- Ryujinx.Graphics.Gpu/Engine/Dma/DmaClass.cs | 36 +++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/Ryujinx.Graphics.Gpu/Engine/Dma/DmaClass.cs b/Ryujinx.Graphics.Gpu/Engine/Dma/DmaClass.cs index 8e4ac5e229..856d52a9a6 100644 --- a/Ryujinx.Graphics.Gpu/Engine/Dma/DmaClass.cs +++ b/Ryujinx.Graphics.Gpu/Engine/Dma/DmaClass.cs @@ -1,4 +1,5 @@ using Ryujinx.Common; +using Ryujinx.Common.Logging; using Ryujinx.Graphics.Device; using Ryujinx.Graphics.Gpu.Engine.Threed; using Ryujinx.Graphics.Texture; @@ -98,11 +99,32 @@ namespace Ryujinx.Graphics.Gpu.Engine.Dma } } + /// + /// Releases a semaphore for a given LaunchDma method call. + /// + /// The LaunchDma call argument + private void ReleaseSemaphore(int argument) + { + LaunchDmaSemaphoreType type = (LaunchDmaSemaphoreType)((argument >> 3) & 0x3); + if (type != LaunchDmaSemaphoreType.None) + { + ulong address = ((ulong)_state.State.SetSemaphoreA << 32) | _state.State.SetSemaphoreB; + if (type == LaunchDmaSemaphoreType.ReleaseOneWordSemaphore) + { + _channel.MemoryManager.Write(address, _state.State.SetSemaphorePayload); + } + else /* if (type == LaunchDmaSemaphoreType.ReleaseFourWordSemaphore) */ + { + Logger.Warning?.Print(LogClass.Gpu, "DMA semaphore type ReleaseFourWordSemaphore was used, but is not currently implemented."); + } + } + } + /// /// Performs a buffer to buffer, or buffer to texture copy. /// - /// Method call argument - private void LaunchDma(int argument) + /// The LaunchDma call argument + private void DmaCopy(int argument) { var memoryManager = _channel.MemoryManager; @@ -296,5 +318,15 @@ namespace Ryujinx.Graphics.Gpu.Engine.Dma } } } + + /// + /// Performs a buffer to buffer, or buffer to texture copy, then optionally releases a semaphore. + /// + /// Method call argument + private void LaunchDma(int argument) + { + DmaCopy(argument); + ReleaseSemaphore(argument); + } } }