mirror of
https://github.com/Ryujinx/Ryujinx.git
synced 2024-12-20 00:22:07 +00:00
Be better about memory
This commit is contained in:
parent
a264d9273d
commit
ab1e02c56a
1 changed files with 9 additions and 8 deletions
|
@ -4,6 +4,7 @@ using Ryujinx.Graphics.Shader;
|
||||||
using SharpMetal.Metal;
|
using SharpMetal.Metal;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
using System.Runtime.Versioning;
|
using System.Runtime.Versioning;
|
||||||
using BufferAssignment = Ryujinx.Graphics.GAL.BufferAssignment;
|
using BufferAssignment = Ryujinx.Graphics.GAL.BufferAssignment;
|
||||||
|
|
||||||
|
@ -1040,7 +1041,7 @@ namespace Ryujinx.Graphics.Metal
|
||||||
{
|
{
|
||||||
var usage = constant ? MTLResourceUsage.Read : MTLResourceUsage.Write;
|
var usage = constant ? MTLResourceUsage.Read : MTLResourceUsage.Write;
|
||||||
|
|
||||||
ulong[] resourceIds = new ulong[buffers.Length];
|
Span<ulong> resourceIds = stackalloc ulong[buffers.Length];
|
||||||
|
|
||||||
for (int i = 0; i < buffers.Length; i++)
|
for (int i = 0; i < buffers.Length; i++)
|
||||||
{
|
{
|
||||||
|
@ -1073,7 +1074,7 @@ namespace Ryujinx.Graphics.Metal
|
||||||
var sizeOfArgumentBuffer = sizeof(ulong) * buffers.Length;
|
var sizeOfArgumentBuffer = sizeof(ulong) * buffers.Length;
|
||||||
|
|
||||||
var argBuffer = _bufferManager.ReserveOrCreate(_pipeline.Cbs, sizeOfArgumentBuffer);
|
var argBuffer = _bufferManager.ReserveOrCreate(_pipeline.Cbs, sizeOfArgumentBuffer);
|
||||||
argBuffer.Holder.SetDataUnchecked(argBuffer.Offset, new ReadOnlySpan<ulong>(resourceIds));
|
argBuffer.Holder.SetDataUnchecked(argBuffer.Offset, MemoryMarshal.AsBytes(resourceIds));
|
||||||
|
|
||||||
return argBuffer.Range;
|
return argBuffer.Range;
|
||||||
}
|
}
|
||||||
|
@ -1082,7 +1083,7 @@ namespace Ryujinx.Graphics.Metal
|
||||||
{
|
{
|
||||||
var usage = constant ? MTLResourceUsage.Read : MTLResourceUsage.Write;
|
var usage = constant ? MTLResourceUsage.Read : MTLResourceUsage.Write;
|
||||||
|
|
||||||
ulong[] resourceIds = new ulong[buffers.Length];
|
Span<ulong> resourceIds = stackalloc ulong[buffers.Length];
|
||||||
|
|
||||||
for (int i = 0; i < buffers.Length; i++)
|
for (int i = 0; i < buffers.Length; i++)
|
||||||
{
|
{
|
||||||
|
@ -1115,7 +1116,7 @@ namespace Ryujinx.Graphics.Metal
|
||||||
var sizeOfArgumentBuffer = sizeof(ulong) * buffers.Length;
|
var sizeOfArgumentBuffer = sizeof(ulong) * buffers.Length;
|
||||||
|
|
||||||
var argBuffer = _bufferManager.ReserveOrCreate(_pipeline.Cbs, sizeOfArgumentBuffer);
|
var argBuffer = _bufferManager.ReserveOrCreate(_pipeline.Cbs, sizeOfArgumentBuffer);
|
||||||
argBuffer.Holder.SetDataUnchecked(argBuffer.Offset, new ReadOnlySpan<ulong>(resourceIds));
|
argBuffer.Holder.SetDataUnchecked(argBuffer.Offset, MemoryMarshal.AsBytes(resourceIds));
|
||||||
|
|
||||||
return argBuffer.Range;
|
return argBuffer.Range;
|
||||||
}
|
}
|
||||||
|
@ -1163,7 +1164,7 @@ namespace Ryujinx.Graphics.Metal
|
||||||
{
|
{
|
||||||
var renderStage = stage == ShaderStage.Vertex ? MTLRenderStages.RenderStageVertex : MTLRenderStages.RenderStageFragment;
|
var renderStage = stage == ShaderStage.Vertex ? MTLRenderStages.RenderStageVertex : MTLRenderStages.RenderStageFragment;
|
||||||
|
|
||||||
ulong[] resourceIds = new ulong[textures.Length + samplers.Length];
|
Span<ulong> resourceIds = stackalloc ulong[textures.Length + samplers.Length];
|
||||||
|
|
||||||
for (int i = 0; i < textures.Length; i++)
|
for (int i = 0; i < textures.Length; i++)
|
||||||
{
|
{
|
||||||
|
@ -1193,14 +1194,14 @@ namespace Ryujinx.Graphics.Metal
|
||||||
var sizeOfArgumentBuffer = sizeof(ulong) * (textures.Length + samplers.Length);
|
var sizeOfArgumentBuffer = sizeof(ulong) * (textures.Length + samplers.Length);
|
||||||
|
|
||||||
var argBuffer = _bufferManager.ReserveOrCreate(_pipeline.Cbs, sizeOfArgumentBuffer);
|
var argBuffer = _bufferManager.ReserveOrCreate(_pipeline.Cbs, sizeOfArgumentBuffer);
|
||||||
argBuffer.Holder.SetDataUnchecked(argBuffer.Offset, new ReadOnlySpan<ulong>(resourceIds));
|
argBuffer.Holder.SetDataUnchecked(argBuffer.Offset, MemoryMarshal.AsBytes(resourceIds));
|
||||||
|
|
||||||
return argBuffer.Range;
|
return argBuffer.Range;
|
||||||
}
|
}
|
||||||
|
|
||||||
private readonly BufferRange CreateArgumentBufferForComputeEncoder(MTLComputeCommandEncoder computeCommandEncoder, TextureBase[] textures, MTLSamplerState[] samplers)
|
private readonly BufferRange CreateArgumentBufferForComputeEncoder(MTLComputeCommandEncoder computeCommandEncoder, TextureBase[] textures, MTLSamplerState[] samplers)
|
||||||
{
|
{
|
||||||
ulong[] resourceIds = new ulong[textures.Length + samplers.Length];
|
Span<ulong> resourceIds = stackalloc ulong[textures.Length + samplers.Length];
|
||||||
|
|
||||||
for (int i = 0; i < textures.Length; i++)
|
for (int i = 0; i < textures.Length; i++)
|
||||||
{
|
{
|
||||||
|
@ -1230,7 +1231,7 @@ namespace Ryujinx.Graphics.Metal
|
||||||
var sizeOfArgumentBuffer = sizeof(ulong) * (textures.Length + samplers.Length);
|
var sizeOfArgumentBuffer = sizeof(ulong) * (textures.Length + samplers.Length);
|
||||||
|
|
||||||
var argBuffer = _bufferManager.ReserveOrCreate(_pipeline.Cbs, sizeOfArgumentBuffer);
|
var argBuffer = _bufferManager.ReserveOrCreate(_pipeline.Cbs, sizeOfArgumentBuffer);
|
||||||
argBuffer.Holder.SetDataUnchecked(argBuffer.Offset, new ReadOnlySpan<ulong>(resourceIds));
|
argBuffer.Holder.SetDataUnchecked(argBuffer.Offset, MemoryMarshal.AsBytes(resourceIds));
|
||||||
|
|
||||||
return argBuffer.Range;
|
return argBuffer.Range;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue