N-archive/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Renderer cleanup

Browse source
This commit is contained in:
Isaac Marovitz 2023-07-27 23:36:04 -04:00 committed by Isaac Marovitz
parent 70f54f23c9
commit 0eaee442c7
1 changed files with 25 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/Ryujinx.Graphics.Metal/MetalRenderer.cs
View file

@ -1,6 +1,7 @@
using Ryujinx.Common.Configuration; using Ryujinx.Common.Configuration;
using Ryujinx.Graphics.GAL; using Ryujinx.Graphics.GAL;
using Ryujinx.Graphics.Shader.Translation; using Ryujinx.Graphics.Shader.Translation;
using SharpMetal.Foundation;
using SharpMetal.Metal; using SharpMetal.Metal;
using System; using System;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
@ -11,27 +12,26 @@ namespace Ryujinx.Graphics.Metal
[SupportedOSPlatform("macos")] [SupportedOSPlatform("macos")]
public sealed class MetalRenderer : IRenderer public sealed class MetalRenderer : IRenderer
{ {
private MTLDevice _device; private readonly MTLDevice _device;
private readonly Window _window;
private Window _window; private readonly Pipeline _pipeline;
private readonly MTLCommandQueue _queue;
private Pipeline _pipeline;
internal MTLCommandQueue Queue { get; private set; }
internal int BufferCount { get; private set; }
public event EventHandler<ScreenCaptureImageInfo> ScreenCaptured; public event EventHandler<ScreenCaptureImageInfo> ScreenCaptured;
public bool PreferThreading => true; public bool PreferThreading => true;
public IPipeline Pipeline => _pipeline; public IPipeline Pipeline => _pipeline;
public IWindow Window => _window; public IWindow Window => _window;
public void Initialize(GraphicsDebugLevel logLevel) public MetalRenderer()
{ {
_device = MTLDevice.CreateSystemDefaultDevice(); _device = MTLDevice.CreateSystemDefaultDevice();
Queue = _device.NewCommandQueue(); _queue = _device.NewCommandQueue();
_pipeline = new Pipeline(_device, _queue);
_window = new Window(this);
}
_pipeline = new Pipeline(_device, Queue); public void Initialize(GraphicsDebugLevel logLevel)
{
} }
public void BackgroundContextAction(Action action, bool alwaysBackground = false) public void BackgroundContextAction(Action action, bool alwaysBackground = false)
@ -46,8 +46,6 @@ namespace Ryujinx.Graphics.Metal
public BufferHandle CreateBuffer(IntPtr pointer, int size) public BufferHandle CreateBuffer(IntPtr pointer, int size)
{ {
BufferCount++;
var buffer = _device.NewBuffer(pointer, (ulong)size, MTLResourceOptions.ResourceStorageModeShared); var buffer = _device.NewBuffer(pointer, (ulong)size, MTLResourceOptions.ResourceStorageModeShared);
var bufferPtr = buffer.NativePtr; var bufferPtr = buffer.NativePtr;
return Unsafe.As<IntPtr, BufferHandle>(ref bufferPtr); return Unsafe.As<IntPtr, BufferHandle>(ref bufferPtr);
@ -55,8 +53,6 @@ namespace Ryujinx.Graphics.Metal
public BufferHandle CreateBuffer(int size, BufferAccess access) public BufferHandle CreateBuffer(int size, BufferAccess access)
{ {
BufferCount++;
var buffer = _device.NewBuffer((ulong)size, MTLResourceOptions.ResourceStorageModeShared); var buffer = _device.NewBuffer((ulong)size, MTLResourceOptions.ResourceStorageModeShared);
var bufferPtr = buffer.NativePtr; var bufferPtr = buffer.NativePtr;
return Unsafe.As<IntPtr, BufferHandle>(ref bufferPtr); return Unsafe.As<IntPtr, BufferHandle>(ref bufferPtr);
@ -199,29 +195,36 @@ namespace Ryujinx.Graphics.Metal
throw new NotImplementedException(); throw new NotImplementedException();
} }
public void SetBufferData(BufferHandle buffer, int offset, ReadOnlySpan<byte> data) public unsafe void SetBufferData(BufferHandle buffer, int offset, ReadOnlySpan<byte> data)
{ {
throw new NotImplementedException(); MTLBuffer mtlBuffer = new(Unsafe.As<BufferHandle, IntPtr>(ref buffer));
var span = new Span<byte>(mtlBuffer.Contents.ToPointer(), (int)mtlBuffer.Length);
data.CopyTo(span.Slice(offset));
mtlBuffer.DidModifyRange(new NSRange
{
location = (ulong)offset,
length = (ulong)data.Length
});
} }
public void UpdateCounters() public void UpdateCounters()
{ {
throw new NotImplementedException(); // https://developer.apple.com/documentation/metal/gpu_counters_and_counter_sample_buffers/creating_a_counter_sample_buffer_to_store_a_gpu_s_counter_data_during_a_pass?language=objc
} }
public void PreFrame() public void PreFrame()
{ {
throw new NotImplementedException();
} }
public ICounterEvent ReportCounter(CounterType type, EventHandler<ulong> resultHandler, float divisor, bool hostReserved) public ICounterEvent ReportCounter(CounterType type, EventHandler<ulong> resultHandler, float divisor, bool hostReserved)
{ {
throw new NotImplementedException(); // https://developer.apple.com/documentation/metal/gpu_counters_and_counter_sample_buffers/creating_a_counter_sample_buffer_to_store_a_gpu_s_counter_data_during_a_pass?language=objc
} }
public void ResetCounter(CounterType type) public void ResetCounter(CounterType type)
{ {
throw new NotImplementedException(); // https://developer.apple.com/documentation/metal/gpu_counters_and_counter_sample_buffers/creating_a_counter_sample_buffer_to_store_a_gpu_s_counter_data_during_a_pass?language=objc
} }
public void WaitSync(ulong id) public void WaitSync(ulong id)