From e8ebda10ef7cb5e2b9a917758cbe4f8f57ced23c Mon Sep 17 00:00:00 2001 From: Isaac Marovitz Date: Wed, 2 Aug 2023 21:18:28 -0400 Subject: [PATCH] Fix RGB Seizure --- src/Ryujinx.Graphics.Metal/Pipeline.cs | 7 ++++++- .../Shaders/ColorBlitShaderSource.metal | 3 +-- src/Ryujinx.Graphics.Metal/Window.cs | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Ryujinx.Graphics.Metal/Pipeline.cs b/src/Ryujinx.Graphics.Metal/Pipeline.cs index 963863f38..47d8f52ff 100644 --- a/src/Ryujinx.Graphics.Metal/Pipeline.cs +++ b/src/Ryujinx.Graphics.Metal/Pipeline.cs @@ -29,7 +29,7 @@ namespace Ryujinx.Graphics.Metal private MTLBuffer _indexBuffer; private MTLIndexType _indexType; private ulong _indexBufferOffset; - private MTLClearColor _clearColor = new() { alpha = 1.0f }; + private MTLClearColor _clearColor; private int frameCount = 0; public Pipeline(MTLDevice device, MTLCommandQueue commandQueue, CAMetalLayer metalLayer) @@ -54,7 +54,12 @@ namespace Ryujinx.Graphics.Metal renderPipelineDescriptor.VertexFunction = vertexFunction; renderPipelineDescriptor.FragmentFunction = fragmentFunction; // TODO: This should not be hardcoded, but a bug in SharpMetal prevents me from doing this correctly + renderPipelineDescriptor.ColorAttachments.Object(0).SetBlendingEnabled(true); renderPipelineDescriptor.ColorAttachments.Object(0).PixelFormat = MTLPixelFormat.BGRA8Unorm; + renderPipelineDescriptor.ColorAttachments.Object(0).SourceAlphaBlendFactor = MTLBlendFactor.SourceAlpha; + renderPipelineDescriptor.ColorAttachments.Object(0).DestinationAlphaBlendFactor = MTLBlendFactor.OneMinusSourceAlpha; + renderPipelineDescriptor.ColorAttachments.Object(0).SourceRGBBlendFactor = MTLBlendFactor.SourceAlpha; + renderPipelineDescriptor.ColorAttachments.Object(0).DestinationRGBBlendFactor = MTLBlendFactor.OneMinusSourceAlpha; var renderPipelineState = _device.NewRenderPipelineState(renderPipelineDescriptor, ref error); if (error != IntPtr.Zero) diff --git a/src/Ryujinx.Graphics.Metal/Shaders/ColorBlitShaderSource.metal b/src/Ryujinx.Graphics.Metal/Shaders/ColorBlitShaderSource.metal index 35b314460..a1630e7b8 100644 --- a/src/Ryujinx.Graphics.Metal/Shaders/ColorBlitShaderSource.metal +++ b/src/Ryujinx.Graphics.Metal/Shaders/ColorBlitShaderSource.metal @@ -32,6 +32,5 @@ fragment float4 fragmentMain(CopyVertexOut in [[stage_in]], texture2d tex) { constexpr sampler sam(min_filter::nearest, mag_filter::nearest, mip_filter::none); - float3 color = tex.sample(sam, in.uv).xyz; - return float4(color, 1.0f); + return tex.sample(sam, in.uv).xyzw; } diff --git a/src/Ryujinx.Graphics.Metal/Window.cs b/src/Ryujinx.Graphics.Metal/Window.cs index 12ff35e7f..563f888af 100644 --- a/src/Ryujinx.Graphics.Metal/Window.cs +++ b/src/Ryujinx.Graphics.Metal/Window.cs @@ -1,6 +1,5 @@ using Ryujinx.Common.Logging; using Ryujinx.Graphics.GAL; -using SharpMetal.Metal; using SharpMetal.ObjectiveCCore; using SharpMetal.QuartzCore; using System; @@ -20,6 +19,7 @@ namespace Ryujinx.Graphics.Metal _metalLayer = metalLayer; } + // TODO: Handle ImageCrop public void Present(ITexture texture, ImageCrop crop, Action swapBuffersCallback) { if (_renderer.Pipeline is Pipeline pipeline && texture is Texture tex)