deadcade/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove RenderPipelineDescriptorResult

Browse source
This commit is contained in:
Isaac Marovitz 2024-08-13 23:18:57 +01:00 committed by Isaac Marovitz
parent d7c71c8a7b
commit a968ec71fd
1 changed files with 4 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/Ryujinx.Graphics.Metal/State/PipelineState.cs
View file

@ -103,24 +103,6 @@ namespace Ryujinx.Graphics.Metal
// Advanced blend not supported // Advanced blend not supported
private struct RenderPipelineDescriptorResult : IDisposable
{
public MTLRenderPipelineDescriptor Pipeline;
private MTLVertexDescriptor _vertex;
public RenderPipelineDescriptorResult(MTLRenderPipelineDescriptor pipeline, MTLVertexDescriptor vertex)
{
Pipeline = pipeline;
_vertex = vertex;
}
public void Dispose()
{
Pipeline.Dispose();
_vertex.Dispose();
}
}
private readonly void BuildColorAttachment(MTLRenderPipelineColorAttachmentDescriptor descriptor, ColorBlendStateUid blendState) private readonly void BuildColorAttachment(MTLRenderPipelineColorAttachmentDescriptor descriptor, ColorBlendStateUid blendState)
{ {
descriptor.PixelFormat = blendState.PixelFormat; descriptor.PixelFormat = blendState.PixelFormat;
@ -162,7 +144,7 @@ namespace Ryujinx.Graphics.Metal
return vertexDescriptor; return vertexDescriptor;
} }
private RenderPipelineDescriptorResult CreateRenderDescriptor(Program program) private MTLRenderPipelineDescriptor CreateRenderDescriptor(Program program)
{ {
var renderPipelineDescriptor = new MTLRenderPipelineDescriptor(); var renderPipelineDescriptor = new MTLRenderPipelineDescriptor();
@ -223,7 +205,7 @@ namespace Ryujinx.Graphics.Metal
renderPipelineDescriptor.FragmentFunction = program.FragmentFunction; renderPipelineDescriptor.FragmentFunction = program.FragmentFunction;
} }
return new RenderPipelineDescriptorResult(renderPipelineDescriptor, vertexDescriptor); return renderPipelineDescriptor;
} }
public MTLRenderPipelineState CreateRenderPipeline(MTLDevice device, Program program) public MTLRenderPipelineState CreateRenderPipeline(MTLDevice device, Program program)
@ -233,10 +215,10 @@ namespace Ryujinx.Graphics.Metal
return pipelineState; return pipelineState;
} }
using RenderPipelineDescriptorResult descriptors = CreateRenderDescriptor(program); using var descriptor = CreateRenderDescriptor(program);
var error = new NSError(IntPtr.Zero); var error = new NSError(IntPtr.Zero);
pipelineState = device.NewRenderPipelineState(descriptors.Pipeline, ref error); pipelineState = device.NewRenderPipelineState(descriptor, ref error);
if (error != IntPtr.Zero) if (error != IntPtr.Zero)
{ {
Logger.Error?.PrintMsg(LogClass.Gpu, $"Failed to create Render Pipeline State: {StringHelper.String(error.LocalizedDescription)}"); Logger.Error?.PrintMsg(LogClass.Gpu, $"Failed to create Render Pipeline State: {StringHelper.String(error.LocalizedDescription)}");