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

Dont be stupid

Browse source
This commit is contained in:
Isaac Marovitz 2023-10-10 18:36:52 -04:00 committed by Isaac Marovitz
parent c58cc76b39
commit 7f41e7dbd4
2 changed files with 30 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/Ryujinx.Graphics.Metal/Pipeline.cs
View file

@ -26,6 +26,7 @@ namespace Ryujinx.Graphics.Metal
private MTLCommandEncoder _currentEncoder; private MTLCommandEncoder _currentEncoder;
private RenderEncoderState _renderEncoderState; private RenderEncoderState _renderEncoderState;
private MTLVertexDescriptor _vertexDescriptor = new();
private MTLBuffer _indexBuffer; private MTLBuffer _indexBuffer;
private MTLIndexType _indexType; private MTLIndexType _indexType;
@ -117,7 +118,7 @@ namespace Ryujinx.Graphics.Metal
var descriptor = new MTLRenderPassDescriptor(); var descriptor = new MTLRenderPassDescriptor();
var renderCommandEncoder = _commandBuffer.RenderCommandEncoder(descriptor); var renderCommandEncoder = _commandBuffer.RenderCommandEncoder(descriptor);
_renderEncoderState.SetEncoderState(renderCommandEncoder); _renderEncoderState.SetEncoderState(renderCommandEncoder, _vertexDescriptor);
_currentEncoder = renderCommandEncoder; _currentEncoder = renderCommandEncoder;
return renderCommandEncoder; return renderCommandEncoder;
@ -160,7 +161,7 @@ namespace Ryujinx.Graphics.Metal
descriptor.ColorAttachments.Object(0).ClearColor = _clearColor; descriptor.ColorAttachments.Object(0).ClearColor = _clearColor;
var renderCommandEncoder = _commandBuffer.RenderCommandEncoder(descriptor); var renderCommandEncoder = _commandBuffer.RenderCommandEncoder(descriptor);
_renderEncoderState.SetEncoderState(renderCommandEncoder); _renderEncoderState.SetEncoderState(renderCommandEncoder, _vertexDescriptor);
var sampler = _device.NewSamplerState(new MTLSamplerDescriptor var sampler = _device.NewSamplerState(new MTLSamplerDescriptor
{ {
@ -526,12 +527,28 @@ namespace Ryujinx.Graphics.Metal
public void SetVertexAttribs(ReadOnlySpan<VertexAttribDescriptor> vertexAttribs) public void SetVertexAttribs(ReadOnlySpan<VertexAttribDescriptor> vertexAttribs)
{ {
_renderEncoderState.UpdateVertexAttributes(vertexAttribs); for (int i = 0; i < vertexAttribs.Length; i++)
{
if (!vertexAttribs[i].IsZero)
{
// TODO: Format should not be hardcoded
var attrib = _vertexDescriptor.Attributes.Object((ulong)i);
attrib.Format = MTLVertexFormat.Float4;
attrib.BufferIndex = (ulong)vertexAttribs[i].BufferIndex;
attrib.Offset = (ulong)vertexAttribs[i].Offset;
}
}
} }
public void SetVertexBuffers(ReadOnlySpan<VertexBufferDescriptor> vertexBuffers) public void SetVertexBuffers(ReadOnlySpan<VertexBufferDescriptor> vertexBuffers)
{ {
_renderEncoderState.UpdateVertexBuffers(vertexBuffers); for (int i = 0; i < vertexBuffers.Length; i++)
{
if (vertexBuffers[i].Stride != 0)
{
_vertexDescriptor.Layouts.Object((ulong)i).Stride = (ulong)vertexBuffers[i].Stride;
}
}
} }
public unsafe void SetViewports(ReadOnlySpan<Viewport> viewports) public unsafe void SetViewports(ReadOnlySpan<Viewport> viewports)

44
src/Ryujinx.Graphics.Metal/RenderEncoderState.cs
View file

@ -21,8 +21,6 @@ namespace Ryujinx.Graphics.Metal
private MTLStencilDescriptor _backFaceStencil = null; private MTLStencilDescriptor _backFaceStencil = null;
private MTLStencilDescriptor _frontFaceStencil = null; private MTLStencilDescriptor _frontFaceStencil = null;
private MTLVertexDescriptor _vertexDescriptor = new();
public PrimitiveTopology Topology = PrimitiveTopology.Triangles; public PrimitiveTopology Topology = PrimitiveTopology.Triangles;
public MTLCullMode CullMode = MTLCullMode.None; public MTLCullMode CullMode = MTLCullMode.None;
public MTLWinding Winding = MTLWinding.Clockwise; public MTLWinding Winding = MTLWinding.Clockwise;
@ -34,11 +32,11 @@ namespace Ryujinx.Graphics.Metal
_device = device; _device = device;
} }
public readonly void SetEncoderState(MTLRenderCommandEncoder renderCommandEncoder) public readonly void SetEncoderState(MTLRenderCommandEncoder renderCommandEncoder, MTLVertexDescriptor vertexDescriptor)
{ {
var renderPipelineDescriptor = new MTLRenderPipelineDescriptor var renderPipelineDescriptor = new MTLRenderPipelineDescriptor
{ {
VertexDescriptor = _vertexDescriptor VertexDescriptor = vertexDescriptor
}; };
if (_vertexFunction != null) if (_vertexFunction != null)
@ -51,12 +49,13 @@ namespace Ryujinx.Graphics.Metal
renderPipelineDescriptor.VertexFunction = _fragmentFunction; renderPipelineDescriptor.VertexFunction = _fragmentFunction;
} }
renderPipelineDescriptor.ColorAttachments.Object(0).SetBlendingEnabled(true); var attachment = renderPipelineDescriptor.ColorAttachments.Object(0);
renderPipelineDescriptor.ColorAttachments.Object(0).PixelFormat = MTLPixelFormat.BGRA8Unorm; attachment.SetBlendingEnabled(true);
renderPipelineDescriptor.ColorAttachments.Object(0).SourceAlphaBlendFactor = MTLBlendFactor.SourceAlpha; attachment.PixelFormat = MTLPixelFormat.BGRA8Unorm;
renderPipelineDescriptor.ColorAttachments.Object(0).DestinationAlphaBlendFactor = MTLBlendFactor.OneMinusSourceAlpha; attachment.SourceAlphaBlendFactor = MTLBlendFactor.SourceAlpha;
renderPipelineDescriptor.ColorAttachments.Object(0).SourceRGBBlendFactor = MTLBlendFactor.SourceAlpha; attachment.DestinationAlphaBlendFactor = MTLBlendFactor.OneMinusSourceAlpha;
renderPipelineDescriptor.ColorAttachments.Object(0).DestinationRGBBlendFactor = MTLBlendFactor.OneMinusSourceAlpha; attachment.SourceRGBBlendFactor = MTLBlendFactor.SourceAlpha;
attachment.DestinationRGBBlendFactor = MTLBlendFactor.OneMinusSourceAlpha;
var error = new NSError(IntPtr.Zero); var error = new NSError(IntPtr.Zero);
var pipelineState = _device.NewRenderPipelineState(renderPipelineDescriptor, ref error); var pipelineState = _device.NewRenderPipelineState(renderPipelineDescriptor, ref error);
@ -102,30 +101,5 @@ namespace Ryujinx.Graphics.Metal
FrontFaceStencil = _frontFaceStencil FrontFaceStencil = _frontFaceStencil
}); });
} }
public void UpdateVertexAttributes(ReadOnlySpan<VertexAttribDescriptor> vertexAttribs)
{
for (int i = 0; i < vertexAttribs.Length; i++)
{
if (!vertexAttribs[i].IsZero)
{
// TODO: Format should not be hardcoded
_vertexDescriptor.Attributes.Object((ulong)i).Format = MTLVertexFormat.Float4;
_vertexDescriptor.Attributes.Object((ulong)i).BufferIndex = (ulong)vertexAttribs[i].BufferIndex;
_vertexDescriptor.Attributes.Object((ulong)i).Offset = (ulong)vertexAttribs[i].Offset;
}
}
}
public void UpdateVertexBuffers(ReadOnlySpan<VertexBufferDescriptor> vertexBuffers)
{
for (int i = 0; i < vertexBuffers.Length; i++)
{
if (vertexBuffers[i].Stride != 0)
{
_vertexDescriptor.Layouts.Object((ulong)i).Stride = (ulong)vertexBuffers[i].Stride;
}
}
}
} }
} }