Fix some rebase errors

Directory.Packages.props

@@ -38,7 +38,7 @@
     <PackageVersion Include="Ryujinx.SDL2-CS" Version="2.30.0-build32" />
     <PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />
     <PackageVersion Include="shaderc.net" Version="0.1.0" />
-    <PackageVersion Include="SharpMetal" Version="1.0.0-preview9" />
+    <PackageVersion Include="SharpMetal" Version="1.0.0-preview11" />
     <PackageVersion Include="SharpZipLib" Version="1.4.2" />
     <PackageVersion Include="Silk.NET.Vulkan" Version="2.21.0" />
     <PackageVersion Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.21.0" />

Directory.Packages.props.orig

@@ -3,13 +3,13 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Avalonia" Version="11.0.7" />
+    <PackageVersion Include="Avalonia" Version="11.0.10" />
-    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.0.7" />
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.0.10" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.0.7" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.0.10" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="11.0.7" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.0.10" />
-    <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.0.7" />
+    <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.0.10" />
-    <PackageVersion Include="Avalonia.Svg" Version="11.0.0.10" />
+    <PackageVersion Include="Avalonia.Svg" Version="11.0.0.16" />
-    <PackageVersion Include="Avalonia.Svg.Skia" Version="11.0.0.10" />
+    <PackageVersion Include="Avalonia.Svg.Skia" Version="11.0.0.16" />
     <PackageVersion Include="CommandLineParser" Version="2.9.1" />
     <PackageVersion Include="Concentus" Version="1.1.7" />
     <PackageVersion Include="DiscordRichPresence" Version="1.2.1.24" />
@@ -17,18 +17,15 @@
     <PackageVersion Include="FluentAvaloniaUI" Version="2.0.5" />
     <PackageVersion Include="GtkSharp.Dependencies" Version="1.1.1" />
     <PackageVersion Include="GtkSharp.Dependencies.osx" Version="0.0.5" />
-    <PackageVersion Include="jp2masa.Avalonia.Flexbox" Version="0.3.0-beta.4" />
     <PackageVersion Include="LibHac" Version="0.19.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
-<<<<<<< HEAD
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
+<<<<<<< HEAD
     <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.5.1" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
 =======
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
+    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.4.0" />
-    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.2.0" />
+>>>>>>> 546c1ffc0 (Fix some rebase errors)
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
->>>>>>> 45a6dffcf (Bump SharpMetal)
     <PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.0" />
     <PackageVersion Include="MsgPack.Cli" Version="1.0.1" />
     <PackageVersion Include="NetCoreServer" Version="8.0.7" />
@@ -39,29 +36,26 @@
     <PackageVersion Include="OpenTK.Audio.OpenAL" Version="4.8.2" />
     <PackageVersion Include="OpenTK.Windowing.GraphicsLibraryFramework" Version="4.8.2" />
     <PackageVersion Include="Ryujinx.Audio.OpenAL.Dependencies" Version="1.21.0.1" />
-    <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies" Version="5.0.1-build13" />
+    <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies" Version="5.0.3-build14" />
     <PackageVersion Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Version="1.2.0" />
     <PackageVersion Include="Ryujinx.GtkSharp" Version="3.24.24.59-ryujinx" />
-    <PackageVersion Include="Ryujinx.SDL2-CS" Version="2.28.1-build28" />
+    <PackageVersion Include="Ryujinx.SDL2-CS" Version="2.30.0-build32" />
     <PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />
     <PackageVersion Include="shaderc.net" Version="0.1.0" />
-    <PackageVersion Include="SharpMetal" Version="1.0.0-preview9" />
+    <PackageVersion Include="SharpMetal" Version="1.0.0-preview11" />
     <PackageVersion Include="SharpZipLib" Version="1.4.2" />
     <PackageVersion Include="Silk.NET.Vulkan" Version="2.16.0" />
     <PackageVersion Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.16.0" />
     <PackageVersion Include="Silk.NET.Vulkan.Extensions.KHR" Version="2.16.0" />
 <<<<<<< HEAD
     <PackageVersion Include="SixLabors.ImageSharp" Version="2.1.8" />
+=======
+    <PackageVersion Include="SixLabors.ImageSharp" Version="2.1.7" />
+>>>>>>> 546c1ffc0 (Fix some rebase errors)
     <PackageVersion Include="SixLabors.ImageSharp.Drawing" Version="1.0.0" />
     <PackageVersion Include="SPB" Version="0.0.4-build32" />
-=======
-    <PackageVersion Include="SixLabors.ImageSharp" Version="1.0.4" />
-    <PackageVersion Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta11" />
-    <PackageVersion Include="SPB" Version="0.0.4-build28" />
-    <PackageVersion Include="System.Drawing.Common" Version="8.0.1" />
->>>>>>> 45a6dffcf (Bump SharpMetal)
     <PackageVersion Include="System.IO.Hashing" Version="8.0.0" />
     <PackageVersion Include="System.Management" Version="8.0.0" />
     <PackageVersion Include="UnicornEngine.Unicorn" Version="2.0.2-rc1-fb78016" />
   </ItemGroup>
-</Project>
+</Project>

src/Ryujinx.Graphics.Metal/EnumConversion.cs

@@ -1,6 +1,6 @@
 using Ryujinx.Common.Logging;
 using Ryujinx.Graphics.GAL;
-using SharpMetal;
+using SharpMetal.Metal;
 
 namespace Ryujinx.Graphics.Metal
 {
@@ -168,7 +168,7 @@ namespace Ryujinx.Graphics.Metal
         {
             return target switch
             {
-                Target.TextureBuffer => MTLTextureType.TypeTextureBuffer,
+                Target.TextureBuffer => MTLTextureType.TextureBuffer,
                 Target.Texture1D => MTLTextureType.Type1D,
                 Target.Texture1DArray => MTLTextureType.Type1DArray,
                 Target.Texture2D => MTLTextureType.Type2D,
@@ -176,8 +176,8 @@ namespace Ryujinx.Graphics.Metal
                 Target.Texture2DMultisample => MTLTextureType.Type2DMultisample,
                 Target.Texture2DMultisampleArray => MTLTextureType.Type2DMultisampleArray,
                 Target.Texture3D => MTLTextureType.Type3D,
-                Target.Cubemap => MTLTextureType.TypeCube,
+                Target.Cubemap => MTLTextureType.Cube,
-                Target.CubemapArray => MTLTextureType.TypeCubeArray,
+                Target.CubemapArray => MTLTextureType.CubeArray,
                 _ => LogInvalidAndReturn(target, nameof(Target), MTLTextureType.Type2D)
             };
         }
@@ -203,4 +203,4 @@ namespace Ryujinx.Graphics.Metal
             return defaultValue;
         }
     }
-}
+}

src/Ryujinx.Graphics.Metal/Pipeline.cs

@@ -23,12 +23,12 @@ namespace Ryujinx.Graphics.Metal
         private readonly HelperShaders _helperShaders;
 
         private MTLCommandBuffer _commandBuffer;
-        private MTLCommandEncoder _currentEncoder;
+        private MTLCommandEncoder? _currentEncoder;
-        private MTLTexture[] _renderTargets = Array.Empty<MTLTexture>();
+        private MTLTexture[] _renderTargets = [];
 
         private RenderEncoderState _renderEncoderState;
         private readonly MTLVertexDescriptor _vertexDescriptor = new();
-        private MTLBuffer[] _vertexBuffers = Array.Empty<MTLBuffer>();
+        private MTLBuffer[] _vertexBuffers = [];
 
         private MTLBuffer _indexBuffer;
         private MTLIndexType _indexType;
@@ -393,6 +393,11 @@ namespace Ryujinx.Graphics.Metal
             }
         }
 
+        public void SetImage(ShaderStage stage, int binding, ITexture texture, Format imageFormat)
+        {
+            Logger.Warning?.Print(LogClass.Gpu, "Not Implemented!");
+        }
+
         public void SetImage(int binding, ITexture texture, Format imageFormat)
         {
             Logger.Warning?.Print(LogClass.Gpu, "Not Implemented!");

src/Ryujinx.Graphics.Metal/RenderEncoderState.cs

@@ -11,15 +11,15 @@ namespace Ryujinx.Graphics.Metal
     struct RenderEncoderState
     {
         private readonly MTLDevice _device;
-        private readonly MTLFunction _vertexFunction = null;
+        private readonly MTLFunction? _vertexFunction = null;
-        private readonly MTLFunction _fragmentFunction = null;
+        private readonly MTLFunction? _fragmentFunction = null;
-        private MTLDepthStencilState _depthStencilState = null;
+        private MTLDepthStencilState? _depthStencilState = null;
 
         private MTLCompareFunction _depthCompareFunction = MTLCompareFunction.Always;
         private bool _depthWriteEnabled = false;
 
-        private MTLStencilDescriptor _backFaceStencil = null;
+        private MTLStencilDescriptor? _backFaceStencil = null;
-        private MTLStencilDescriptor _frontFaceStencil = null;
+        private MTLStencilDescriptor? _frontFaceStencil = null;
 
         public PrimitiveTopology Topology = PrimitiveTopology.Triangles;
         public MTLCullMode CullMode = MTLCullMode.None;
@@ -41,12 +41,12 @@ namespace Ryujinx.Graphics.Metal
 
             if (_vertexFunction != null)
             {
-                renderPipelineDescriptor.VertexFunction = _vertexFunction;
+                renderPipelineDescriptor.VertexFunction = _vertexFunction.Value;
             }
 
             if (_fragmentFunction != null)
             {
-                renderPipelineDescriptor.FragmentFunction = _fragmentFunction;
+                renderPipelineDescriptor.FragmentFunction = _fragmentFunction.Value;
             }
 
             var attachment = renderPipelineDescriptor.ColorAttachments.Object(0);
@@ -70,7 +70,7 @@ namespace Ryujinx.Graphics.Metal
 
             if (_depthStencilState != null)
             {
-                renderCommandEncoder.SetDepthStencilState(_depthStencilState);
+                renderCommandEncoder.SetDepthStencilState(_depthStencilState.Value);
             }
         }
 
@@ -79,13 +79,15 @@ namespace Ryujinx.Graphics.Metal
             _backFaceStencil = backFace;
             _frontFaceStencil = frontFace;
 
-            return _depthStencilState = _device.NewDepthStencilState(new MTLDepthStencilDescriptor
+            _depthStencilState = _device.NewDepthStencilState(new MTLDepthStencilDescriptor
             {
                 DepthCompareFunction = _depthCompareFunction,
                 DepthWriteEnabled = _depthWriteEnabled,
-                BackFaceStencil = _backFaceStencil,
+                BackFaceStencil = _backFaceStencil.Value,
-                FrontFaceStencil = _frontFaceStencil
+                FrontFaceStencil = _frontFaceStencil.Value
             });
+
+            return _depthStencilState.Value;
         }
 
         public MTLDepthStencilState UpdateDepthState(MTLCompareFunction depthCompareFunction, bool depthWriteEnabled)
@@ -93,13 +95,15 @@ namespace Ryujinx.Graphics.Metal
             _depthCompareFunction = depthCompareFunction;
             _depthWriteEnabled = depthWriteEnabled;
 
-            return _depthStencilState = _device.NewDepthStencilState(new MTLDepthStencilDescriptor
+            _depthStencilState = _device.NewDepthStencilState(new MTLDepthStencilDescriptor
             {
                 DepthCompareFunction = _depthCompareFunction,
                 DepthWriteEnabled = _depthWriteEnabled,
-                BackFaceStencil = _backFaceStencil,
+                BackFaceStencil = _backFaceStencil.Value,
-                FrontFaceStencil = _frontFaceStencil
+                FrontFaceStencil = _frontFaceStencil.Value
             });
+
+            return _depthStencilState.Value;
         }
     }
 }

src/Ryujinx/Ryujinx.csproj

@@ -52,6 +52,7 @@
     <PackageReference Include="Silk.NET.Vulkan" />
     <PackageReference Include="Silk.NET.Vulkan.Extensions.EXT" />
     <PackageReference Include="Silk.NET.Vulkan.Extensions.KHR" />
+    <PackageReference Include="Ryujinx.Graphics.Metal" />
     <PackageReference Include="SPB" />
     <PackageReference Include="SharpZipLib" />
   </ItemGroup>
@@ -59,6 +60,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Ryujinx.Audio.Backends.SDL2\Ryujinx.Audio.Backends.SDL2.csproj" />
     <ProjectReference Include="..\Ryujinx.Graphics.Vulkan\Ryujinx.Graphics.Vulkan.csproj" />
+    <ProjectReference Include="..\Ryujinx.Graphics.Metal\Ryujinx.Graphics.Metal.csproj" />
     <ProjectReference Include="..\Ryujinx.Input\Ryujinx.Input.csproj" />
     <ProjectReference Include="..\Ryujinx.Input.SDL2\Ryujinx.Input.SDL2.csproj" />
     <ProjectReference Include="..\Ryujinx.Audio.Backends.OpenAL\Ryujinx.Audio.Backends.OpenAL.csproj" />

src/Ryujinx/UI/Renderer/EmbeddedWindowMetal.cs

@@ -2,7 +2,7 @@ using SPB.Windowing;
 using SPB.Platform.Metal;
 using System;
 
-namespace Ryujinx.UI.Renderer
+namespace Ryujinx.Ava.UI.Renderer
 {
     public class EmbeddedWindowMetal : EmbeddedWindow
     {
@@ -22,4 +22,4 @@ namespace Ryujinx.UI.Renderer
             return simpleMetalWindow;
         }
     }
-}
+}