From ec8a5fd05362f04cc77436ee3e45a9188777f75e Mon Sep 17 00:00:00 2001
From: Logan Stromberg <lostromb@microsoft.com>
Date: Thu, 23 Dec 2021 16:48:27 -0800
Subject: [PATCH] Revert "Add support for releasing a semaphore to DmaClass
(#2926)"
This reverts commit 521a07e6125d3a5d9781512639387a9be5f09107.
---
Ryujinx.Graphics.Gpu/Engine/Dma/DmaClass.cs | 36 ++-------------------
1 file changed, 2 insertions(+), 34 deletions(-)
diff --git a/Ryujinx.Graphics.Gpu/Engine/Dma/DmaClass.cs b/Ryujinx.Graphics.Gpu/Engine/Dma/DmaClass.cs
index 856d52a9a6..8e4ac5e229 100644
--- a/Ryujinx.Graphics.Gpu/Engine/Dma/DmaClass.cs
+++ b/Ryujinx.Graphics.Gpu/Engine/Dma/DmaClass.cs
@@ -1,5 +1,4 @@
using Ryujinx.Common;
-using Ryujinx.Common.Logging;
using Ryujinx.Graphics.Device;
using Ryujinx.Graphics.Gpu.Engine.Threed;
using Ryujinx.Graphics.Texture;
@@ -99,32 +98,11 @@ namespace Ryujinx.Graphics.Gpu.Engine.Dma
}
}
- /// <summary>
- /// Releases a semaphore for a given LaunchDma method call.
- /// </summary>
- /// <param name="argument">The LaunchDma call argument</param>
- 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.");
- }
- }
- }
-
/// <summary>
/// Performs a buffer to buffer, or buffer to texture copy.
/// </summary>
- /// <param name="argument">The LaunchDma call argument</param>
- private void DmaCopy(int argument)
+ /// <param name="argument">Method call argument</param>
+ private void LaunchDma(int argument)
{
var memoryManager = _channel.MemoryManager;
@@ -318,15 +296,5 @@ namespace Ryujinx.Graphics.Gpu.Engine.Dma
}
}
}
-
- /// <summary>
- /// Performs a buffer to buffer, or buffer to texture copy, then optionally releases a semaphore.
- /// </summary>
- /// <param name="argument">Method call argument</param>
- private void LaunchDma(int argument)
- {
- DmaCopy(argument);
- ReleaseSemaphore(argument);
- }
}
}