From f06c869df13d14584571a2a4a1d50eaed4fd4e96 Mon Sep 17 00:00:00 2001 From: Isaac Marovitz Date: Mon, 12 Aug 2024 23:22:15 +0100 Subject: [PATCH] Upstream changes --- src/Ryujinx.Graphics.Metal/EncoderResources.cs | 4 ++-- src/Ryujinx.Graphics.Metal/EncoderStateManager.cs | 8 ++++---- src/Ryujinx.Graphics.Metal/Texture.cs | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Ryujinx.Graphics.Metal/EncoderResources.cs b/src/Ryujinx.Graphics.Metal/EncoderResources.cs index 4fbb9b282..cfda9bcbe 100644 --- a/src/Ryujinx.Graphics.Metal/EncoderResources.cs +++ b/src/Ryujinx.Graphics.Metal/EncoderResources.cs @@ -11,7 +11,7 @@ namespace Ryujinx.Graphics.Metal public RenderEncoderResources() { } - public void Clear() + public readonly void Clear() { Resources.Clear(); VertexBuffers.Clear(); @@ -26,7 +26,7 @@ namespace Ryujinx.Graphics.Metal public ComputeEncoderResources() { } - public void Clear() + public readonly void Clear() { Resources.Clear(); Buffers.Clear(); diff --git a/src/Ryujinx.Graphics.Metal/EncoderStateManager.cs b/src/Ryujinx.Graphics.Metal/EncoderStateManager.cs index 7687b80df..9761de50b 100644 --- a/src/Ryujinx.Graphics.Metal/EncoderStateManager.cs +++ b/src/Ryujinx.Graphics.Metal/EncoderStateManager.cs @@ -62,12 +62,12 @@ namespace Ryujinx.Graphics.Metal _currentState.Dirty |= flags; } - public void SignalRenderDirty() + public readonly void SignalRenderDirty() { SignalDirty(DirtyFlags.RenderAll); } - public void SignalComputeDirty() + public readonly void SignalComputeDirty() { SignalDirty(DirtyFlags.ComputeAll); } @@ -186,7 +186,7 @@ namespace Ryujinx.Graphics.Metal return computeCommandEncoder; } - public void RenderResourcesPrepass() + public readonly void RenderResourcesPrepass() { _currentState.RenderEncoderResources.Clear(); @@ -216,7 +216,7 @@ namespace Ryujinx.Graphics.Metal } } - public void ComputeResourcesPrepass() + public readonly void ComputeResourcesPrepass() { _currentState.ComputeEncoderResources.Clear(); diff --git a/src/Ryujinx.Graphics.Metal/Texture.cs b/src/Ryujinx.Graphics.Metal/Texture.cs index 4219f3db9..82e38def1 100644 --- a/src/Ryujinx.Graphics.Metal/Texture.cs +++ b/src/Ryujinx.Graphics.Metal/Texture.cs @@ -460,7 +460,7 @@ namespace Ryujinx.Graphics.Metal int width = Info.Width; int height = Info.Height; int depth = Info.Depth; - int levels = Info.GetLevelsClamped(); + int levels = Info.Levels; int layers = Info.GetLayers(); bool is3D = Info.Target == Target.Texture3D;