ShuriZma
/
Ryujinx
mirror of https://github.com/Ryujinx/Ryujinx.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix present

This commit is contained in:
Isaac Marovitz 2024-05-18 20:27:27 -04:00
parent 1433218fad
commit 07e329a37c
No known key found for this signature in database
GPG Key ID: 97250B2B09A132E1
4 changed files with 43 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Ryujinx.Graphics.Metal/EncoderState.cs
View File

@ -8,6 +8,8 @@ namespace Ryujinx.Graphics.Metal
[SupportedOSPlatform("macos")] [SupportedOSPlatform("macos")]
public struct EncoderState public struct EncoderState
{ {
public const int MaxColorAttachments = 8;
public MTLFunction? VertexFunction = null; public MTLFunction? VertexFunction = null;
public MTLFunction? FragmentFunction = null; public MTLFunction? FragmentFunction = null;
@ -43,7 +45,7 @@ namespace Ryujinx.Graphics.Metal
// Changes to attachments take recreation! // Changes to attachments take recreation!
public MTLTexture DepthStencil = default; public MTLTexture DepthStencil = default;
public MTLTexture[] RenderTargets = []; public MTLTexture[] RenderTargets = new MTLTexture[MaxColorAttachments];
public MTLVertexDescriptor VertexDescriptor = new(); public MTLVertexDescriptor VertexDescriptor = new();
public EncoderState() { } public EncoderState() { }

66
src/Ryujinx.Graphics.Metal/EncoderStateManager.cs
View File

@ -48,8 +48,7 @@ namespace Ryujinx.Graphics.Metal
var renderPassDescriptor = new MTLRenderPassDescriptor(); var renderPassDescriptor = new MTLRenderPassDescriptor();
var renderPipelineDescriptor = new MTLRenderPipelineDescriptor(); var renderPipelineDescriptor = new MTLRenderPipelineDescriptor();
const int MaxColorAttachments = 8; for (int i = 0; i < EncoderState.MaxColorAttachments; i++)
for (int i = 0; i < MaxColorAttachments; i++)
{ {
if (_currentState.RenderTargets[i] != IntPtr.Zero) if (_currentState.RenderTargets[i] != IntPtr.Zero)
{ {
@ -70,40 +69,43 @@ namespace Ryujinx.Graphics.Metal
var depthAttachment = renderPassDescriptor.DepthAttachment; var depthAttachment = renderPassDescriptor.DepthAttachment;
var stencilAttachment = renderPassDescriptor.StencilAttachment; var stencilAttachment = renderPassDescriptor.StencilAttachment;
switch (_currentState.DepthStencil.PixelFormat) if (_currentState.DepthStencil != IntPtr.Zero)
{ {
// Depth Only Attachment switch (_currentState.DepthStencil.PixelFormat)
case MTLPixelFormat.Depth16Unorm: {
case MTLPixelFormat.Depth32Float: // Depth Only Attachment
depthAttachment.Texture = _currentState.DepthStencil; case MTLPixelFormat.Depth16Unorm:
depthAttachment.LoadAction = MTLLoadAction.Load; case MTLPixelFormat.Depth32Float:
renderPipelineDescriptor.DepthAttachmentPixelFormat = _currentState.DepthStencil.PixelFormat; depthAttachment.Texture = _currentState.DepthStencil;
break; depthAttachment.LoadAction = MTLLoadAction.Load;
renderPipelineDescriptor.DepthAttachmentPixelFormat = _currentState.DepthStencil.PixelFormat;
break;
// Stencil Only Attachment // Stencil Only Attachment
case MTLPixelFormat.Stencil8: case MTLPixelFormat.Stencil8:
stencilAttachment.Texture = _currentState.DepthStencil; stencilAttachment.Texture = _currentState.DepthStencil;
stencilAttachment.LoadAction = MTLLoadAction.Load; stencilAttachment.LoadAction = MTLLoadAction.Load;
renderPipelineDescriptor.StencilAttachmentPixelFormat = _currentState.DepthStencil.PixelFormat; renderPipelineDescriptor.StencilAttachmentPixelFormat = _currentState.DepthStencil.PixelFormat;
break; break;
// Combined Attachment // Combined Attachment
case MTLPixelFormat.Depth24UnormStencil8: case MTLPixelFormat.Depth24UnormStencil8:
case MTLPixelFormat.Depth32FloatStencil8: case MTLPixelFormat.Depth32FloatStencil8:
depthAttachment.Texture = _currentState.DepthStencil; depthAttachment.Texture = _currentState.DepthStencil;
depthAttachment.LoadAction = MTLLoadAction.Load; depthAttachment.LoadAction = MTLLoadAction.Load;
var unpackedFormat = FormatTable.PackedStencilToXFormat(_currentState.DepthStencil.PixelFormat); var unpackedFormat = FormatTable.PackedStencilToXFormat(_currentState.DepthStencil.PixelFormat);
var stencilView = _currentState.DepthStencil.NewTextureView(unpackedFormat); var stencilView = _currentState.DepthStencil.NewTextureView(unpackedFormat);
stencilAttachment.Texture = stencilView; stencilAttachment.Texture = stencilView;
stencilAttachment.LoadAction = MTLLoadAction.Load; stencilAttachment.LoadAction = MTLLoadAction.Load;
renderPipelineDescriptor.DepthAttachmentPixelFormat = _currentState.DepthStencil.PixelFormat; renderPipelineDescriptor.DepthAttachmentPixelFormat = _currentState.DepthStencil.PixelFormat;
renderPipelineDescriptor.StencilAttachmentPixelFormat = _currentState.DepthStencil.PixelFormat; renderPipelineDescriptor.StencilAttachmentPixelFormat = _currentState.DepthStencil.PixelFormat;
break; break;
default: default:
Logger.Error?.PrintMsg(LogClass.Gpu, $"Unsupported Depth/Stencil Format: {_currentState.DepthStencil.PixelFormat}!"); Logger.Error?.PrintMsg(LogClass.Gpu, $"Unsupported Depth/Stencil Format: {_currentState.DepthStencil.PixelFormat}!");
break; break;
}
} }
renderPipelineDescriptor.VertexDescriptor = _currentState.VertexDescriptor; renderPipelineDescriptor.VertexDescriptor = _currentState.VertexDescriptor;
@ -187,7 +189,7 @@ namespace Ryujinx.Graphics.Metal
public void UpdateRenderTargets(ITexture[] colors, ITexture depthStencil) public void UpdateRenderTargets(ITexture[] colors, ITexture depthStencil)
{ {
_currentState.RenderTargets = new MTLTexture[colors.Length]; _currentState.RenderTargets = new MTLTexture[EncoderState.MaxColorAttachments];
for (int i = 0; i < colors.Length; i++) for (int i = 0; i < colors.Length; i++)
{ {

1
src/Ryujinx.Graphics.Metal/MetalRenderer.cs
View File

@ -43,6 +43,7 @@ namespace Ryujinx.Graphics.Metal
{ {
var layer = _getMetalLayer(); var layer = _getMetalLayer();
layer.Device = _device; layer.Device = _device;
layer.FramebufferOnly = false;
_window = new Window(this, layer); _window = new Window(this, layer);
_pipeline = new Pipeline(_device, _queue); _pipeline = new Pipeline(_device, _queue);

6
src/Ryujinx.Graphics.Metal/Pipeline.cs
View File

@ -158,7 +158,11 @@ namespace Ryujinx.Graphics.Metal
_encoderStateManager.SwapStates(); _encoderStateManager.SwapStates();
// _helperShader.BlitColor(tex, drawable.Texture); // TODO: Clean this up
var textureInfo = new TextureCreateInfo((int)drawable.Texture.Width, (int)drawable.Texture.Height, (int)drawable.Texture.Depth, (int)drawable.Texture.MipmapLevelCount, (int)drawable.Texture.SampleCount, 0, 0, 0, Format.B8G8R8A8Unorm, 0, Target.Texture2D, SwizzleComponent.Red, SwizzleComponent.Green, SwizzleComponent.Blue, SwizzleComponent.Alpha);
var dest = new Texture(_device, this, textureInfo, drawable.Texture, 0, 0);
_helperShader.BlitColor(tex, dest);
_commandBuffer.PresentDrawable(drawable); _commandBuffer.PresentDrawable(drawable);
_commandBuffer.Commit(); _commandBuffer.Commit();