diff --git a/Directory.Packages.props b/Directory.Packages.props
index afef0d7ff..70404ef8e 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -38,11 +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" />
-<<<<<<< HEAD
     <PackageVersion Include="SharpMetal" Version="1.0.0-preview14" />
-=======
-    <PackageVersion Include="SharpMetal" Version="1.0.0-preview12" />
->>>>>>> 3eab14be7 (Set scissors & viewports)
     <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" />
diff --git a/src/Ryujinx.Graphics.Metal/Pipeline.cs b/src/Ryujinx.Graphics.Metal/Pipeline.cs
index 3d9e108a1..2f11de985 100644
--- a/src/Ryujinx.Graphics.Metal/Pipeline.cs
+++ b/src/Ryujinx.Graphics.Metal/Pipeline.cs
@@ -445,26 +445,7 @@ namespace Ryujinx.Graphics.Metal
 
         public void SetScissors(ReadOnlySpan<Rectangle<int>> regions)
         {
-            // TODO: Test max allowed scissor rects on device
-            var mtlScissorRects = new MTLScissorRect[regions.Length];
-
-            for (int i = 0; i < regions.Length; i++)
-            {
-                var region = regions[i];
-                mtlScissorRects[i] = new MTLScissorRect
-                {
-                    height = (ulong)region.Height,
-                    width = (ulong)region.Width,
-                    x = (ulong)region.X,
-                    y = (ulong)region.Y
-                };
-            }
-
-            fixed (MTLScissorRect* pMtlScissorRects = mtlScissorRects)
-            {
-                var renderCommandEncoder = GetOrCreateRenderEncoder();
-                renderCommandEncoder.SetScissorRects((IntPtr)pMtlScissorRects, (ulong)regions.Length);
-            }
+            _encoderStateManager.UpdateScissors(regions);
         }
 
         public void SetStencilTest(StencilTestDescriptor stencilTest)
@@ -532,28 +513,7 @@ namespace Ryujinx.Graphics.Metal
 
         public void SetViewports(ReadOnlySpan<Viewport> viewports)
         {
-            // TODO: Test max allowed viewports on device
-            var mtlViewports = new MTLViewport[viewports.Length];
-
-            for (int i = 0; i < viewports.Length; i++)
-            {
-                var viewport = viewports[i];
-                mtlViewports[i] = new MTLViewport
-                {
-                    originX = viewport.Region.X,
-                    originY = viewport.Region.Y,
-                    width = viewport.Region.Width,
-                    height = viewport.Region.Height,
-                    znear = viewport.DepthNear,
-                    zfar = viewport.DepthFar
-                };
-            }
-
-            fixed (MTLViewport* pMtlViewports = mtlViewports)
-            {
-                var renderCommandEncoder = GetOrCreateRenderEncoder();
-                renderCommandEncoder.SetViewports((IntPtr)pMtlViewports, (ulong)viewports.Length);
-            }
+            _encoderStateManager.UpdateViewports(viewports);
         }
 
         public void TextureBarrier()