Cleanup + Format

This commit is contained in:
Isaac Marovitz 2024-07-02 17:52:53 +01:00 committed by Isaac Marovitz
parent 8e8dcf0d7f
commit 0c1acb5107
4 changed files with 6 additions and 8 deletions

View File

@ -167,4 +167,4 @@ class CommandBufferEncoder
CurrentEncoderType = EncoderType.Compute;
return computeCommandEncoder;
}
}
}

View File

@ -868,7 +868,6 @@ namespace Ryujinx.Graphics.Metal
{
ref PipelineState pipeline = ref _currentState.Pipeline;
uint indexMask = 0;
int descriptorCount = 0;
for (int i = 0; i < attribDescriptors.Length; i++)
{
@ -1352,7 +1351,7 @@ namespace Ryujinx.Graphics.Metal
}
}
private uint SetIndexToBindingIndex(int setIndex)
private static uint SetIndexToBindingIndex(int setIndex)
{
return setIndex switch
{
@ -1363,7 +1362,6 @@ namespace Ryujinx.Graphics.Metal
};
}
private readonly void SetCullMode(MTLRenderCommandEncoder renderCommandEncoder)
{
renderCommandEncoder.SetCullMode(_currentState.CullMode);

View File

@ -218,7 +218,7 @@ namespace Ryujinx.Graphics.Metal
}
case EncoderType.Compute:
{
var scope = MTLBarrierScope.Buffers | MTLBarrierScope.Textures | MTLBarrierScope.RenderTargets;;
var scope = MTLBarrierScope.Buffers | MTLBarrierScope.Textures | MTLBarrierScope.RenderTargets;
Encoders.ComputeEncoder.MemoryBarrier(scope);
break;
}

View File

@ -38,7 +38,7 @@ namespace Ryujinx.Graphics.Metal
descriptor.Swizzle = GetSwizzle(info, descriptor.PixelFormat);
_mtlTexture = _device.NewTexture(descriptor);
MtlFormat = pixelFormat;
descriptor.Dispose();
}
@ -113,7 +113,7 @@ namespace Ryujinx.Graphics.Metal
0,
(ulong)firstLevel,
new MTLOrigin { x = 0, y = 0, z = (ulong)firstLayer },
new MTLSize { width = (ulong)Math.Min(Info.Width, destinationTexture.Info.Width), height = (ulong)Math.Min(Info.Height, destinationTexture.Info.Height), depth = 1},
new MTLSize { width = (ulong)Math.Min(Info.Width, destinationTexture.Info.Width), height = (ulong)Math.Min(Info.Height, destinationTexture.Info.Height), depth = 1 },
destinationTexture._mtlTexture,
0,
(ulong)firstLevel,
@ -147,7 +147,7 @@ namespace Ryujinx.Graphics.Metal
0,
(ulong)srcLevel,
new MTLOrigin { x = 0, y = 0, z = (ulong)srcLayer },
new MTLSize { width = (ulong)Math.Min(Info.Width, destinationTexture.Info.Width), height = (ulong)Math.Min(Info.Height, destinationTexture.Info.Height), depth = 1},
new MTLSize { width = (ulong)Math.Min(Info.Width, destinationTexture.Info.Width), height = (ulong)Math.Min(Info.Height, destinationTexture.Info.Height), depth = 1 },
destinationTexture._mtlTexture,
0,
(ulong)dstLevel,