From cee712105850ac3385cd0091a923438167433f9f Mon Sep 17 00:00:00 2001 From: TSR Berry <20988865+TSRBerry@users.noreply.github.com> Date: Sat, 8 Apr 2023 01:22:00 +0200 Subject: Move solution and projects to src --- Ryujinx.Graphics.GAL/Multithreading/BufferMap.cs | 194 -------- .../Multithreading/CommandHelper.cs | 149 ------- Ryujinx.Graphics.GAL/Multithreading/CommandType.cs | 102 ----- .../Multithreading/Commands/BarrierCommand.cs | 12 - .../Commands/BeginTransformFeedbackCommand.cs | 18 - .../Commands/Buffer/BufferDisposeCommand.cs | 19 - .../Commands/Buffer/BufferGetDataCommand.cs | 29 -- .../Commands/Buffer/BufferSetDataCommand.cs | 27 -- .../Multithreading/Commands/ClearBufferCommand.cs | 24 - .../Commands/ClearRenderTargetColorCommand.cs | 26 -- .../ClearRenderTargetDepthStencilCommand.cs | 28 -- .../Commands/CommandBufferBarrierCommand.cs | 12 - .../Multithreading/Commands/CopyBufferCommand.cs | 26 -- .../CounterEvent/CounterEventDisposeCommand.cs | 21 - .../CounterEvent/CounterEventFlushCommand.cs | 21 - .../Commands/DispatchComputeCommand.cs | 22 - .../Multithreading/Commands/DrawCommand.cs | 26 -- .../Multithreading/Commands/DrawIndexedCommand.cs | 24 - .../Commands/DrawIndexedIndirectCommand.cs | 18 - .../Commands/DrawIndexedIndirectCountCommand.cs | 29 -- .../Multithreading/Commands/DrawIndirectCommand.cs | 18 - .../Commands/DrawIndirectCountCommand.cs | 29 -- .../Multithreading/Commands/DrawTextureCommand.cs | 31 -- .../Commands/EndHostConditionalRenderingCommand.cs | 12 - .../Commands/EndTransformFeedbackCommand.cs | 12 - .../Multithreading/Commands/IGALCommand.cs | 12 - .../Commands/Program/ProgramCheckLinkCommand.cs | 27 -- .../Commands/Program/ProgramDisposeCommand.cs | 21 - .../Commands/Program/ProgramGetBinaryCommand.cs | 25 -- .../Commands/Renderer/ActionCommand.cs | 21 - .../Commands/Renderer/CreateBufferCommand.cs | 29 -- .../Commands/Renderer/CreateProgramCommand.cs | 28 -- .../Commands/Renderer/CreateSamplerCommand.cs | 23 - .../Commands/Renderer/CreateSyncCommand.cs | 22 - .../Commands/Renderer/CreateTextureCommand.cs | 25 -- .../Commands/Renderer/GetCapabilitiesCommand.cs | 20 - .../Commands/Renderer/PreFrameCommand.cs | 12 - .../Commands/Renderer/ReportCounterCommand.cs | 30 -- .../Commands/Renderer/ResetCounterCommand.cs | 18 - .../Commands/Renderer/UpdateCountersCommand.cs | 12 - .../Commands/Sampler/SamplerDisposeCommand.cs | 21 - .../Multithreading/Commands/SetAlphaTestCommand.cs | 22 - .../Commands/SetBlendStateAdvancedCommand.cs | 18 - .../Commands/SetBlendStateCommand.cs | 20 - .../Multithreading/Commands/SetDepthBiasCommand.cs | 24 - .../Commands/SetDepthClampCommand.cs | 18 - .../Multithreading/Commands/SetDepthModeCommand.cs | 18 - .../Multithreading/Commands/SetDepthTestCommand.cs | 18 - .../Commands/SetFaceCullingCommand.cs | 20 - .../Multithreading/Commands/SetFrontFaceCommand.cs | 18 - .../Multithreading/Commands/SetImageCommand.cs | 25 -- .../Commands/SetIndexBufferCommand.cs | 21 - .../Commands/SetLineParametersCommand.cs | 20 - .../Commands/SetLogicOpStateCommand.cs | 20 - .../Commands/SetMultisampleStateCommand.cs | 18 - .../Commands/SetPatchParametersCommand.cs | 25 -- .../Commands/SetPointParametersCommand.cs | 24 - .../Commands/SetPolygonModeCommand.cs | 20 - .../Commands/SetPrimitiveRestartCommand.cs | 20 - .../Commands/SetPrimitiveTopologyCommand.cs | 18 - .../Multithreading/Commands/SetProgramCommand.cs | 25 -- .../Commands/SetRasterizerDiscardCommand.cs | 18 - .../Commands/SetRenderTargetColorMasksCommand.cs | 23 - .../Commands/SetRenderTargetScaleCommand.cs | 18 - .../Commands/SetRenderTargetsCommand.cs | 24 - .../Multithreading/Commands/SetScissorsCommand.cs | 22 - .../Commands/SetStencilTestCommand.cs | 18 - .../Commands/SetStorageBuffersCommand.cs | 23 - .../Commands/SetTextureAndSamplerCommand.cs | 28 -- .../Commands/SetTransformFeedbackBuffersCommand.cs | 23 - .../Commands/SetUniformBuffersCommand.cs | 23 - .../Commands/SetUserClipDistanceCommand.cs | 20 - .../Commands/SetVertexAttribsCommand.cs | 23 - .../Commands/SetVertexBuffersCommand.cs | 23 - .../Multithreading/Commands/SetViewportsCommand.cs | 25 -- .../Commands/Texture/TextureCopyToCommand.cs | 28 -- .../Commands/Texture/TextureCopyToScaledCommand.cs | 30 -- .../Commands/Texture/TextureCopyToSliceCommand.cs | 32 -- .../Commands/Texture/TextureCreateViewCommand.cs | 30 -- .../Commands/Texture/TextureGetDataCommand.cs | 26 -- .../Commands/Texture/TextureGetDataSliceCommand.cs | 30 -- .../Commands/Texture/TextureReleaseCommand.cs | 21 - .../Commands/Texture/TextureSetDataCommand.cs | 25 -- .../Commands/Texture/TextureSetDataSliceCommand.cs | 29 -- .../Texture/TextureSetDataSliceRegionCommand.cs | 31 -- .../Commands/Texture/TextureSetStorageCommand.cs | 23 - .../Commands/TextureBarrierCommand.cs | 12 - .../Commands/TextureBarrierTiledCommand.cs | 12 - .../Commands/TryHostConditionalRenderingCommand.cs | 25 -- .../TryHostConditionalRenderingFlushCommand.cs | 25 -- .../Commands/UpdateRenderScaleCommand.cs | 25 -- .../Commands/Window/WindowPresentCommand.cs | 27 -- .../Multithreading/Model/CircularSpanPool.cs | 89 ---- .../Multithreading/Model/ResultBox.cs | 7 - .../Multithreading/Model/SpanRef.cs | 39 -- .../Multithreading/Model/TableRef.cs | 22 - .../Multithreading/Resources/ProgramQueue.cs | 107 ----- .../Resources/Programs/BinaryProgramRequest.cs | 25 -- .../Resources/Programs/IProgramRequest.cs | 8 - .../Resources/Programs/SourceProgramRequest.cs | 23 - .../Resources/ThreadedCounterEvent.cs | 80 ---- .../Multithreading/Resources/ThreadedProgram.cs | 48 -- .../Multithreading/Resources/ThreadedSampler.cs | 22 - .../Multithreading/Resources/ThreadedTexture.cs | 141 ------ Ryujinx.Graphics.GAL/Multithreading/SyncMap.cs | 62 --- .../Multithreading/ThreadedHelpers.cs | 28 -- .../Multithreading/ThreadedPipeline.cs | 380 ---------------- .../Multithreading/ThreadedRenderer.cs | 488 --------------------- .../Multithreading/ThreadedWindow.cs | 42 -- 109 files changed, 4040 deletions(-) delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/BufferMap.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/CommandHelper.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/CommandType.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/BarrierCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/BeginTransformFeedbackCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/Buffer/BufferDisposeCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/Buffer/BufferGetDataCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/Buffer/BufferSetDataCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/ClearBufferCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/ClearRenderTargetColorCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/ClearRenderTargetDepthStencilCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/CommandBufferBarrierCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/CopyBufferCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/CounterEvent/CounterEventDisposeCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/CounterEvent/CounterEventFlushCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/DispatchComputeCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/DrawCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/DrawIndexedCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/DrawIndexedIndirectCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/DrawIndexedIndirectCountCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/DrawIndirectCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/DrawIndirectCountCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/DrawTextureCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/EndHostConditionalRenderingCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/EndTransformFeedbackCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/IGALCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/Program/ProgramCheckLinkCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/Program/ProgramDisposeCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/Program/ProgramGetBinaryCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/ActionCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/CreateBufferCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/CreateProgramCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/CreateSamplerCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/CreateSyncCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/CreateTextureCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/GetCapabilitiesCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/PreFrameCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/ReportCounterCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/ResetCounterCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/UpdateCountersCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/Sampler/SamplerDisposeCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/SetAlphaTestCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/SetBlendStateAdvancedCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/SetBlendStateCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/SetDepthBiasCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/SetDepthClampCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/SetDepthModeCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/SetDepthTestCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/SetFaceCullingCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/SetFrontFaceCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/SetImageCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/SetIndexBufferCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/SetLineParametersCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/SetLogicOpStateCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/SetMultisampleStateCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/SetPatchParametersCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/SetPointParametersCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/SetPolygonModeCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/SetPrimitiveRestartCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/SetPrimitiveTopologyCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/SetProgramCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/SetRasterizerDiscardCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/SetRenderTargetColorMasksCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/SetRenderTargetScaleCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/SetRenderTargetsCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/SetScissorsCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/SetStencilTestCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/SetStorageBuffersCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/SetTextureAndSamplerCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/SetTransformFeedbackBuffersCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/SetUniformBuffersCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/SetUserClipDistanceCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/SetVertexAttribsCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/SetVertexBuffersCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/SetViewportsCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureCopyToCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureCopyToScaledCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureCopyToSliceCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureCreateViewCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureGetDataCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureGetDataSliceCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureReleaseCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureSetDataCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureSetDataSliceCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureSetDataSliceRegionCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureSetStorageCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/TextureBarrierCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/TextureBarrierTiledCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/TryHostConditionalRenderingCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/TryHostConditionalRenderingFlushCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/UpdateRenderScaleCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Commands/Window/WindowPresentCommand.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Model/CircularSpanPool.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Model/ResultBox.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Model/SpanRef.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Model/TableRef.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Resources/ProgramQueue.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Resources/Programs/BinaryProgramRequest.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Resources/Programs/IProgramRequest.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Resources/Programs/SourceProgramRequest.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedCounterEvent.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedProgram.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedSampler.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedTexture.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/SyncMap.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/ThreadedHelpers.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/ThreadedPipeline.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/ThreadedRenderer.cs delete mode 100644 Ryujinx.Graphics.GAL/Multithreading/ThreadedWindow.cs (limited to 'Ryujinx.Graphics.GAL/Multithreading') diff --git a/Ryujinx.Graphics.GAL/Multithreading/BufferMap.cs b/Ryujinx.Graphics.GAL/Multithreading/BufferMap.cs deleted file mode 100644 index 24b0af2d..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/BufferMap.cs +++ /dev/null @@ -1,194 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Runtime.CompilerServices; -using System.Threading; - -namespace Ryujinx.Graphics.GAL.Multithreading -{ - /// - /// Buffer handles given to the client are not the same as those provided by the backend, - /// as their handle is created at a later point on the queue. - /// The handle returned is a unique identifier that will map to the real buffer when it is available. - /// Note that any uses within the queue should be safe, but outside you must use MapBufferBlocking. - /// - class BufferMap - { - private ulong _bufferHandle = 0; - - private Dictionary _bufferMap = new Dictionary(); - private HashSet _inFlight = new HashSet(); - private AutoResetEvent _inFlightChanged = new AutoResetEvent(false); - - internal BufferHandle CreateBufferHandle() - { - ulong handle64 = Interlocked.Increment(ref _bufferHandle); - - BufferHandle threadedHandle = Unsafe.As(ref handle64); - - lock (_inFlight) - { - _inFlight.Add(threadedHandle); - } - - return threadedHandle; - } - - internal void AssignBuffer(BufferHandle threadedHandle, BufferHandle realHandle) - { - lock (_bufferMap) - { - _bufferMap[threadedHandle] = realHandle; - } - - lock (_inFlight) - { - _inFlight.Remove(threadedHandle); - } - - _inFlightChanged.Set(); - } - - internal void UnassignBuffer(BufferHandle threadedHandle) - { - lock (_bufferMap) - { - _bufferMap.Remove(threadedHandle); - } - } - - internal BufferHandle MapBuffer(BufferHandle handle) - { - // Maps a threaded buffer to a backend one. - // Threaded buffers are returned on creation as the buffer - // isn't actually created until the queue runs the command. - - BufferHandle result; - - lock (_bufferMap) - { - if (!_bufferMap.TryGetValue(handle, out result)) - { - result = BufferHandle.Null; - } - - return result; - } - } - - internal BufferHandle MapBufferBlocking(BufferHandle handle) - { - // Blocks until the handle is available. - - BufferHandle result; - - lock (_bufferMap) - { - if (_bufferMap.TryGetValue(handle, out result)) - { - return result; - } - } - - bool signal = false; - - while (true) - { - lock (_inFlight) - { - if (!_inFlight.Contains(handle)) - { - break; - } - } - - _inFlightChanged.WaitOne(); - signal = true; - } - - if (signal) - { - // Signal other threads which might still be waiting. - _inFlightChanged.Set(); - } - - return MapBuffer(handle); - } - - internal BufferRange MapBufferRange(BufferRange range) - { - return new BufferRange(MapBuffer(range.Handle), range.Offset, range.Size); - } - - internal Span MapBufferRanges(Span ranges) - { - // Rewrite the buffer ranges to point to the mapped handles. - - lock (_bufferMap) - { - for (int i = 0; i < ranges.Length; i++) - { - ref BufferRange range = ref ranges[i]; - BufferHandle result; - - if (!_bufferMap.TryGetValue(range.Handle, out result)) - { - result = BufferHandle.Null; - } - - range = new BufferRange(result, range.Offset, range.Size); - } - } - - return ranges; - } - - internal Span MapBufferRanges(Span ranges) - { - // Rewrite the buffer ranges to point to the mapped handles. - - lock (_bufferMap) - { - for (int i = 0; i < ranges.Length; i++) - { - ref BufferAssignment assignment = ref ranges[i]; - BufferRange range = assignment.Range; - BufferHandle result; - - if (!_bufferMap.TryGetValue(range.Handle, out result)) - { - result = BufferHandle.Null; - } - - assignment = new BufferAssignment(ranges[i].Binding, new BufferRange(result, range.Offset, range.Size)); - } - } - - return ranges; - } - - internal Span MapBufferRanges(Span ranges) - { - // Rewrite the buffer ranges to point to the mapped handles. - - lock (_bufferMap) - { - for (int i = 0; i < ranges.Length; i++) - { - BufferRange range = ranges[i].Buffer; - BufferHandle result; - - if (!_bufferMap.TryGetValue(range.Handle, out result)) - { - result = BufferHandle.Null; - } - - range = new BufferRange(result, range.Offset, range.Size); - - ranges[i] = new VertexBufferDescriptor(range, ranges[i].Stride, ranges[i].Divisor); - } - } - - return ranges; - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/CommandHelper.cs b/Ryujinx.Graphics.GAL/Multithreading/CommandHelper.cs deleted file mode 100644 index 063b7edf..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/CommandHelper.cs +++ /dev/null @@ -1,149 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Commands; -using Ryujinx.Graphics.GAL.Multithreading.Commands.Buffer; -using Ryujinx.Graphics.GAL.Multithreading.Commands.CounterEvent; -using Ryujinx.Graphics.GAL.Multithreading.Commands.Program; -using Ryujinx.Graphics.GAL.Multithreading.Commands.Renderer; -using Ryujinx.Graphics.GAL.Multithreading.Commands.Sampler; -using Ryujinx.Graphics.GAL.Multithreading.Commands.Texture; -using Ryujinx.Graphics.GAL.Multithreading.Commands.Window; -using System; -using System.Linq; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -namespace Ryujinx.Graphics.GAL.Multithreading -{ - static class CommandHelper - { - private delegate void CommandDelegate(Span memory, ThreadedRenderer threaded, IRenderer renderer); - - private static int _totalCommands = (int)Enum.GetValues().Max() + 1; - private static CommandDelegate[] _lookup = new CommandDelegate[_totalCommands]; - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private static ref T GetCommand(Span memory) - { - return ref Unsafe.As(ref MemoryMarshal.GetReference(memory)); - } - - public static int GetMaxCommandSize() - { - return InitLookup() + 1; // 1 byte reserved for command size. - } - - private static int InitLookup() - { - int maxCommandSize = 0; - - void Register(CommandType commandType) where T : unmanaged, IGALCommand, IGALCommand - { - maxCommandSize = Math.Max(maxCommandSize, Unsafe.SizeOf()); - _lookup[(int)commandType] = (memory, threaded, renderer) => T.Run(ref GetCommand(memory), threaded, renderer); - } - - Register(CommandType.Action); - Register(CommandType.CreateBuffer); - Register(CommandType.CreateProgram); - Register(CommandType.CreateSampler); - Register(CommandType.CreateSync); - Register(CommandType.CreateTexture); - Register(CommandType.GetCapabilities); - Register(CommandType.PreFrame); - Register(CommandType.ReportCounter); - Register(CommandType.ResetCounter); - Register(CommandType.UpdateCounters); - - Register(CommandType.BufferDispose); - Register(CommandType.BufferGetData); - Register(CommandType.BufferSetData); - - Register(CommandType.CounterEventDispose); - Register(CommandType.CounterEventFlush); - - Register(CommandType.ProgramDispose); - Register(CommandType.ProgramGetBinary); - Register(CommandType.ProgramCheckLink); - - Register(CommandType.SamplerDispose); - - Register(CommandType.TextureCopyTo); - Register(CommandType.TextureCopyToScaled); - Register(CommandType.TextureCopyToSlice); - Register(CommandType.TextureCreateView); - Register(CommandType.TextureGetData); - Register(CommandType.TextureGetDataSlice); - Register(CommandType.TextureRelease); - Register(CommandType.TextureSetData); - Register(CommandType.TextureSetDataSlice); - Register(CommandType.TextureSetDataSliceRegion); - Register(CommandType.TextureSetStorage); - - Register(CommandType.WindowPresent); - - Register(CommandType.Barrier); - Register(CommandType.BeginTransformFeedback); - Register(CommandType.ClearBuffer); - Register(CommandType.ClearRenderTargetColor); - Register(CommandType.ClearRenderTargetDepthStencil); - Register(CommandType.CommandBufferBarrier); - Register(CommandType.CopyBuffer); - Register(CommandType.DispatchCompute); - Register(CommandType.Draw); - Register(CommandType.DrawIndexed); - Register(CommandType.DrawIndexedIndirect); - Register(CommandType.DrawIndexedIndirectCount); - Register(CommandType.DrawIndirect); - Register(CommandType.DrawIndirectCount); - Register(CommandType.DrawTexture); - Register(CommandType.EndHostConditionalRendering); - Register(CommandType.EndTransformFeedback); - Register(CommandType.SetAlphaTest); - Register(CommandType.SetBlendStateAdvanced); - Register(CommandType.SetBlendState); - Register(CommandType.SetDepthBias); - Register(CommandType.SetDepthClamp); - Register(CommandType.SetDepthMode); - Register(CommandType.SetDepthTest); - Register(CommandType.SetFaceCulling); - Register(CommandType.SetFrontFace); - Register(CommandType.SetStorageBuffers); - Register(CommandType.SetTransformFeedbackBuffers); - Register(CommandType.SetUniformBuffers); - Register(CommandType.SetImage); - Register(CommandType.SetIndexBuffer); - Register(CommandType.SetLineParameters); - Register(CommandType.SetLogicOpState); - Register(CommandType.SetMultisampleState); - Register(CommandType.SetPatchParameters); - Register(CommandType.SetPointParameters); - Register(CommandType.SetPolygonMode); - Register(CommandType.SetPrimitiveRestart); - Register(CommandType.SetPrimitiveTopology); - Register(CommandType.SetProgram); - Register(CommandType.SetRasterizerDiscard); - Register(CommandType.SetRenderTargetColorMasks); - Register(CommandType.SetRenderTargetScale); - Register(CommandType.SetRenderTargets); - Register(CommandType.SetScissor); - Register(CommandType.SetStencilTest); - Register(CommandType.SetTextureAndSampler); - Register(CommandType.SetUserClipDistance); - Register(CommandType.SetVertexAttribs); - Register(CommandType.SetVertexBuffers); - Register(CommandType.SetViewports); - Register(CommandType.TextureBarrier); - Register(CommandType.TextureBarrierTiled); - Register(CommandType.TryHostConditionalRendering); - Register(CommandType.TryHostConditionalRenderingFlush); - Register(CommandType.UpdateRenderScale); - - return maxCommandSize; - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void RunCommand(Span memory, ThreadedRenderer threaded, IRenderer renderer) - { - _lookup[memory[memory.Length - 1]](memory, threaded, renderer); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/CommandType.cs b/Ryujinx.Graphics.GAL/Multithreading/CommandType.cs deleted file mode 100644 index 61e729b4..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/CommandType.cs +++ /dev/null @@ -1,102 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading -{ - enum CommandType : byte - { - Action, - CreateBuffer, - CreateProgram, - CreateSampler, - CreateSync, - CreateTexture, - GetCapabilities, - Unused, - PreFrame, - ReportCounter, - ResetCounter, - UpdateCounters, - - BufferDispose, - BufferGetData, - BufferSetData, - - CounterEventDispose, - CounterEventFlush, - - ProgramDispose, - ProgramGetBinary, - ProgramCheckLink, - - SamplerDispose, - - TextureCopyTo, - TextureCopyToScaled, - TextureCopyToSlice, - TextureCreateView, - TextureGetData, - TextureGetDataSlice, - TextureRelease, - TextureSetData, - TextureSetDataSlice, - TextureSetDataSliceRegion, - TextureSetStorage, - - WindowPresent, - - Barrier, - BeginTransformFeedback, - ClearBuffer, - ClearRenderTargetColor, - ClearRenderTargetDepthStencil, - CommandBufferBarrier, - CopyBuffer, - DispatchCompute, - Draw, - DrawIndexed, - DrawIndexedIndirect, - DrawIndexedIndirectCount, - DrawIndirect, - DrawIndirectCount, - DrawTexture, - EndHostConditionalRendering, - EndTransformFeedback, - SetAlphaTest, - SetBlendStateAdvanced, - SetBlendState, - SetDepthBias, - SetDepthClamp, - SetDepthMode, - SetDepthTest, - SetFaceCulling, - SetFrontFace, - SetStorageBuffers, - SetTransformFeedbackBuffers, - SetUniformBuffers, - SetImage, - SetIndexBuffer, - SetLineParameters, - SetLogicOpState, - SetMultisampleState, - SetPatchParameters, - SetPointParameters, - SetPolygonMode, - SetPrimitiveRestart, - SetPrimitiveTopology, - SetProgram, - SetRasterizerDiscard, - SetRenderTargetColorMasks, - SetRenderTargetScale, - SetRenderTargets, - SetScissor, - SetStencilTest, - SetTextureAndSampler, - SetUserClipDistance, - SetVertexAttribs, - SetVertexBuffers, - SetViewports, - TextureBarrier, - TextureBarrierTiled, - TryHostConditionalRendering, - TryHostConditionalRenderingFlush, - UpdateRenderScale - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/BarrierCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/BarrierCommand.cs deleted file mode 100644 index 4f8e1b08..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/BarrierCommand.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct BarrierCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.Barrier; - - public static void Run(ref BarrierCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.Barrier(); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/BeginTransformFeedbackCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/BeginTransformFeedbackCommand.cs deleted file mode 100644 index 50032635..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/BeginTransformFeedbackCommand.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct BeginTransformFeedbackCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.BeginTransformFeedback; - private PrimitiveTopology _topology; - - public void Set(PrimitiveTopology topology) - { - _topology = topology; - } - - public static void Run(ref BeginTransformFeedbackCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.BeginTransformFeedback(command._topology); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/Buffer/BufferDisposeCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/Buffer/BufferDisposeCommand.cs deleted file mode 100644 index 5be42fff..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/Buffer/BufferDisposeCommand.cs +++ /dev/null @@ -1,19 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands.Buffer -{ - struct BufferDisposeCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.BufferDispose; - private BufferHandle _buffer; - - public void Set(BufferHandle buffer) - { - _buffer = buffer; - } - - public static void Run(ref BufferDisposeCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.DeleteBuffer(threaded.Buffers.MapBuffer(command._buffer)); - threaded.Buffers.UnassignBuffer(command._buffer); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/Buffer/BufferGetDataCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/Buffer/BufferGetDataCommand.cs deleted file mode 100644 index 031c6153..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/Buffer/BufferGetDataCommand.cs +++ /dev/null @@ -1,29 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Model; -using System; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands.Buffer -{ - struct BufferGetDataCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.BufferGetData; - private BufferHandle _buffer; - private int _offset; - private int _size; - private TableRef>> _result; - - public void Set(BufferHandle buffer, int offset, int size, TableRef>> result) - { - _buffer = buffer; - _offset = offset; - _size = size; - _result = result; - } - - public static void Run(ref BufferGetDataCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - PinnedSpan result = renderer.GetBufferData(threaded.Buffers.MapBuffer(command._buffer), command._offset, command._size); - - command._result.Get(threaded).Result = result; - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/Buffer/BufferSetDataCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/Buffer/BufferSetDataCommand.cs deleted file mode 100644 index dcb8c2f2..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/Buffer/BufferSetDataCommand.cs +++ /dev/null @@ -1,27 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Model; -using System; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands.Buffer -{ - struct BufferSetDataCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.BufferSetData; - private BufferHandle _buffer; - private int _offset; - private SpanRef _data; - - public void Set(BufferHandle buffer, int offset, SpanRef data) - { - _buffer = buffer; - _offset = offset; - _data = data; - } - - public static void Run(ref BufferSetDataCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - ReadOnlySpan data = command._data.Get(threaded); - renderer.SetBufferData(threaded.Buffers.MapBuffer(command._buffer), command._offset, data); - command._data.Dispose(threaded); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/ClearBufferCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/ClearBufferCommand.cs deleted file mode 100644 index 1d70460a..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/ClearBufferCommand.cs +++ /dev/null @@ -1,24 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct ClearBufferCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.ClearBuffer; - private BufferHandle _destination; - private int _offset; - private int _size; - private uint _value; - - public void Set(BufferHandle destination, int offset, int size, uint value) - { - _destination = destination; - _offset = offset; - _size = size; - _value = value; - } - - public static void Run(ref ClearBufferCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.ClearBuffer(threaded.Buffers.MapBuffer(command._destination), command._offset, command._size, command._value); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/ClearRenderTargetColorCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/ClearRenderTargetColorCommand.cs deleted file mode 100644 index f8c2bdfe..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/ClearRenderTargetColorCommand.cs +++ /dev/null @@ -1,26 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct ClearRenderTargetColorCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.ClearRenderTargetColor; - private int _index; - private int _layer; - private int _layerCount; - private uint _componentMask; - private ColorF _color; - - public void Set(int index, int layer, int layerCount, uint componentMask, ColorF color) - { - _index = index; - _layer = layer; - _layerCount = layerCount; - _componentMask = componentMask; - _color = color; - } - - public static void Run(ref ClearRenderTargetColorCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.ClearRenderTargetColor(command._index, command._layer, command._layerCount, command._componentMask, command._color); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/ClearRenderTargetDepthStencilCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/ClearRenderTargetDepthStencilCommand.cs deleted file mode 100644 index ca86673e..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/ClearRenderTargetDepthStencilCommand.cs +++ /dev/null @@ -1,28 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct ClearRenderTargetDepthStencilCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.ClearRenderTargetDepthStencil; - private int _layer; - private int _layerCount; - private float _depthValue; - private bool _depthMask; - private int _stencilValue; - private int _stencilMask; - - public void Set(int layer, int layerCount, float depthValue, bool depthMask, int stencilValue, int stencilMask) - { - _layer = layer; - _layerCount = layerCount; - _depthValue = depthValue; - _depthMask = depthMask; - _stencilValue = stencilValue; - _stencilMask = stencilMask; - } - - public static void Run(ref ClearRenderTargetDepthStencilCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.ClearRenderTargetDepthStencil(command._layer, command._layerCount, command._depthValue, command._depthMask, command._stencilValue, command._stencilMask); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/CommandBufferBarrierCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/CommandBufferBarrierCommand.cs deleted file mode 100644 index ad3ab0f8..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/CommandBufferBarrierCommand.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct CommandBufferBarrierCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.CommandBufferBarrier; - - public static void Run(ref CommandBufferBarrierCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.CommandBufferBarrier(); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/CopyBufferCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/CopyBufferCommand.cs deleted file mode 100644 index 43111bce..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/CopyBufferCommand.cs +++ /dev/null @@ -1,26 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct CopyBufferCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.CopyBuffer; - private BufferHandle _source; - private BufferHandle _destination; - private int _srcOffset; - private int _dstOffset; - private int _size; - - public void Set(BufferHandle source, BufferHandle destination, int srcOffset, int dstOffset, int size) - { - _source = source; - _destination = destination; - _srcOffset = srcOffset; - _dstOffset = dstOffset; - _size = size; - } - - public static void Run(ref CopyBufferCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.CopyBuffer(threaded.Buffers.MapBuffer(command._source), threaded.Buffers.MapBuffer(command._destination), command._srcOffset, command._dstOffset, command._size); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/CounterEvent/CounterEventDisposeCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/CounterEvent/CounterEventDisposeCommand.cs deleted file mode 100644 index e5250212..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/CounterEvent/CounterEventDisposeCommand.cs +++ /dev/null @@ -1,21 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Model; -using Ryujinx.Graphics.GAL.Multithreading.Resources; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands.CounterEvent -{ - struct CounterEventDisposeCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.CounterEventDispose; - private TableRef _event; - - public void Set(TableRef evt) - { - _event = evt; - } - - public static void Run(ref CounterEventDisposeCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - command._event.Get(threaded).Base.Dispose(); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/CounterEvent/CounterEventFlushCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/CounterEvent/CounterEventFlushCommand.cs deleted file mode 100644 index 608cf8f9..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/CounterEvent/CounterEventFlushCommand.cs +++ /dev/null @@ -1,21 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Model; -using Ryujinx.Graphics.GAL.Multithreading.Resources; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands.CounterEvent -{ - struct CounterEventFlushCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.CounterEventFlush; - private TableRef _event; - - public void Set(TableRef evt) - { - _event = evt; - } - - public static void Run(ref CounterEventFlushCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - command._event.Get(threaded).Base.Flush(); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/DispatchComputeCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/DispatchComputeCommand.cs deleted file mode 100644 index 29568837..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/DispatchComputeCommand.cs +++ /dev/null @@ -1,22 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct DispatchComputeCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.DispatchCompute; - private int _groupsX; - private int _groupsY; - private int _groupsZ; - - public void Set(int groupsX, int groupsY, int groupsZ) - { - _groupsX = groupsX; - _groupsY = groupsY; - _groupsZ = groupsZ; - } - - public static void Run(ref DispatchComputeCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.DispatchCompute(command._groupsX, command._groupsY, command._groupsZ); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/DrawCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/DrawCommand.cs deleted file mode 100644 index 804eaa49..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/DrawCommand.cs +++ /dev/null @@ -1,26 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct DrawIndexedCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.DrawIndexed; - private int _indexCount; - private int _instanceCount; - private int _firstIndex; - private int _firstVertex; - private int _firstInstance; - - public void Set(int indexCount, int instanceCount, int firstIndex, int firstVertex, int firstInstance) - { - _indexCount = indexCount; - _instanceCount = instanceCount; - _firstIndex = firstIndex; - _firstVertex = firstVertex; - _firstInstance = firstInstance; - } - - public static void Run(ref DrawIndexedCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.DrawIndexed(command._indexCount, command._instanceCount, command._firstIndex, command._firstVertex, command._firstInstance); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/DrawIndexedCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/DrawIndexedCommand.cs deleted file mode 100644 index 1b28afcd..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/DrawIndexedCommand.cs +++ /dev/null @@ -1,24 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct DrawCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.Draw; - private int _vertexCount; - private int _instanceCount; - private int _firstVertex; - private int _firstInstance; - - public void Set(int vertexCount, int instanceCount, int firstVertex, int firstInstance) - { - _vertexCount = vertexCount; - _instanceCount = instanceCount; - _firstVertex = firstVertex; - _firstInstance = firstInstance; - } - - public static void Run(ref DrawCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.Draw(command._vertexCount, command._instanceCount, command._firstVertex, command._firstInstance); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/DrawIndexedIndirectCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/DrawIndexedIndirectCommand.cs deleted file mode 100644 index 521b2f0c..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/DrawIndexedIndirectCommand.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct DrawIndexedIndirectCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.DrawIndexedIndirect; - private BufferRange _indirectBuffer; - - public void Set(BufferRange indirectBuffer) - { - _indirectBuffer = indirectBuffer; - } - - public static void Run(ref DrawIndexedIndirectCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.DrawIndexedIndirect(threaded.Buffers.MapBufferRange(command._indirectBuffer)); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/DrawIndexedIndirectCountCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/DrawIndexedIndirectCountCommand.cs deleted file mode 100644 index 6bdf376d..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/DrawIndexedIndirectCountCommand.cs +++ /dev/null @@ -1,29 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct DrawIndexedIndirectCountCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.DrawIndexedIndirectCount; - private BufferRange _indirectBuffer; - private BufferRange _parameterBuffer; - private int _maxDrawCount; - private int _stride; - - public void Set(BufferRange indirectBuffer, BufferRange parameterBuffer, int maxDrawCount, int stride) - { - _indirectBuffer = indirectBuffer; - _parameterBuffer = parameterBuffer; - _maxDrawCount = maxDrawCount; - _stride = stride; - } - - public static void Run(ref DrawIndexedIndirectCountCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.DrawIndexedIndirectCount( - threaded.Buffers.MapBufferRange(command._indirectBuffer), - threaded.Buffers.MapBufferRange(command._parameterBuffer), - command._maxDrawCount, - command._stride - ); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/DrawIndirectCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/DrawIndirectCommand.cs deleted file mode 100644 index e1947084..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/DrawIndirectCommand.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct DrawIndirectCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.DrawIndirect; - private BufferRange _indirectBuffer; - - public void Set(BufferRange indirectBuffer) - { - _indirectBuffer = indirectBuffer; - } - - public static void Run(ref DrawIndirectCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.DrawIndirect(threaded.Buffers.MapBufferRange(command._indirectBuffer)); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/DrawIndirectCountCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/DrawIndirectCountCommand.cs deleted file mode 100644 index ef56ffb2..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/DrawIndirectCountCommand.cs +++ /dev/null @@ -1,29 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct DrawIndirectCountCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.DrawIndirectCount; - private BufferRange _indirectBuffer; - private BufferRange _parameterBuffer; - private int _maxDrawCount; - private int _stride; - - public void Set(BufferRange indirectBuffer, BufferRange parameterBuffer, int maxDrawCount, int stride) - { - _indirectBuffer = indirectBuffer; - _parameterBuffer = parameterBuffer; - _maxDrawCount = maxDrawCount; - _stride = stride; - } - - public static void Run(ref DrawIndirectCountCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.DrawIndirectCount( - threaded.Buffers.MapBufferRange(command._indirectBuffer), - threaded.Buffers.MapBufferRange(command._parameterBuffer), - command._maxDrawCount, - command._stride - ); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/DrawTextureCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/DrawTextureCommand.cs deleted file mode 100644 index b3e9c4b5..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/DrawTextureCommand.cs +++ /dev/null @@ -1,31 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Model; -using Ryujinx.Graphics.GAL.Multithreading.Resources; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct DrawTextureCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.DrawTexture; - private TableRef _texture; - private TableRef _sampler; - private Extents2DF _srcRegion; - private Extents2DF _dstRegion; - - public void Set(TableRef texture, TableRef sampler, Extents2DF srcRegion, Extents2DF dstRegion) - { - _texture = texture; - _sampler = sampler; - _srcRegion = srcRegion; - _dstRegion = dstRegion; - } - - public static void Run(ref DrawTextureCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.DrawTexture( - command._texture.GetAs(threaded)?.Base, - command._sampler.GetAs(threaded)?.Base, - command._srcRegion, - command._dstRegion); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/EndHostConditionalRenderingCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/EndHostConditionalRenderingCommand.cs deleted file mode 100644 index 877af23b..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/EndHostConditionalRenderingCommand.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct EndHostConditionalRenderingCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.EndHostConditionalRendering; - - public static void Run(ref EndHostConditionalRenderingCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.EndHostConditionalRendering(); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/EndTransformFeedbackCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/EndTransformFeedbackCommand.cs deleted file mode 100644 index 33df325f..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/EndTransformFeedbackCommand.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct EndTransformFeedbackCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.EndTransformFeedback; - - public static void Run(ref EndTransformFeedbackCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.EndTransformFeedback(); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/IGALCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/IGALCommand.cs deleted file mode 100644 index ea831c8d..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/IGALCommand.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - interface IGALCommand - { - CommandType CommandType { get; } - } - - interface IGALCommand where T : IGALCommand - { - abstract static void Run(ref T command, ThreadedRenderer threaded, IRenderer renderer); - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/Program/ProgramCheckLinkCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/Program/ProgramCheckLinkCommand.cs deleted file mode 100644 index f3662424..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/Program/ProgramCheckLinkCommand.cs +++ /dev/null @@ -1,27 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Model; -using Ryujinx.Graphics.GAL.Multithreading.Resources; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands.Program -{ - struct ProgramCheckLinkCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.ProgramCheckLink; - private TableRef _program; - private bool _blocking; - private TableRef> _result; - - public void Set(TableRef program, bool blocking, TableRef> result) - { - _program = program; - _blocking = blocking; - _result = result; - } - - public static void Run(ref ProgramCheckLinkCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - ProgramLinkStatus result = command._program.Get(threaded).Base.CheckProgramLink(command._blocking); - - command._result.Get(threaded).Result = result; - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/Program/ProgramDisposeCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/Program/ProgramDisposeCommand.cs deleted file mode 100644 index d1ec4298..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/Program/ProgramDisposeCommand.cs +++ /dev/null @@ -1,21 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Model; -using Ryujinx.Graphics.GAL.Multithreading.Resources; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands.Program -{ - struct ProgramDisposeCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.ProgramDispose; - private TableRef _program; - - public void Set(TableRef program) - { - _program = program; - } - - public static void Run(ref ProgramDisposeCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - command._program.Get(threaded).Base.Dispose(); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/Program/ProgramGetBinaryCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/Program/ProgramGetBinaryCommand.cs deleted file mode 100644 index 16963245..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/Program/ProgramGetBinaryCommand.cs +++ /dev/null @@ -1,25 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Model; -using Ryujinx.Graphics.GAL.Multithreading.Resources; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands.Program -{ - struct ProgramGetBinaryCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.ProgramGetBinary; - private TableRef _program; - private TableRef> _result; - - public void Set(TableRef program, TableRef> result) - { - _program = program; - _result = result; - } - - public static void Run(ref ProgramGetBinaryCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - byte[] result = command._program.Get(threaded).Base.GetBinary(); - - command._result.Get(threaded).Result = result; - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/ActionCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/ActionCommand.cs deleted file mode 100644 index 41987da1..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/ActionCommand.cs +++ /dev/null @@ -1,21 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Model; -using System; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands.Renderer -{ - struct ActionCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.Action; - private TableRef _action; - - public void Set(TableRef action) - { - _action = action; - } - - public static void Run(ref ActionCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - command._action.Get(threaded)(); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/CreateBufferCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/CreateBufferCommand.cs deleted file mode 100644 index b36d8bbe..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/CreateBufferCommand.cs +++ /dev/null @@ -1,29 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands.Renderer -{ - struct CreateBufferCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.CreateBuffer; - private BufferHandle _threadedHandle; - private int _size; - private BufferHandle _storageHint; - - public void Set(BufferHandle threadedHandle, int size, BufferHandle storageHint) - { - _threadedHandle = threadedHandle; - _size = size; - _storageHint = storageHint; - } - - public static void Run(ref CreateBufferCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - BufferHandle hint = BufferHandle.Null; - - if (command._storageHint != BufferHandle.Null) - { - hint = threaded.Buffers.MapBuffer(command._storageHint); - } - - threaded.Buffers.AssignBuffer(command._threadedHandle, renderer.CreateBuffer(command._size, hint)); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/CreateProgramCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/CreateProgramCommand.cs deleted file mode 100644 index 19563e12..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/CreateProgramCommand.cs +++ /dev/null @@ -1,28 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Model; -using Ryujinx.Graphics.GAL.Multithreading.Resources.Programs; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands.Renderer -{ - struct CreateProgramCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.CreateProgram; - private TableRef _request; - - public void Set(TableRef request) - { - _request = request; - } - - public static void Run(ref CreateProgramCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - IProgramRequest request = command._request.Get(threaded); - - if (request.Threaded.Base == null) - { - request.Threaded.Base = request.Create(renderer); - } - - threaded.Programs.ProcessQueue(); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/CreateSamplerCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/CreateSamplerCommand.cs deleted file mode 100644 index 6ab862d4..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/CreateSamplerCommand.cs +++ /dev/null @@ -1,23 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Model; -using Ryujinx.Graphics.GAL.Multithreading.Resources; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands.Renderer -{ - struct CreateSamplerCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.CreateSampler; - private TableRef _sampler; - private SamplerCreateInfo _info; - - public void Set(TableRef sampler, SamplerCreateInfo info) - { - _sampler = sampler; - _info = info; - } - - public static void Run(ref CreateSamplerCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - command._sampler.Get(threaded).Base = renderer.CreateSampler(command._info); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/CreateSyncCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/CreateSyncCommand.cs deleted file mode 100644 index 32afb051..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/CreateSyncCommand.cs +++ /dev/null @@ -1,22 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands.Renderer -{ - struct CreateSyncCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.CreateSync; - private ulong _id; - private bool _strict; - - public void Set(ulong id, bool strict) - { - _id = id; - _strict = strict; - } - - public static void Run(ref CreateSyncCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.CreateSync(command._id, command._strict); - - threaded.Sync.AssignSync(command._id); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/CreateTextureCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/CreateTextureCommand.cs deleted file mode 100644 index 0347ded4..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/CreateTextureCommand.cs +++ /dev/null @@ -1,25 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Model; -using Ryujinx.Graphics.GAL.Multithreading.Resources; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands.Renderer -{ - struct CreateTextureCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.CreateTexture; - private TableRef _texture; - private TextureCreateInfo _info; - private float _scale; - - public void Set(TableRef texture, TextureCreateInfo info, float scale) - { - _texture = texture; - _info = info; - _scale = scale; - } - - public static void Run(ref CreateTextureCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - command._texture.Get(threaded).Base = renderer.CreateTexture(command._info, command._scale); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/GetCapabilitiesCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/GetCapabilitiesCommand.cs deleted file mode 100644 index 4111dcfd..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/GetCapabilitiesCommand.cs +++ /dev/null @@ -1,20 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Model; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands.Renderer -{ - struct GetCapabilitiesCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.GetCapabilities; - private TableRef> _result; - - public void Set(TableRef> result) - { - _result = result; - } - - public static void Run(ref GetCapabilitiesCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - command._result.Get(threaded).Result = renderer.GetCapabilities(); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/PreFrameCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/PreFrameCommand.cs deleted file mode 100644 index 820908f3..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/PreFrameCommand.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands.Renderer -{ - struct PreFrameCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.PreFrame; - - public static void Run(ref PreFrameCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.PreFrame(); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/ReportCounterCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/ReportCounterCommand.cs deleted file mode 100644 index 4b0210cb..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/ReportCounterCommand.cs +++ /dev/null @@ -1,30 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Model; -using Ryujinx.Graphics.GAL.Multithreading.Resources; -using System; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands.Renderer -{ - struct ReportCounterCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.ReportCounter; - private TableRef _event; - private CounterType _type; - private TableRef> _resultHandler; - private bool _hostReserved; - - public void Set(TableRef evt, CounterType type, TableRef> resultHandler, bool hostReserved) - { - _event = evt; - _type = type; - _resultHandler = resultHandler; - _hostReserved = hostReserved; - } - - public static void Run(ref ReportCounterCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - ThreadedCounterEvent evt = command._event.Get(threaded); - - evt.Create(renderer, command._type, command._resultHandler.Get(threaded), command._hostReserved); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/ResetCounterCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/ResetCounterCommand.cs deleted file mode 100644 index 3d796041..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/ResetCounterCommand.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands.Renderer -{ - struct ResetCounterCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.ResetCounter; - private CounterType _type; - - public void Set(CounterType type) - { - _type = type; - } - - public static void Run(ref ResetCounterCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.ResetCounter(command._type); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/UpdateCountersCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/UpdateCountersCommand.cs deleted file mode 100644 index c7076c0e..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/Renderer/UpdateCountersCommand.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands.Renderer -{ - struct UpdateCountersCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.UpdateCounters; - - public static void Run(ref UpdateCountersCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.UpdateCounters(); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/Sampler/SamplerDisposeCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/Sampler/SamplerDisposeCommand.cs deleted file mode 100644 index 9485e9a1..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/Sampler/SamplerDisposeCommand.cs +++ /dev/null @@ -1,21 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Model; -using Ryujinx.Graphics.GAL.Multithreading.Resources; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands.Sampler -{ - struct SamplerDisposeCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.SamplerDispose; - private TableRef _sampler; - - public void Set(TableRef sampler) - { - _sampler = sampler; - } - - public static void Run(ref SamplerDisposeCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - command._sampler.Get(threaded).Base.Dispose(); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetAlphaTestCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/SetAlphaTestCommand.cs deleted file mode 100644 index a96879ff..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetAlphaTestCommand.cs +++ /dev/null @@ -1,22 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct SetAlphaTestCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.SetAlphaTest; - private bool _enable; - private float _reference; - private CompareOp _op; - - public void Set(bool enable, float reference, CompareOp op) - { - _enable = enable; - _reference = reference; - _op = op; - } - - public static void Run(ref SetAlphaTestCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.SetAlphaTest(command._enable, command._reference, command._op); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetBlendStateAdvancedCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/SetBlendStateAdvancedCommand.cs deleted file mode 100644 index 2ec10a50..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetBlendStateAdvancedCommand.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct SetBlendStateAdvancedCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.SetBlendStateAdvanced; - private AdvancedBlendDescriptor _blend; - - public void Set(AdvancedBlendDescriptor blend) - { - _blend = blend; - } - - public static void Run(ref SetBlendStateAdvancedCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.SetBlendState(command._blend); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetBlendStateCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/SetBlendStateCommand.cs deleted file mode 100644 index 68e48da5..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetBlendStateCommand.cs +++ /dev/null @@ -1,20 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct SetBlendStateCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.SetBlendState; - private int _index; - private BlendDescriptor _blend; - - public void Set(int index, BlendDescriptor blend) - { - _index = index; - _blend = blend; - } - - public static void Run(ref SetBlendStateCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.SetBlendState(command._index, command._blend); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetDepthBiasCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/SetDepthBiasCommand.cs deleted file mode 100644 index eb8d4a72..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetDepthBiasCommand.cs +++ /dev/null @@ -1,24 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct SetDepthBiasCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.SetDepthBias; - private PolygonModeMask _enables; - private float _factor; - private float _units; - private float _clamp; - - public void Set(PolygonModeMask enables, float factor, float units, float clamp) - { - _enables = enables; - _factor = factor; - _units = units; - _clamp = clamp; - } - - public static void Run(ref SetDepthBiasCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.SetDepthBias(command._enables, command._factor, command._units, command._clamp); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetDepthClampCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/SetDepthClampCommand.cs deleted file mode 100644 index 15159cb4..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetDepthClampCommand.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct SetDepthClampCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.SetDepthClamp; - private bool _clamp; - - public void Set(bool clamp) - { - _clamp = clamp; - } - - public static void Run(ref SetDepthClampCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.SetDepthClamp(command._clamp); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetDepthModeCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/SetDepthModeCommand.cs deleted file mode 100644 index 3e169164..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetDepthModeCommand.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct SetDepthModeCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.SetDepthMode; - private DepthMode _mode; - - public void Set(DepthMode mode) - { - _mode = mode; - } - - public static void Run(ref SetDepthModeCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.SetDepthMode(command._mode); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetDepthTestCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/SetDepthTestCommand.cs deleted file mode 100644 index 2abaeb78..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetDepthTestCommand.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct SetDepthTestCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.SetDepthTest; - private DepthTestDescriptor _depthTest; - - public void Set(DepthTestDescriptor depthTest) - { - _depthTest = depthTest; - } - - public static void Run(ref SetDepthTestCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.SetDepthTest(command._depthTest); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetFaceCullingCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/SetFaceCullingCommand.cs deleted file mode 100644 index 54311e95..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetFaceCullingCommand.cs +++ /dev/null @@ -1,20 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct SetFaceCullingCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.SetFaceCulling; - private bool _enable; - private Face _face; - - public void Set(bool enable, Face face) - { - _enable = enable; - _face = face; - } - - public static void Run(ref SetFaceCullingCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.SetFaceCulling(command._enable, command._face); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetFrontFaceCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/SetFrontFaceCommand.cs deleted file mode 100644 index e4d7b814..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetFrontFaceCommand.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct SetFrontFaceCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.SetFrontFace; - private FrontFace _frontFace; - - public void Set(FrontFace frontFace) - { - _frontFace = frontFace; - } - - public static void Run(ref SetFrontFaceCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.SetFrontFace(command._frontFace); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetImageCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/SetImageCommand.cs deleted file mode 100644 index 7836acd7..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetImageCommand.cs +++ /dev/null @@ -1,25 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Model; -using Ryujinx.Graphics.GAL.Multithreading.Resources; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct SetImageCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.SetImage; - private int _binding; - private TableRef _texture; - private Format _imageFormat; - - public void Set(int binding, TableRef texture, Format imageFormat) - { - _binding = binding; - _texture = texture; - _imageFormat = imageFormat; - } - - public static void Run(ref SetImageCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.SetImage(command._binding, command._texture.GetAs(threaded)?.Base, command._imageFormat); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetIndexBufferCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/SetIndexBufferCommand.cs deleted file mode 100644 index ded44c55..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetIndexBufferCommand.cs +++ /dev/null @@ -1,21 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct SetIndexBufferCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.SetIndexBuffer; - private BufferRange _buffer; - private IndexType _type; - - public void Set(BufferRange buffer, IndexType type) - { - _buffer = buffer; - _type = type; - } - - public static void Run(ref SetIndexBufferCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - BufferRange range = threaded.Buffers.MapBufferRange(command._buffer); - renderer.Pipeline.SetIndexBuffer(range, command._type); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetLineParametersCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/SetLineParametersCommand.cs deleted file mode 100644 index 68331932..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetLineParametersCommand.cs +++ /dev/null @@ -1,20 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct SetLineParametersCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.SetLineParameters; - private float _width; - private bool _smooth; - - public void Set(float width, bool smooth) - { - _width = width; - _smooth = smooth; - } - - public static void Run(ref SetLineParametersCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.SetLineParameters(command._width, command._smooth); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetLogicOpStateCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/SetLogicOpStateCommand.cs deleted file mode 100644 index 2d7fc169..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetLogicOpStateCommand.cs +++ /dev/null @@ -1,20 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct SetLogicOpStateCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.SetLogicOpState; - private bool _enable; - private LogicalOp _op; - - public void Set(bool enable, LogicalOp op) - { - _enable = enable; - _op = op; - } - - public static void Run(ref SetLogicOpStateCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.SetLogicOpState(command._enable, command._op); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetMultisampleStateCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/SetMultisampleStateCommand.cs deleted file mode 100644 index f7b4969a..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetMultisampleStateCommand.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct SetMultisampleStateCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.SetMultisampleState; - private MultisampleDescriptor _multisample; - - public void Set(MultisampleDescriptor multisample) - { - _multisample = multisample; - } - - public static void Run(ref SetMultisampleStateCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.SetMultisampleState(command._multisample); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetPatchParametersCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/SetPatchParametersCommand.cs deleted file mode 100644 index 815bc3c2..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetPatchParametersCommand.cs +++ /dev/null @@ -1,25 +0,0 @@ -using Ryujinx.Common.Memory; -using System; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct SetPatchParametersCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.SetPatchParameters; - private int _vertices; - private Array4 _defaultOuterLevel; - private Array2 _defaultInnerLevel; - - public void Set(int vertices, ReadOnlySpan defaultOuterLevel, ReadOnlySpan defaultInnerLevel) - { - _vertices = vertices; - defaultOuterLevel.CopyTo(_defaultOuterLevel.AsSpan()); - defaultInnerLevel.CopyTo(_defaultInnerLevel.AsSpan()); - } - - public static void Run(ref SetPatchParametersCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.SetPatchParameters(command._vertices, command._defaultOuterLevel.AsSpan(), command._defaultInnerLevel.AsSpan()); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetPointParametersCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/SetPointParametersCommand.cs deleted file mode 100644 index e3fad0f8..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetPointParametersCommand.cs +++ /dev/null @@ -1,24 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct SetPointParametersCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.SetPointParameters; - private float _size; - private bool _isProgramPointSize; - private bool _enablePointSprite; - private Origin _origin; - - public void Set(float size, bool isProgramPointSize, bool enablePointSprite, Origin origin) - { - _size = size; - _isProgramPointSize = isProgramPointSize; - _enablePointSprite = enablePointSprite; - _origin = origin; - } - - public static void Run(ref SetPointParametersCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.SetPointParameters(command._size, command._isProgramPointSize, command._enablePointSprite, command._origin); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetPolygonModeCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/SetPolygonModeCommand.cs deleted file mode 100644 index ea2f838b..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetPolygonModeCommand.cs +++ /dev/null @@ -1,20 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct SetPolygonModeCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.SetPolygonMode; - private PolygonMode _frontMode; - private PolygonMode _backMode; - - public void Set(PolygonMode frontMode, PolygonMode backMode) - { - _frontMode = frontMode; - _backMode = backMode; - } - - public static void Run(ref SetPolygonModeCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.SetPolygonMode(command._frontMode, command._backMode); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetPrimitiveRestartCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/SetPrimitiveRestartCommand.cs deleted file mode 100644 index 26b88b01..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetPrimitiveRestartCommand.cs +++ /dev/null @@ -1,20 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct SetPrimitiveRestartCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.SetPrimitiveRestart; - private bool _enable; - private int _index; - - public void Set(bool enable, int index) - { - _enable = enable; - _index = index; - } - - public static void Run(ref SetPrimitiveRestartCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.SetPrimitiveRestart(command._enable, command._index); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetPrimitiveTopologyCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/SetPrimitiveTopologyCommand.cs deleted file mode 100644 index 062c4e57..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetPrimitiveTopologyCommand.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct SetPrimitiveTopologyCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.SetPrimitiveTopology; - private PrimitiveTopology _topology; - - public void Set(PrimitiveTopology topology) - { - _topology = topology; - } - - public static void Run(ref SetPrimitiveTopologyCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.SetPrimitiveTopology(command._topology); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetProgramCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/SetProgramCommand.cs deleted file mode 100644 index fa2e9a8a..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetProgramCommand.cs +++ /dev/null @@ -1,25 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Model; -using Ryujinx.Graphics.GAL.Multithreading.Resources; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct SetProgramCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.SetProgram; - private TableRef _program; - - public void Set(TableRef program) - { - _program = program; - } - - public static void Run(ref SetProgramCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - ThreadedProgram program = command._program.GetAs(threaded); - - threaded.Programs.WaitForProgram(program); - - renderer.Pipeline.SetProgram(program.Base); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetRasterizerDiscardCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/SetRasterizerDiscardCommand.cs deleted file mode 100644 index d2095a4f..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetRasterizerDiscardCommand.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct SetRasterizerDiscardCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.SetRasterizerDiscard; - private bool _discard; - - public void Set(bool discard) - { - _discard = discard; - } - - public static void Run(ref SetRasterizerDiscardCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.SetRasterizerDiscard(command._discard); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetRenderTargetColorMasksCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/SetRenderTargetColorMasksCommand.cs deleted file mode 100644 index c247ff3a..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetRenderTargetColorMasksCommand.cs +++ /dev/null @@ -1,23 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Model; -using System; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct SetRenderTargetColorMasksCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.SetRenderTargetColorMasks; - private SpanRef _componentMask; - - public void Set(SpanRef componentMask) - { - _componentMask = componentMask; - } - - public static void Run(ref SetRenderTargetColorMasksCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - ReadOnlySpan componentMask = command._componentMask.Get(threaded); - renderer.Pipeline.SetRenderTargetColorMasks(componentMask); - command._componentMask.Dispose(threaded); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetRenderTargetScaleCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/SetRenderTargetScaleCommand.cs deleted file mode 100644 index 7cb5ec11..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetRenderTargetScaleCommand.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct SetRenderTargetScaleCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.SetRenderTargetScale; - private float _scale; - - public void Set(float scale) - { - _scale = scale; - } - - public static void Run(ref SetRenderTargetScaleCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.SetRenderTargetScale(command._scale); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetRenderTargetsCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/SetRenderTargetsCommand.cs deleted file mode 100644 index 0b175a72..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetRenderTargetsCommand.cs +++ /dev/null @@ -1,24 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Model; -using Ryujinx.Graphics.GAL.Multithreading.Resources; -using System.Linq; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct SetRenderTargetsCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.SetRenderTargets; - private TableRef _colors; - private TableRef _depthStencil; - - public void Set(TableRef colors, TableRef depthStencil) - { - _colors = colors; - _depthStencil = depthStencil; - } - - public static void Run(ref SetRenderTargetsCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.SetRenderTargets(command._colors.Get(threaded).Select(color => ((ThreadedTexture)color)?.Base).ToArray(), command._depthStencil.GetAs(threaded)?.Base); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetScissorsCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/SetScissorsCommand.cs deleted file mode 100644 index 985d775e..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetScissorsCommand.cs +++ /dev/null @@ -1,22 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Model; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct SetScissorsCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.SetScissor; - private SpanRef> _scissors; - - public void Set(SpanRef> scissors) - { - _scissors = scissors; - } - - public static void Run(ref SetScissorsCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.SetScissors(command._scissors.Get(threaded)); - - command._scissors.Dispose(threaded); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetStencilTestCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/SetStencilTestCommand.cs deleted file mode 100644 index 41bff97e..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetStencilTestCommand.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct SetStencilTestCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.SetStencilTest; - private StencilTestDescriptor _stencilTest; - - public void Set(StencilTestDescriptor stencilTest) - { - _stencilTest = stencilTest; - } - - public static void Run(ref SetStencilTestCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.SetStencilTest(command._stencilTest); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetStorageBuffersCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/SetStorageBuffersCommand.cs deleted file mode 100644 index 6ecb0989..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetStorageBuffersCommand.cs +++ /dev/null @@ -1,23 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Model; -using System; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct SetStorageBuffersCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.SetStorageBuffers; - private SpanRef _buffers; - - public void Set(SpanRef buffers) - { - _buffers = buffers; - } - - public static void Run(ref SetStorageBuffersCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - Span buffers = command._buffers.Get(threaded); - renderer.Pipeline.SetStorageBuffers(threaded.Buffers.MapBufferRanges(buffers)); - command._buffers.Dispose(threaded); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetTextureAndSamplerCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/SetTextureAndSamplerCommand.cs deleted file mode 100644 index 5e8e0854..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetTextureAndSamplerCommand.cs +++ /dev/null @@ -1,28 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Model; -using Ryujinx.Graphics.GAL.Multithreading.Resources; -using Ryujinx.Graphics.Shader; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct SetTextureAndSamplerCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.SetTextureAndSampler; - private ShaderStage _stage; - private int _binding; - private TableRef _texture; - private TableRef _sampler; - - public void Set(ShaderStage stage, int binding, TableRef texture, TableRef sampler) - { - _stage = stage; - _binding = binding; - _texture = texture; - _sampler = sampler; - } - - public static void Run(ref SetTextureAndSamplerCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.SetTextureAndSampler(command._stage, command._binding, command._texture.GetAs(threaded)?.Base, command._sampler.GetAs(threaded)?.Base); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetTransformFeedbackBuffersCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/SetTransformFeedbackBuffersCommand.cs deleted file mode 100644 index e0d4ef2d..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetTransformFeedbackBuffersCommand.cs +++ /dev/null @@ -1,23 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Model; -using System; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct SetTransformFeedbackBuffersCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.SetTransformFeedbackBuffers; - private SpanRef _buffers; - - public void Set(SpanRef buffers) - { - _buffers = buffers; - } - - public static void Run(ref SetTransformFeedbackBuffersCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - Span buffers = command._buffers.Get(threaded); - renderer.Pipeline.SetTransformFeedbackBuffers(threaded.Buffers.MapBufferRanges(buffers)); - command._buffers.Dispose(threaded); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetUniformBuffersCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/SetUniformBuffersCommand.cs deleted file mode 100644 index 9e93db9e..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetUniformBuffersCommand.cs +++ /dev/null @@ -1,23 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Model; -using System; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct SetUniformBuffersCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.SetUniformBuffers; - private SpanRef _buffers; - - public void Set(SpanRef buffers) - { - _buffers = buffers; - } - - public static void Run(ref SetUniformBuffersCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - Span buffers = command._buffers.Get(threaded); - renderer.Pipeline.SetUniformBuffers(threaded.Buffers.MapBufferRanges(buffers)); - command._buffers.Dispose(threaded); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetUserClipDistanceCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/SetUserClipDistanceCommand.cs deleted file mode 100644 index 4336ce49..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetUserClipDistanceCommand.cs +++ /dev/null @@ -1,20 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct SetUserClipDistanceCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.SetUserClipDistance; - private int _index; - private bool _enableClip; - - public void Set(int index, bool enableClip) - { - _index = index; - _enableClip = enableClip; - } - - public static void Run(ref SetUserClipDistanceCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.SetUserClipDistance(command._index, command._enableClip); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetVertexAttribsCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/SetVertexAttribsCommand.cs deleted file mode 100644 index e442c72d..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetVertexAttribsCommand.cs +++ /dev/null @@ -1,23 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Model; -using System; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct SetVertexAttribsCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.SetVertexAttribs; - private SpanRef _vertexAttribs; - - public void Set(SpanRef vertexAttribs) - { - _vertexAttribs = vertexAttribs; - } - - public static void Run(ref SetVertexAttribsCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - ReadOnlySpan vertexAttribs = command._vertexAttribs.Get(threaded); - renderer.Pipeline.SetVertexAttribs(vertexAttribs); - command._vertexAttribs.Dispose(threaded); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetVertexBuffersCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/SetVertexBuffersCommand.cs deleted file mode 100644 index 585da2a4..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetVertexBuffersCommand.cs +++ /dev/null @@ -1,23 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Model; -using System; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct SetVertexBuffersCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.SetVertexBuffers; - private SpanRef _vertexBuffers; - - public void Set(SpanRef vertexBuffers) - { - _vertexBuffers = vertexBuffers; - } - - public static void Run(ref SetVertexBuffersCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - Span vertexBuffers = command._vertexBuffers.Get(threaded); - renderer.Pipeline.SetVertexBuffers(threaded.Buffers.MapBufferRanges(vertexBuffers)); - command._vertexBuffers.Dispose(threaded); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetViewportsCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/SetViewportsCommand.cs deleted file mode 100644 index c18bd811..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/SetViewportsCommand.cs +++ /dev/null @@ -1,25 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Model; -using System; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct SetViewportsCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.SetViewports; - private SpanRef _viewports; - private bool _disableTransform; - - public void Set(SpanRef viewports, bool disableTransform) - { - _viewports = viewports; - _disableTransform = disableTransform; - } - - public static void Run(ref SetViewportsCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - ReadOnlySpan viewports = command._viewports.Get(threaded); - renderer.Pipeline.SetViewports(viewports, command._disableTransform); - command._viewports.Dispose(threaded); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureCopyToCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureCopyToCommand.cs deleted file mode 100644 index 02d0b639..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureCopyToCommand.cs +++ /dev/null @@ -1,28 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Model; -using Ryujinx.Graphics.GAL.Multithreading.Resources; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands.Texture -{ - struct TextureCopyToCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.TextureCopyTo; - private TableRef _texture; - private TableRef _destination; - private int _firstLayer; - private int _firstLevel; - - public void Set(TableRef texture, TableRef destination, int firstLayer, int firstLevel) - { - _texture = texture; - _destination = destination; - _firstLayer = firstLayer; - _firstLevel = firstLevel; - } - - public static void Run(ref TextureCopyToCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - ThreadedTexture source = command._texture.Get(threaded); - source.Base.CopyTo(command._destination.Get(threaded).Base, command._firstLayer, command._firstLevel); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureCopyToScaledCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureCopyToScaledCommand.cs deleted file mode 100644 index 6b83d3f8..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureCopyToScaledCommand.cs +++ /dev/null @@ -1,30 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Model; -using Ryujinx.Graphics.GAL.Multithreading.Resources; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands.Texture -{ - struct TextureCopyToScaledCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.TextureCopyToScaled; - private TableRef _texture; - private TableRef _destination; - private Extents2D _srcRegion; - private Extents2D _dstRegion; - private bool _linearFilter; - - public void Set(TableRef texture, TableRef destination, Extents2D srcRegion, Extents2D dstRegion, bool linearFilter) - { - _texture = texture; - _destination = destination; - _srcRegion = srcRegion; - _dstRegion = dstRegion; - _linearFilter = linearFilter; - } - - public static void Run(ref TextureCopyToScaledCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - ThreadedTexture source = command._texture.Get(threaded); - source.Base.CopyTo(command._destination.Get(threaded).Base, command._srcRegion, command._dstRegion, command._linearFilter); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureCopyToSliceCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureCopyToSliceCommand.cs deleted file mode 100644 index 2a340a70..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureCopyToSliceCommand.cs +++ /dev/null @@ -1,32 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Model; -using Ryujinx.Graphics.GAL.Multithreading.Resources; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands.Texture -{ - struct TextureCopyToSliceCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.TextureCopyToSlice; - private TableRef _texture; - private TableRef _destination; - private int _srcLayer; - private int _dstLayer; - private int _srcLevel; - private int _dstLevel; - - public void Set(TableRef texture, TableRef destination, int srcLayer, int dstLayer, int srcLevel, int dstLevel) - { - _texture = texture; - _destination = destination; - _srcLayer = srcLayer; - _dstLayer = dstLayer; - _srcLevel = srcLevel; - _dstLevel = dstLevel; - } - - public static void Run(ref TextureCopyToSliceCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - ThreadedTexture source = command._texture.Get(threaded); - source.Base.CopyTo(command._destination.Get(threaded).Base, command._srcLayer, command._dstLayer, command._srcLevel, command._dstLevel); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureCreateViewCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureCreateViewCommand.cs deleted file mode 100644 index 09e9ca2f..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureCreateViewCommand.cs +++ /dev/null @@ -1,30 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Model; -using Ryujinx.Graphics.GAL.Multithreading.Resources; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands.Texture -{ - struct TextureCreateViewCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.TextureCreateView; - private TableRef _texture; - private TableRef _destination; - private TextureCreateInfo _info; - private int _firstLayer; - private int _firstLevel; - - public void Set(TableRef texture, TableRef destination, TextureCreateInfo info, int firstLayer, int firstLevel) - { - _texture = texture; - _destination = destination; - _info = info; - _firstLayer = firstLayer; - _firstLevel = firstLevel; - } - - public static void Run(ref TextureCreateViewCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - ThreadedTexture source = command._texture.Get(threaded); - command._destination.Get(threaded).Base = source.Base.CreateView(command._info, command._firstLayer, command._firstLevel); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureGetDataCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureGetDataCommand.cs deleted file mode 100644 index 91320d45..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureGetDataCommand.cs +++ /dev/null @@ -1,26 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Model; -using Ryujinx.Graphics.GAL.Multithreading.Resources; -using System; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands.Texture -{ - struct TextureGetDataCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.TextureGetData; - private TableRef _texture; - private TableRef>> _result; - - public void Set(TableRef texture, TableRef>> result) - { - _texture = texture; - _result = result; - } - - public static void Run(ref TextureGetDataCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - PinnedSpan result = command._texture.Get(threaded).Base.GetData(); - - command._result.Get(threaded).Result = result; - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureGetDataSliceCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureGetDataSliceCommand.cs deleted file mode 100644 index ec06cc4d..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureGetDataSliceCommand.cs +++ /dev/null @@ -1,30 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Model; -using Ryujinx.Graphics.GAL.Multithreading.Resources; -using System; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands.Texture -{ - struct TextureGetDataSliceCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.TextureGetDataSlice; - private TableRef _texture; - private TableRef>> _result; - private int _layer; - private int _level; - - public void Set(TableRef texture, TableRef>> result, int layer, int level) - { - _texture = texture; - _result = result; - _layer = layer; - _level = level; - } - - public static void Run(ref TextureGetDataSliceCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - PinnedSpan result = command._texture.Get(threaded).Base.GetData(command._layer, command._level); - - command._result.Get(threaded).Result = result; - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureReleaseCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureReleaseCommand.cs deleted file mode 100644 index 61486e09..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureReleaseCommand.cs +++ /dev/null @@ -1,21 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Model; -using Ryujinx.Graphics.GAL.Multithreading.Resources; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands.Texture -{ - struct TextureReleaseCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.TextureRelease; - private TableRef _texture; - - public void Set(TableRef texture) - { - _texture = texture; - } - - public static void Run(ref TextureReleaseCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - command._texture.Get(threaded).Base.Release(); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureSetDataCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureSetDataCommand.cs deleted file mode 100644 index cfbaffd3..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureSetDataCommand.cs +++ /dev/null @@ -1,25 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Model; -using Ryujinx.Graphics.GAL.Multithreading.Resources; -using System; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands.Texture -{ - struct TextureSetDataCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.TextureSetData; - private TableRef _texture; - private TableRef _data; - - public void Set(TableRef texture, TableRef data) - { - _texture = texture; - _data = data; - } - - public static void Run(ref TextureSetDataCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - ThreadedTexture texture = command._texture.Get(threaded); - texture.Base.SetData(new ReadOnlySpan(command._data.Get(threaded))); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureSetDataSliceCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureSetDataSliceCommand.cs deleted file mode 100644 index a7126f61..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureSetDataSliceCommand.cs +++ /dev/null @@ -1,29 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Model; -using Ryujinx.Graphics.GAL.Multithreading.Resources; -using System; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands.Texture -{ - struct TextureSetDataSliceCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.TextureSetDataSlice; - private TableRef _texture; - private TableRef _data; - private int _layer; - private int _level; - - public void Set(TableRef texture, TableRef data, int layer, int level) - { - _texture = texture; - _data = data; - _layer = layer; - _level = level; - } - - public static void Run(ref TextureSetDataSliceCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - ThreadedTexture texture = command._texture.Get(threaded); - texture.Base.SetData(new ReadOnlySpan(command._data.Get(threaded)), command._layer, command._level); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureSetDataSliceRegionCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureSetDataSliceRegionCommand.cs deleted file mode 100644 index 4df83e08..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureSetDataSliceRegionCommand.cs +++ /dev/null @@ -1,31 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Model; -using Ryujinx.Graphics.GAL.Multithreading.Resources; -using System; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands.Texture -{ - struct TextureSetDataSliceRegionCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.TextureSetDataSliceRegion; - private TableRef _texture; - private TableRef _data; - private int _layer; - private int _level; - private Rectangle _region; - - public void Set(TableRef texture, TableRef data, int layer, int level, Rectangle region) - { - _texture = texture; - _data = data; - _layer = layer; - _level = level; - _region = region; - } - - public static void Run(ref TextureSetDataSliceRegionCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - ThreadedTexture texture = command._texture.Get(threaded); - texture.Base.SetData(new ReadOnlySpan(command._data.Get(threaded)), command._layer, command._level, command._region); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureSetStorageCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureSetStorageCommand.cs deleted file mode 100644 index 2a1943a9..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureSetStorageCommand.cs +++ /dev/null @@ -1,23 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Model; -using Ryujinx.Graphics.GAL.Multithreading.Resources; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands.Texture -{ - struct TextureSetStorageCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.TextureSetStorage; - private TableRef _texture; - private BufferRange _storage; - - public void Set(TableRef texture, BufferRange storage) - { - _texture = texture; - _storage = storage; - } - - public static void Run(ref TextureSetStorageCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - command._texture.Get(threaded).Base.SetStorage(threaded.Buffers.MapBufferRange(command._storage)); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/TextureBarrierCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/TextureBarrierCommand.cs deleted file mode 100644 index ce1a83a7..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/TextureBarrierCommand.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct TextureBarrierCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.TextureBarrier; - - public static void Run(ref TextureBarrierCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.TextureBarrier(); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/TextureBarrierTiledCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/TextureBarrierTiledCommand.cs deleted file mode 100644 index c65ffe2e..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/TextureBarrierTiledCommand.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct TextureBarrierTiledCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.TextureBarrierTiled; - - public static void Run(ref TextureBarrierTiledCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.TextureBarrierTiled(); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/TryHostConditionalRenderingCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/TryHostConditionalRenderingCommand.cs deleted file mode 100644 index 9124ca1f..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/TryHostConditionalRenderingCommand.cs +++ /dev/null @@ -1,25 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Model; -using Ryujinx.Graphics.GAL.Multithreading.Resources; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct TryHostConditionalRenderingCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.TryHostConditionalRendering; - private TableRef _value; - private ulong _compare; - private bool _isEqual; - - public void Set(TableRef value, ulong compare, bool isEqual) - { - _value = value; - _compare = compare; - _isEqual = isEqual; - } - - public static void Run(ref TryHostConditionalRenderingCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.TryHostConditionalRendering(command._value.Get(threaded)?.Base, command._compare, command._isEqual); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/TryHostConditionalRenderingFlushCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/TryHostConditionalRenderingFlushCommand.cs deleted file mode 100644 index a5d07640..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/TryHostConditionalRenderingFlushCommand.cs +++ /dev/null @@ -1,25 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Model; -using Ryujinx.Graphics.GAL.Multithreading.Resources; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct TryHostConditionalRenderingFlushCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.TryHostConditionalRenderingFlush; - private TableRef _value; - private TableRef _compare; - private bool _isEqual; - - public void Set(TableRef value, TableRef compare, bool isEqual) - { - _value = value; - _compare = compare; - _isEqual = isEqual; - } - - public static void Run(ref TryHostConditionalRenderingFlushCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.TryHostConditionalRendering(command._value.Get(threaded)?.Base, command._compare.Get(threaded)?.Base, command._isEqual); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/UpdateRenderScaleCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/UpdateRenderScaleCommand.cs deleted file mode 100644 index ebe14150..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/UpdateRenderScaleCommand.cs +++ /dev/null @@ -1,25 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Model; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands -{ - struct UpdateRenderScaleCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.UpdateRenderScale; - private SpanRef _scales; - private int _totalCount; - private int _fragmentCount; - - public void Set(SpanRef scales, int totalCount, int fragmentCount) - { - _scales = scales; - _totalCount = totalCount; - _fragmentCount = fragmentCount; - } - - public static void Run(ref UpdateRenderScaleCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - renderer.Pipeline.UpdateRenderScale(command._scales.Get(threaded), command._totalCount, command._fragmentCount); - command._scales.Dispose(threaded); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Commands/Window/WindowPresentCommand.cs b/Ryujinx.Graphics.GAL/Multithreading/Commands/Window/WindowPresentCommand.cs deleted file mode 100644 index 6a24cd35..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Commands/Window/WindowPresentCommand.cs +++ /dev/null @@ -1,27 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Model; -using Ryujinx.Graphics.GAL.Multithreading.Resources; -using System; - -namespace Ryujinx.Graphics.GAL.Multithreading.Commands.Window -{ - struct WindowPresentCommand : IGALCommand, IGALCommand - { - public CommandType CommandType => CommandType.WindowPresent; - private TableRef _texture; - private ImageCrop _crop; - private TableRef _swapBuffersCallback; - - public void Set(TableRef texture, ImageCrop crop, TableRef swapBuffersCallback) - { - _texture = texture; - _crop = crop; - _swapBuffersCallback = swapBuffersCallback; - } - - public static void Run(ref WindowPresentCommand command, ThreadedRenderer threaded, IRenderer renderer) - { - threaded.SignalFrame(); - renderer.Window.Present(command._texture.Get(threaded)?.Base, command._crop, command._swapBuffersCallback.Get(threaded)); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Model/CircularSpanPool.cs b/Ryujinx.Graphics.GAL/Multithreading/Model/CircularSpanPool.cs deleted file mode 100644 index 4ea1a2c7..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Model/CircularSpanPool.cs +++ /dev/null @@ -1,89 +0,0 @@ -using System; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using System.Threading; - -namespace Ryujinx.Graphics.GAL.Multithreading.Model -{ - /// - /// A memory pool for passing through Span resources with one producer and consumer. - /// Data is copied on creation to part of the pool, then that region is reserved until it is disposed by the consumer. - /// Similar to the command queue, this pool assumes that data is created and disposed in the same order. - /// - class CircularSpanPool - { - private ThreadedRenderer _renderer; - private byte[] _pool; - private int _size; - - private int _producerPtr; - private int _producerSkipPosition = -1; - private int _consumerPtr; - - public CircularSpanPool(ThreadedRenderer renderer, int size) - { - _renderer = renderer; - _size = size; - _pool = new byte[size]; - } - - public SpanRef Insert(ReadOnlySpan data) where T : unmanaged - { - int size = data.Length * Unsafe.SizeOf(); - - // Wrapping aware circular queue. - // If there's no space at the end of the pool for this span, we can't fragment it. - // So just loop back around to the start. Remember the last skipped position. - - bool wraparound = _producerPtr + size >= _size; - int index = wraparound ? 0 : _producerPtr; - - // _consumerPtr is from another thread, and we're taking it without a lock, so treat this as a snapshot in the past. - // We know that it will always be before or equal to the producer pointer, and it cannot pass it. - // This is enough to reason about if there is space in the queue for the data, even if we're checking against an outdated value. - - int consumer = _consumerPtr; - bool beforeConsumer = _producerPtr < consumer; - - if (size > _size - 1 || (wraparound && beforeConsumer) || ((index < consumer || wraparound) && index + size >= consumer)) - { - // Just get an array in the following situations: - // - The data is too large to fit in the pool. - // - A wraparound would happen but the consumer would be covered by it. - // - The producer would catch up to the consumer as a result. - - return new SpanRef(_renderer, data.ToArray()); - } - - data.CopyTo(MemoryMarshal.Cast(new Span(_pool).Slice(index, size))); - - if (wraparound) - { - _producerSkipPosition = _producerPtr; - } - - _producerPtr = index + size; - - return new SpanRef(data.Length); - } - - public Span Get(int length) where T : unmanaged - { - int size = length * Unsafe.SizeOf(); - - if (_consumerPtr == Interlocked.CompareExchange(ref _producerSkipPosition, -1, _consumerPtr)) - { - _consumerPtr = 0; - } - - return MemoryMarshal.Cast(new Span(_pool).Slice(_consumerPtr, size)); - } - - public void Dispose(int length) where T : unmanaged - { - int size = length * Unsafe.SizeOf(); - - _consumerPtr = _consumerPtr + size; - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Model/ResultBox.cs b/Ryujinx.Graphics.GAL/Multithreading/Model/ResultBox.cs deleted file mode 100644 index 7a0be785..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Model/ResultBox.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Model -{ - public class ResultBox - { - public T Result; - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Model/SpanRef.cs b/Ryujinx.Graphics.GAL/Multithreading/Model/SpanRef.cs deleted file mode 100644 index 7dbebc76..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Model/SpanRef.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System; - -namespace Ryujinx.Graphics.GAL.Multithreading.Model -{ - struct SpanRef where T : unmanaged - { - private int _packedLengthId; - - public SpanRef(ThreadedRenderer renderer, T[] data) - { - _packedLengthId = -(renderer.AddTableRef(data) + 1); - } - - public SpanRef(int length) - { - _packedLengthId = length; - } - - public Span Get(ThreadedRenderer renderer) - { - if (_packedLengthId >= 0) - { - return renderer.SpanPool.Get(_packedLengthId); - } - else - { - return new Span((T[])renderer.RemoveTableRef(-(_packedLengthId + 1))); - } - } - - public void Dispose(ThreadedRenderer renderer) - { - if (_packedLengthId > 0) - { - renderer.SpanPool.Dispose(_packedLengthId); - } - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Model/TableRef.cs b/Ryujinx.Graphics.GAL/Multithreading/Model/TableRef.cs deleted file mode 100644 index 166aa71a..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Model/TableRef.cs +++ /dev/null @@ -1,22 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Model -{ - struct TableRef - { - private int _index; - - public TableRef(ThreadedRenderer renderer, T reference) - { - _index = renderer.AddTableRef(reference); - } - - public T Get(ThreadedRenderer renderer) - { - return (T)renderer.RemoveTableRef(_index); - } - - public T2 GetAs(ThreadedRenderer renderer) where T2 : T - { - return (T2)renderer.RemoveTableRef(_index); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Resources/ProgramQueue.cs b/Ryujinx.Graphics.GAL/Multithreading/Resources/ProgramQueue.cs deleted file mode 100644 index 3f982d31..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Resources/ProgramQueue.cs +++ /dev/null @@ -1,107 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Resources.Programs; -using System; -using System.Collections.Generic; -using System.Threading; - -namespace Ryujinx.Graphics.GAL.Multithreading.Resources -{ - /// - /// A structure handling multithreaded compilation for programs. - /// - class ProgramQueue - { - private const int MaxConcurrentCompilations = 8; - - private IRenderer _renderer; - - private Queue _toCompile; - private List _inProgress; - - public ProgramQueue(IRenderer renderer) - { - _renderer = renderer; - - _toCompile = new Queue(); - _inProgress = new List(); - } - - public void Add(IProgramRequest request) - { - lock (_toCompile) - { - _toCompile.Enqueue(request); - } - } - - public void ProcessQueue() - { - for (int i = 0; i < _inProgress.Count; i++) - { - ThreadedProgram program = _inProgress[i]; - - ProgramLinkStatus status = program.Base.CheckProgramLink(false); - - if (status != ProgramLinkStatus.Incomplete) - { - program.Compiled = true; - _inProgress.RemoveAt(i--); - } - } - - int freeSpace = MaxConcurrentCompilations - _inProgress.Count; - - for (int i = 0; i < freeSpace; i++) - { - // Begin compilation of some programs in the compile queue. - IProgramRequest program; - - lock (_toCompile) - { - if (!_toCompile.TryDequeue(out program)) - { - break; - } - } - - if (program.Threaded.Base != null) - { - ProgramLinkStatus status = program.Threaded.Base.CheckProgramLink(false); - - if (status != ProgramLinkStatus.Incomplete) - { - // This program is already compiled. Keep going through the queue. - program.Threaded.Compiled = true; - i--; - continue; - } - } - else - { - program.Threaded.Base = program.Create(_renderer); - } - - _inProgress.Add(program.Threaded); - } - } - - /// - /// Process the queue until the given program has finished compiling. - /// This will begin compilation of other programs on the queue as well. - /// - /// The program to wait for - public void WaitForProgram(ThreadedProgram program) - { - Span spinWait = stackalloc SpinWait[1]; - - while (!program.Compiled) - { - ProcessQueue(); - - if (!program.Compiled) - { - spinWait[0].SpinOnce(-1); - } - } - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Resources/Programs/BinaryProgramRequest.cs b/Ryujinx.Graphics.GAL/Multithreading/Resources/Programs/BinaryProgramRequest.cs deleted file mode 100644 index b4c6853f..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Resources/Programs/BinaryProgramRequest.cs +++ /dev/null @@ -1,25 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Resources.Programs -{ - class BinaryProgramRequest : IProgramRequest - { - public ThreadedProgram Threaded { get; set; } - - private byte[] _data; - private bool _hasFragmentShader; - private ShaderInfo _info; - - public BinaryProgramRequest(ThreadedProgram program, byte[] data, bool hasFragmentShader, ShaderInfo info) - { - Threaded = program; - - _data = data; - _hasFragmentShader = hasFragmentShader; - _info = info; - } - - public IProgram Create(IRenderer renderer) - { - return renderer.LoadProgramBinary(_data, _hasFragmentShader, _info); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Resources/Programs/IProgramRequest.cs b/Ryujinx.Graphics.GAL/Multithreading/Resources/Programs/IProgramRequest.cs deleted file mode 100644 index cdbfe03c..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Resources/Programs/IProgramRequest.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Resources.Programs -{ - interface IProgramRequest - { - ThreadedProgram Threaded { get; set; } - IProgram Create(IRenderer renderer); - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Resources/Programs/SourceProgramRequest.cs b/Ryujinx.Graphics.GAL/Multithreading/Resources/Programs/SourceProgramRequest.cs deleted file mode 100644 index ff06abb1..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Resources/Programs/SourceProgramRequest.cs +++ /dev/null @@ -1,23 +0,0 @@ -namespace Ryujinx.Graphics.GAL.Multithreading.Resources.Programs -{ - class SourceProgramRequest : IProgramRequest - { - public ThreadedProgram Threaded { get; set; } - - private ShaderSource[] _shaders; - private ShaderInfo _info; - - public SourceProgramRequest(ThreadedProgram program, ShaderSource[] shaders, ShaderInfo info) - { - Threaded = program; - - _shaders = shaders; - _info = info; - } - - public IProgram Create(IRenderer renderer) - { - return renderer.CreateProgram(_shaders, _info); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedCounterEvent.cs b/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedCounterEvent.cs deleted file mode 100644 index 4b7471d6..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedCounterEvent.cs +++ /dev/null @@ -1,80 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Commands.CounterEvent; -using Ryujinx.Graphics.GAL.Multithreading.Model; -using System.Threading; - -namespace Ryujinx.Graphics.GAL.Multithreading.Resources -{ - class ThreadedCounterEvent : ICounterEvent - { - private ThreadedRenderer _renderer; - public ICounterEvent Base; - - public bool Invalid { get; set; } - - public CounterType Type { get; } - public bool ClearCounter { get; } - - private bool _reserved; - private int _createLock; - - public ThreadedCounterEvent(ThreadedRenderer renderer, CounterType type, bool clearCounter) - { - _renderer = renderer; - Type = type; - ClearCounter = clearCounter; - } - - private TableRef Ref(T reference) - { - return new TableRef(_renderer, reference); - } - - public void Dispose() - { - _renderer.New().Set(Ref(this)); - _renderer.QueueCommand(); - } - - public void Flush() - { - ThreadedHelpers.SpinUntilNonNull(ref Base); - - Base.Flush(); - } - - public bool ReserveForHostAccess() - { - if (Base != null) - { - return Base.ReserveForHostAccess(); - } - else - { - bool result = true; - - // A very light lock, as this case is uncommon. - ThreadedHelpers.SpinUntilExchange(ref _createLock, 1, 0); - - if (Base != null) - { - result = Base.ReserveForHostAccess(); - } - else - { - _reserved = true; - } - - Volatile.Write(ref _createLock, 0); - - return result; - } - } - - public void Create(IRenderer renderer, CounterType type, System.EventHandler eventHandler, bool hostReserved) - { - ThreadedHelpers.SpinUntilExchange(ref _createLock, 1, 0); - Base = renderer.ReportCounter(type, eventHandler, hostReserved || _reserved); - Volatile.Write(ref _createLock, 0); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedProgram.cs b/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedProgram.cs deleted file mode 100644 index 068d058e..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedProgram.cs +++ /dev/null @@ -1,48 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Commands.Program; -using Ryujinx.Graphics.GAL.Multithreading.Model; - -namespace Ryujinx.Graphics.GAL.Multithreading.Resources -{ - class ThreadedProgram : IProgram - { - private ThreadedRenderer _renderer; - - public IProgram Base; - - internal bool Compiled; - - public ThreadedProgram(ThreadedRenderer renderer) - { - _renderer = renderer; - } - - private TableRef Ref(T reference) - { - return new TableRef(_renderer, reference); - } - - public void Dispose() - { - _renderer.New().Set(Ref(this)); - _renderer.QueueCommand(); - } - - public byte[] GetBinary() - { - ResultBox box = new ResultBox(); - _renderer.New().Set(Ref(this), Ref(box)); - _renderer.InvokeCommand(); - - return box.Result; - } - - public ProgramLinkStatus CheckProgramLink(bool blocking) - { - ResultBox box = new ResultBox(); - _renderer.New().Set(Ref(this), blocking, Ref(box)); - _renderer.InvokeCommand(); - - return box.Result; - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedSampler.cs b/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedSampler.cs deleted file mode 100644 index d8de9a70..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedSampler.cs +++ /dev/null @@ -1,22 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Commands.Sampler; -using Ryujinx.Graphics.GAL.Multithreading.Model; - -namespace Ryujinx.Graphics.GAL.Multithreading.Resources -{ - class ThreadedSampler : ISampler - { - private ThreadedRenderer _renderer; - public ISampler Base; - - public ThreadedSampler(ThreadedRenderer renderer) - { - _renderer = renderer; - } - - public void Dispose() - { - _renderer.New().Set(new TableRef(_renderer, this)); - _renderer.QueueCommand(); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedTexture.cs b/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedTexture.cs deleted file mode 100644 index ee1cfa29..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedTexture.cs +++ /dev/null @@ -1,141 +0,0 @@ -using Ryujinx.Common.Memory; -using Ryujinx.Graphics.GAL.Multithreading.Commands.Texture; -using Ryujinx.Graphics.GAL.Multithreading.Model; -using System; - -namespace Ryujinx.Graphics.GAL.Multithreading.Resources -{ - /// - /// Threaded representation of a texture. - /// - class ThreadedTexture : ITexture - { - private ThreadedRenderer _renderer; - private TextureCreateInfo _info; - public ITexture Base; - - public int Width => _info.Width; - - public int Height => _info.Height; - - public float ScaleFactor { get; } - - public ThreadedTexture(ThreadedRenderer renderer, TextureCreateInfo info, float scale) - { - _renderer = renderer; - _info = info; - ScaleFactor = scale; - } - - private TableRef Ref(T reference) - { - return new TableRef(_renderer, reference); - } - - public void CopyTo(ITexture destination, int firstLayer, int firstLevel) - { - _renderer.New().Set(Ref(this), Ref((ThreadedTexture)destination), firstLayer, firstLevel); - _renderer.QueueCommand(); - } - - public void CopyTo(ITexture destination, int srcLayer, int dstLayer, int srcLevel, int dstLevel) - { - _renderer.New().Set(Ref(this), Ref((ThreadedTexture)destination), srcLayer, dstLayer, srcLevel, dstLevel); - _renderer.QueueCommand(); - } - - public void CopyTo(ITexture destination, Extents2D srcRegion, Extents2D dstRegion, bool linearFilter) - { - ThreadedTexture dest = (ThreadedTexture)destination; - - if (_renderer.IsGpuThread()) - { - _renderer.New().Set(Ref(this), Ref(dest), srcRegion, dstRegion, linearFilter); - _renderer.QueueCommand(); - } - else - { - // Scaled copy can happen on another thread for a res scale flush. - ThreadedHelpers.SpinUntilNonNull(ref Base); - ThreadedHelpers.SpinUntilNonNull(ref dest.Base); - - Base.CopyTo(dest.Base, srcRegion, dstRegion, linearFilter); - } - } - - public ITexture CreateView(TextureCreateInfo info, int firstLayer, int firstLevel) - { - ThreadedTexture newTex = new ThreadedTexture(_renderer, info, ScaleFactor); - _renderer.New().Set(Ref(this), Ref(newTex), info, firstLayer, firstLevel); - _renderer.QueueCommand(); - - return newTex; - } - - public PinnedSpan GetData() - { - if (_renderer.IsGpuThread()) - { - ResultBox> box = new ResultBox>(); - _renderer.New().Set(Ref(this), Ref(box)); - _renderer.InvokeCommand(); - - return box.Result; - } - else - { - ThreadedHelpers.SpinUntilNonNull(ref Base); - - return Base.GetData(); - } - } - - public PinnedSpan GetData(int layer, int level) - { - if (_renderer.IsGpuThread()) - { - ResultBox> box = new ResultBox>(); - _renderer.New().Set(Ref(this), Ref(box), layer, level); - _renderer.InvokeCommand(); - - return box.Result; - } - else - { - ThreadedHelpers.SpinUntilNonNull(ref Base); - - return Base.GetData(layer, level); - } - } - - public void SetData(SpanOrArray data) - { - _renderer.New().Set(Ref(this), Ref(data.ToArray())); - _renderer.QueueCommand(); - } - - public void SetData(SpanOrArray data, int layer, int level) - { - _renderer.New().Set(Ref(this), Ref(data.ToArray()), layer, level); - _renderer.QueueCommand(); - } - - public void SetData(SpanOrArray data, int layer, int level, Rectangle region) - { - _renderer.New().Set(Ref(this), Ref(data.ToArray()), layer, level, region); - _renderer.QueueCommand(); - } - - public void SetStorage(BufferRange buffer) - { - _renderer.New().Set(Ref(this), buffer); - _renderer.QueueCommand(); - } - - public void Release() - { - _renderer.New().Set(Ref(this)); - _renderer.QueueCommand(); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/SyncMap.cs b/Ryujinx.Graphics.GAL/Multithreading/SyncMap.cs deleted file mode 100644 index ae09e852..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/SyncMap.cs +++ /dev/null @@ -1,62 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading; - -namespace Ryujinx.Graphics.GAL.Multithreading -{ - class SyncMap : IDisposable - { - private HashSet _inFlight = new HashSet(); - private AutoResetEvent _inFlightChanged = new AutoResetEvent(false); - - internal void CreateSyncHandle(ulong id) - { - lock (_inFlight) - { - _inFlight.Add(id); - } - } - - internal void AssignSync(ulong id) - { - lock (_inFlight) - { - _inFlight.Remove(id); - } - - _inFlightChanged.Set(); - } - - internal void WaitSyncAvailability(ulong id) - { - // Blocks until the handle is available. - - bool signal = false; - - while (true) - { - lock (_inFlight) - { - if (!_inFlight.Contains(id)) - { - break; - } - } - - _inFlightChanged.WaitOne(); - signal = true; - } - - if (signal) - { - // Signal other threads which might still be waiting. - _inFlightChanged.Set(); - } - } - - public void Dispose() - { - _inFlightChanged.Dispose(); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/ThreadedHelpers.cs b/Ryujinx.Graphics.GAL/Multithreading/ThreadedHelpers.cs deleted file mode 100644 index 7ddb19e6..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/ThreadedHelpers.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Threading; - -namespace Ryujinx.Graphics.GAL.Multithreading -{ - static class ThreadedHelpers - { - public static void SpinUntilNonNull(ref T obj) where T : class - { - Span spinWait = stackalloc SpinWait[1]; - - while (obj == null) - { - spinWait[0].SpinOnce(-1); - } - } - - public static void SpinUntilExchange(ref int target, int value, int comparand) - { - Span spinWait = stackalloc SpinWait[1]; - - while (Interlocked.CompareExchange(ref target, value, comparand) != comparand) - { - spinWait[0].SpinOnce(-1); - } - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/ThreadedPipeline.cs b/Ryujinx.Graphics.GAL/Multithreading/ThreadedPipeline.cs deleted file mode 100644 index 1bdc9cf4..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/ThreadedPipeline.cs +++ /dev/null @@ -1,380 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Commands; -using Ryujinx.Graphics.GAL.Multithreading.Model; -using Ryujinx.Graphics.GAL.Multithreading.Resources; -using Ryujinx.Graphics.Shader; -using System; -using System.Linq; - -namespace Ryujinx.Graphics.GAL.Multithreading -{ - public class ThreadedPipeline : IPipeline - { - private ThreadedRenderer _renderer; - private IPipeline _impl; - - public ThreadedPipeline(ThreadedRenderer renderer, IPipeline impl) - { - _renderer = renderer; - _impl = impl; - } - - private TableRef Ref(T reference) - { - return new TableRef(_renderer, reference); - } - - public void Barrier() - { - _renderer.New(); - _renderer.QueueCommand(); - } - - public void BeginTransformFeedback(PrimitiveTopology topology) - { - _renderer.New().Set(topology); - _renderer.QueueCommand(); - } - - public void ClearBuffer(BufferHandle destination, int offset, int size, uint value) - { - _renderer.New().Set(destination, offset, size, value); - _renderer.QueueCommand(); - } - - public void ClearRenderTargetColor(int index, int layer, int layerCount, uint componentMask, ColorF color) - { - _renderer.New().Set(index, layer, layerCount, componentMask, color); - _renderer.QueueCommand(); - } - - public void ClearRenderTargetDepthStencil(int layer, int layerCount, float depthValue, bool depthMask, int stencilValue, int stencilMask) - { - _renderer.New().Set(layer, layerCount, depthValue, depthMask, stencilValue, stencilMask); - _renderer.QueueCommand(); - } - - public void CommandBufferBarrier() - { - _renderer.New(); - _renderer.QueueCommand(); - } - - public void CopyBuffer(BufferHandle source, BufferHandle destination, int srcOffset, int dstOffset, int size) - { - _renderer.New().Set(source, destination, srcOffset, dstOffset, size); - _renderer.QueueCommand(); - } - - public void DispatchCompute(int groupsX, int groupsY, int groupsZ) - { - _renderer.New().Set(groupsX, groupsY, groupsZ); - _renderer.QueueCommand(); - } - - public void Draw(int vertexCount, int instanceCount, int firstVertex, int firstInstance) - { - _renderer.New().Set(vertexCount, instanceCount, firstVertex, firstInstance); - _renderer.QueueCommand(); - } - - public void DrawIndexed(int indexCount, int instanceCount, int firstIndex, int firstVertex, int firstInstance) - { - _renderer.New().Set(indexCount, instanceCount, firstIndex, firstVertex, firstInstance); - _renderer.QueueCommand(); - } - - public void DrawIndexedIndirect(BufferRange indirectBuffer) - { - _renderer.New().Set(indirectBuffer); - _renderer.QueueCommand(); - } - - public void DrawIndexedIndirectCount(BufferRange indirectBuffer, BufferRange parameterBuffer, int maxDrawCount, int stride) - { - _renderer.New().Set(indirectBuffer, parameterBuffer, maxDrawCount, stride); - _renderer.QueueCommand(); - } - - public void DrawIndirect(BufferRange indirectBuffer) - { - _renderer.New().Set(indirectBuffer); - _renderer.QueueCommand(); - } - - public void DrawIndirectCount(BufferRange indirectBuffer, BufferRange parameterBuffer, int maxDrawCount, int stride) - { - _renderer.New().Set(indirectBuffer, parameterBuffer, maxDrawCount, stride); - _renderer.QueueCommand(); - } - - public void DrawTexture(ITexture texture, ISampler sampler, Extents2DF srcRegion, Extents2DF dstRegion) - { - _renderer.New().Set(Ref(texture), Ref(sampler), srcRegion, dstRegion); - _renderer.QueueCommand(); - } - - public void EndHostConditionalRendering() - { - _renderer.New(); - _renderer.QueueCommand(); - } - - public void EndTransformFeedback() - { - _renderer.New(); - _renderer.QueueCommand(); - } - - public void SetAlphaTest(bool enable, float reference, CompareOp op) - { - _renderer.New().Set(enable, reference, op); - _renderer.QueueCommand(); - } - - public void SetBlendState(AdvancedBlendDescriptor blend) - { - _renderer.New().Set(blend); - _renderer.QueueCommand(); - } - - public void SetBlendState(int index, BlendDescriptor blend) - { - _renderer.New().Set(index, blend); - _renderer.QueueCommand(); - } - - public void SetDepthBias(PolygonModeMask enables, float factor, float units, float clamp) - { - _renderer.New().Set(enables, factor, units, clamp); - _renderer.QueueCommand(); - } - - public void SetDepthClamp(bool clamp) - { - _renderer.New().Set(clamp); - _renderer.QueueCommand(); - } - - public void SetDepthMode(DepthMode mode) - { - _renderer.New().Set(mode); - _renderer.QueueCommand(); - } - - public void SetDepthTest(DepthTestDescriptor depthTest) - { - _renderer.New().Set(depthTest); - _renderer.QueueCommand(); - } - - public void SetFaceCulling(bool enable, Face face) - { - _renderer.New().Set(enable, face); - _renderer.QueueCommand(); - } - - public void SetFrontFace(FrontFace frontFace) - { - _renderer.New().Set(frontFace); - _renderer.QueueCommand(); - } - - public void SetImage(int binding, ITexture texture, Format imageFormat) - { - _renderer.New().Set(binding, Ref(texture), imageFormat); - _renderer.QueueCommand(); - } - - public void SetIndexBuffer(BufferRange buffer, IndexType type) - { - _renderer.New().Set(buffer, type); - _renderer.QueueCommand(); - } - - public void SetLineParameters(float width, bool smooth) - { - _renderer.New().Set(width, smooth); - _renderer.QueueCommand(); - } - - public void SetLogicOpState(bool enable, LogicalOp op) - { - _renderer.New().Set(enable, op); - _renderer.QueueCommand(); - } - - public void SetMultisampleState(MultisampleDescriptor multisample) - { - _renderer.New().Set(multisample); - _renderer.QueueCommand(); - } - - public void SetPatchParameters(int vertices, ReadOnlySpan defaultOuterLevel, ReadOnlySpan defaultInnerLevel) - { - _renderer.New().Set(vertices, defaultOuterLevel, defaultInnerLevel); - _renderer.QueueCommand(); - } - - public void SetPointParameters(float size, bool isProgramPointSize, bool enablePointSprite, Origin origin) - { - _renderer.New().Set(size, isProgramPointSize, enablePointSprite, origin); - _renderer.QueueCommand(); - } - - public void SetPolygonMode(PolygonMode frontMode, PolygonMode backMode) - { - _renderer.New().Set(frontMode, backMode); - _renderer.QueueCommand(); - } - - public void SetPrimitiveRestart(bool enable, int index) - { - _renderer.New().Set(enable, index); - _renderer.QueueCommand(); - } - - public void SetPrimitiveTopology(PrimitiveTopology topology) - { - _renderer.New().Set(topology); - _renderer.QueueCommand(); - } - - public void SetProgram(IProgram program) - { - _renderer.New().Set(Ref(program)); - _renderer.QueueCommand(); - } - - public void SetRasterizerDiscard(bool discard) - { - _renderer.New().Set(discard); - _renderer.QueueCommand(); - } - - public void SetRenderTargetColorMasks(ReadOnlySpan componentMask) - { - _renderer.New().Set(_renderer.CopySpan(componentMask)); - _renderer.QueueCommand(); - } - - public void SetRenderTargets(ITexture[] colors, ITexture depthStencil) - { - _renderer.New().Set(Ref(colors.ToArray()), Ref(depthStencil)); - _renderer.QueueCommand(); - } - - public void SetRenderTargetScale(float scale) - { - _renderer.New().Set(scale); - _renderer.QueueCommand(); - } - - public void SetScissors(ReadOnlySpan> scissors) - { - _renderer.New().Set(_renderer.CopySpan(scissors)); - _renderer.QueueCommand(); - } - - public void SetStencilTest(StencilTestDescriptor stencilTest) - { - _renderer.New().Set(stencilTest); - _renderer.QueueCommand(); - } - - public void SetStorageBuffers(ReadOnlySpan buffers) - { - _renderer.New().Set(_renderer.CopySpan(buffers)); - _renderer.QueueCommand(); - } - - public void SetTextureAndSampler(ShaderStage stage, int binding, ITexture texture, ISampler sampler) - { - _renderer.New().Set(stage, binding, Ref(texture), Ref(sampler)); - _renderer.QueueCommand(); - } - - public void SetTransformFeedbackBuffers(ReadOnlySpan buffers) - { - _renderer.New().Set(_renderer.CopySpan(buffers)); - _renderer.QueueCommand(); - } - - public void SetUniformBuffers(ReadOnlySpan buffers) - { - _renderer.New().Set(_renderer.CopySpan(buffers)); - _renderer.QueueCommand(); - } - - public void SetUserClipDistance(int index, bool enableClip) - { - _renderer.New().Set(index, enableClip); - _renderer.QueueCommand(); - } - - public void SetVertexAttribs(ReadOnlySpan vertexAttribs) - { - _renderer.New().Set(_renderer.CopySpan(vertexAttribs)); - _renderer.QueueCommand(); - } - - public void SetVertexBuffers(ReadOnlySpan vertexBuffers) - { - _renderer.New().Set(_renderer.CopySpan(vertexBuffers)); - _renderer.QueueCommand(); - } - - public void SetViewports(ReadOnlySpan viewports, bool disableTransform) - { - _renderer.New().Set(_renderer.CopySpan(viewports), disableTransform); - _renderer.QueueCommand(); - } - - public void TextureBarrier() - { - _renderer.New(); - _renderer.QueueCommand(); - } - - public void TextureBarrierTiled() - { - _renderer.New(); - _renderer.QueueCommand(); - } - - public bool TryHostConditionalRendering(ICounterEvent value, ulong compare, bool isEqual) - { - var evt = value as ThreadedCounterEvent; - if (evt != null) - { - if (compare == 0 && evt.Type == CounterType.SamplesPassed && evt.ClearCounter) - { - if (!evt.ReserveForHostAccess()) - { - return false; - } - - _renderer.New().Set(Ref(evt), compare, isEqual); - _renderer.QueueCommand(); - return true; - } - } - - _renderer.New().Set(Ref(evt), Ref(null), isEqual); - _renderer.QueueCommand(); - return false; - } - - public bool TryHostConditionalRendering(ICounterEvent value, ICounterEvent compare, bool isEqual) - { - _renderer.New().Set(Ref(value as ThreadedCounterEvent), Ref(compare as ThreadedCounterEvent), isEqual); - _renderer.QueueCommand(); - return false; - } - - public void UpdateRenderScale(ReadOnlySpan scales, int totalCount, int fragmentCount) - { - _renderer.New().Set(_renderer.CopySpan(scales.Slice(0, totalCount)), totalCount, fragmentCount); - _renderer.QueueCommand(); - } - } -} diff --git a/Ryujinx.Graphics.GAL/Multithreading/ThreadedRenderer.cs b/Ryujinx.Graphics.GAL/Multithreading/ThreadedRenderer.cs deleted file mode 100644 index 2148f43f..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/ThreadedRenderer.cs +++ /dev/null @@ -1,488 +0,0 @@ -using Ryujinx.Common; -using Ryujinx.Common.Configuration; -using Ryujinx.Graphics.GAL.Multithreading.Commands; -using Ryujinx.Graphics.GAL.Multithreading.Commands.Buffer; -using Ryujinx.Graphics.GAL.Multithreading.Commands.Renderer; -using Ryujinx.Graphics.GAL.Multithreading.Model; -using Ryujinx.Graphics.GAL.Multithreading.Resources; -using Ryujinx.Graphics.GAL.Multithreading.Resources.Programs; -using System; -using System.Diagnostics; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using System.Threading; - -namespace Ryujinx.Graphics.GAL.Multithreading -{ - /// - /// The ThreadedRenderer is a layer that can be put in front of any Renderer backend to make - /// its processing happen on a separate thread, rather than intertwined with the GPU emulation. - /// A new thread is created to handle the GPU command processing, separate from the renderer thread. - /// Calls to the renderer, pipeline and resources are queued to happen on the renderer thread. - /// - public class ThreadedRenderer : IRenderer - { - private const int SpanPoolBytes = 4 * 1024 * 1024; - private const int MaxRefsPerCommand = 2; - private const int QueueCount = 10000; - - private int _elementSize; - private IRenderer _baseRenderer; - private Thread _gpuThread; - private Thread _backendThread; - private bool _disposed; - private bool _running; - - private AutoResetEvent _frameComplete = new AutoResetEvent(true); - - private ManualResetEventSlim _galWorkAvailable; - private CircularSpanPool _spanPool; - - private ManualResetEventSlim _invokeRun; - private AutoResetEvent _interruptRun; - - private bool _lastSampleCounterClear = true; - - private byte[] _commandQueue; - private object[] _refQueue; - - private int _consumerPtr; - private int _commandCount; - - private int _producerPtr; - private int _lastProducedPtr; - private int _invokePtr; - - private int _refProducerPtr; - private int _refConsumerPtr; - - private Action _interruptAction; - - public event EventHandler ScreenCaptured; - - internal BufferMap Buffers { get; } - internal SyncMap Sync { get; } - internal CircularSpanPool SpanPool { get; } - internal ProgramQueue Programs { get; } - - public IPipeline Pipeline { get; } - public IWindow Window { get; } - - public IRenderer BaseRenderer => _baseRenderer; - - public bool PreferThreading => _baseRenderer.PreferThreading; - - public ThreadedRenderer(IRenderer renderer) - { - _baseRenderer = renderer; - - renderer.ScreenCaptured += (sender, info) => ScreenCaptured?.Invoke(this, info); - renderer.SetInterruptAction(Interrupt); - - Pipeline = new ThreadedPipeline(this, renderer.Pipeline); - Window = new ThreadedWindow(this, renderer); - Buffers = new BufferMap(); - Sync = new SyncMap(); - Programs = new ProgramQueue(renderer); - - _galWorkAvailable = new ManualResetEventSlim(false); - _invokeRun = new ManualResetEventSlim(); - _interruptRun = new AutoResetEvent(false); - _spanPool = new CircularSpanPool(this, SpanPoolBytes); - SpanPool = _spanPool; - - _elementSize = BitUtils.AlignUp(CommandHelper.GetMaxCommandSize(), 4); - - _commandQueue = new byte[_elementSize * QueueCount]; - _refQueue = new object[MaxRefsPerCommand * QueueCount]; - } - - public void RunLoop(Action gpuLoop) - { - _running = true; - - _backendThread = Thread.CurrentThread; - - _gpuThread = new Thread(() => { - gpuLoop(); - _running = false; - _galWorkAvailable.Set(); - }); - - _gpuThread.Name = "GPU.MainThread"; - _gpuThread.Start(); - - RenderLoop(); - } - - public void RenderLoop() - { - // Power through the render queue until the Gpu thread work is done. - - while (_running && !_disposed) - { - _galWorkAvailable.Wait(); - _galWorkAvailable.Reset(); - - if (Volatile.Read(ref _interruptAction) != null) - { - _interruptAction(); - _interruptRun.Set(); - - Interlocked.Exchange(ref _interruptAction, null); - } - - // The other thread can only increase the command count. - // We can assume that if it is above 0, it will stay there or get higher. - - while (Volatile.Read(ref _commandCount) > 0 && Volatile.Read(ref _interruptAction) == null) - { - int commandPtr = _consumerPtr; - - Span command = new Span(_commandQueue, commandPtr * _elementSize, _elementSize); - - // Run the command. - - CommandHelper.RunCommand(command, this, _baseRenderer); - - if (Interlocked.CompareExchange(ref _invokePtr, -1, commandPtr) == commandPtr) - { - _invokeRun.Set(); - } - - _consumerPtr = (_consumerPtr + 1) % QueueCount; - - Interlocked.Decrement(ref _commandCount); - } - } - } - - internal SpanRef CopySpan(ReadOnlySpan data) where T : unmanaged - { - return _spanPool.Insert(data); - } - - private TableRef Ref(T reference) - { - return new TableRef(this, reference); - } - - internal ref T New() where T : struct - { - while (_producerPtr == (Volatile.Read(ref _consumerPtr) + QueueCount - 1) % QueueCount) - { - // If incrementing the producer pointer would overflow, we need to wait. - // _consumerPtr can only move forward, so there's no race to worry about here. - - Thread.Sleep(1); - } - - int taken = _producerPtr; - _lastProducedPtr = taken; - - _producerPtr = (_producerPtr + 1) % QueueCount; - - Span memory = new Span(_commandQueue, taken * _elementSize, _elementSize); - ref T result = ref Unsafe.As(ref MemoryMarshal.GetReference(memory)); - - memory[memory.Length - 1] = (byte)((IGALCommand)result).CommandType; - - return ref result; - } - - internal int AddTableRef(object obj) - { - // The reference table is sized so that it will never overflow, so long as the references are taken after the command is allocated. - - int index = _refProducerPtr; - - _refQueue[index] = obj; - - _refProducerPtr = (_refProducerPtr + 1) % _refQueue.Length; - - return index; - } - - internal object RemoveTableRef(int index) - { - Debug.Assert(index == _refConsumerPtr); - - object result = _refQueue[_refConsumerPtr]; - _refQueue[_refConsumerPtr] = null; - - _refConsumerPtr = (_refConsumerPtr + 1) % _refQueue.Length; - - return result; - } - - internal void QueueCommand() - { - int result = Interlocked.Increment(ref _commandCount); - - if (result == 1) - { - _galWorkAvailable.Set(); - } - } - - internal void InvokeCommand() - { - _invokeRun.Reset(); - _invokePtr = _lastProducedPtr; - - QueueCommand(); - - // Wait for the command to complete. - _invokeRun.Wait(); - } - - internal void WaitForFrame() - { - _frameComplete.WaitOne(); - } - - internal void SignalFrame() - { - _frameComplete.Set(); - } - - internal bool IsGpuThread() - { - return Thread.CurrentThread == _gpuThread; - } - - public void BackgroundContextAction(Action action, bool alwaysBackground = false) - { - if (IsGpuThread() && !alwaysBackground) - { - // The action must be performed on the render thread. - New().Set(Ref(action)); - InvokeCommand(); - } - else - { - _baseRenderer.BackgroundContextAction(action, true); - } - } - - public BufferHandle CreateBuffer(int size, BufferHandle storageHint) - { - BufferHandle handle = Buffers.CreateBufferHandle(); - New().Set(handle, size, storageHint); - QueueCommand(); - - return handle; - } - - public IProgram CreateProgram(ShaderSource[] shaders, ShaderInfo info) - { - var program = new ThreadedProgram(this); - - SourceProgramRequest request = new SourceProgramRequest(program, shaders, info); - - Programs.Add(request); - - New().Set(Ref((IProgramRequest)request)); - QueueCommand(); - - return program; - } - - public ISampler CreateSampler(SamplerCreateInfo info) - { - var sampler = new ThreadedSampler(this); - New().Set(Ref(sampler), info); - QueueCommand(); - - return sampler; - } - - public void CreateSync(ulong id, bool strict) - { - Sync.CreateSyncHandle(id); - New().Set(id, strict); - QueueCommand(); - } - - public ITexture CreateTexture(TextureCreateInfo info, float scale) - { - if (IsGpuThread()) - { - var texture = new ThreadedTexture(this, info, scale); - New().Set(Ref(texture), info, scale); - QueueCommand(); - - return texture; - } - else - { - var texture = new ThreadedTexture(this, info, scale); - texture.Base = _baseRenderer.CreateTexture(info, scale); - - return texture; - } - } - - public void DeleteBuffer(BufferHandle buffer) - { - New().Set(buffer); - QueueCommand(); - } - - public PinnedSpan GetBufferData(BufferHandle buffer, int offset, int size) - { - if (IsGpuThread()) - { - ResultBox> box = new ResultBox>(); - New().Set(buffer, offset, size, Ref(box)); - InvokeCommand(); - - return box.Result; - } - else - { - return _baseRenderer.GetBufferData(Buffers.MapBufferBlocking(buffer), offset, size); - } - } - - public Capabilities GetCapabilities() - { - ResultBox box = new ResultBox(); - New().Set(Ref(box)); - InvokeCommand(); - - return box.Result; - } - - public ulong GetCurrentSync() - { - return _baseRenderer.GetCurrentSync(); - } - - public HardwareInfo GetHardwareInfo() - { - return _baseRenderer.GetHardwareInfo(); - } - - /// - /// Initialize the base renderer. Must be called on the render thread. - /// - /// Log level to use - public void Initialize(GraphicsDebugLevel logLevel) - { - _baseRenderer.Initialize(logLevel); - } - - public IProgram LoadProgramBinary(byte[] programBinary, bool hasFragmentShader, ShaderInfo info) - { - var program = new ThreadedProgram(this); - - BinaryProgramRequest request = new BinaryProgramRequest(program, programBinary, hasFragmentShader, info); - Programs.Add(request); - - New().Set(Ref((IProgramRequest)request)); - QueueCommand(); - - return program; - } - - public void PreFrame() - { - New(); - QueueCommand(); - } - - public ICounterEvent ReportCounter(CounterType type, EventHandler resultHandler, bool hostReserved) - { - ThreadedCounterEvent evt = new ThreadedCounterEvent(this, type, _lastSampleCounterClear); - New().Set(Ref(evt), type, Ref(resultHandler), hostReserved); - QueueCommand(); - - if (type == CounterType.SamplesPassed) - { - _lastSampleCounterClear = false; - } - - return evt; - } - - public void ResetCounter(CounterType type) - { - New().Set(type); - QueueCommand(); - _lastSampleCounterClear = true; - } - - public void Screenshot() - { - _baseRenderer.Screenshot(); - } - - public void SetBufferData(BufferHandle buffer, int offset, ReadOnlySpan data) - { - New().Set(buffer, offset, CopySpan(data)); - QueueCommand(); - } - - public void UpdateCounters() - { - New(); - QueueCommand(); - } - - public void WaitSync(ulong id) - { - Sync.WaitSyncAvailability(id); - - _baseRenderer.WaitSync(id); - } - - private void Interrupt(Action action) - { - // Interrupt the backend thread from any external thread and invoke the given action. - - if (Thread.CurrentThread == _backendThread) - { - // If this is called from the backend thread, the action can run immediately. - action(); - } - else - { - while (Interlocked.CompareExchange(ref _interruptAction, action, null) != null) { } - - _galWorkAvailable.Set(); - - _interruptRun.WaitOne(); - } - } - - public void SetInterruptAction(Action interruptAction) - { - // Threaded renderer ignores given interrupt action, as it provides its own to the child renderer. - } - - public void Dispose() - { - // Dispose must happen from the render thread, after all commands have completed. - - // Stop the GPU thread. - _disposed = true; - - if (_gpuThread != null && _gpuThread.IsAlive) - { - _gpuThread.Join(); - } - - // Dispose the renderer. - _baseRenderer.Dispose(); - - // Dispose events. - _frameComplete.Dispose(); - _galWorkAvailable.Dispose(); - _invokeRun.Dispose(); - _interruptRun.Dispose(); - - Sync.Dispose(); - } - } -} \ No newline at end of file diff --git a/Ryujinx.Graphics.GAL/Multithreading/ThreadedWindow.cs b/Ryujinx.Graphics.GAL/Multithreading/ThreadedWindow.cs deleted file mode 100644 index a647d37e..00000000 --- a/Ryujinx.Graphics.GAL/Multithreading/ThreadedWindow.cs +++ /dev/null @@ -1,42 +0,0 @@ -using Ryujinx.Graphics.GAL.Multithreading.Commands.Window; -using Ryujinx.Graphics.GAL.Multithreading.Model; -using Ryujinx.Graphics.GAL.Multithreading.Resources; -using System; - -namespace Ryujinx.Graphics.GAL.Multithreading -{ - public class ThreadedWindow : IWindow - { - private ThreadedRenderer _renderer; - private IRenderer _impl; - - public ThreadedWindow(ThreadedRenderer renderer, IRenderer impl) - { - _renderer = renderer; - _impl = impl; - } - - public void Present(ITexture texture, ImageCrop crop, Action swapBuffersCallback) - { - // If there's already a frame in the pipeline, wait for it to be presented first. - // This is a multithread rate limit - we can't be more than one frame behind the command queue. - - _renderer.WaitForFrame(); - _renderer.New().Set(new TableRef(_renderer, texture as ThreadedTexture), crop, new TableRef(_renderer, swapBuffersCallback)); - _renderer.QueueCommand(); - } - - public void SetSize(int width, int height) - { - _impl.Window.SetSize(width, height); - } - - public void ChangeVSyncMode(bool vsyncEnabled) { } - - public void SetAntiAliasing(AntiAliasing effect) { } - - public void SetScalingFilter(ScalingFilter type) { } - - public void SetScalingFilterLevel(float level) { } - } -} -- cgit v1.2.3