deadcade/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Start Proper Dispose

Browse source
This commit is contained in:
Isaac Marovitz 2024-05-23 13:15:23 -04:00 committed by Isaac Marovitz
parent 4bbf7b67d4
commit 937d84018e
5 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Directory.Packages.props
View file

@ -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-preview12" />
<PackageVersion Include="SharpMetal" Version="1.0.0-preview14" />
<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" />

20
src/Ryujinx.Graphics.Metal/MetalRenderer.cs
View file

@ -215,17 +215,19 @@ namespace Ryujinx.Graphics.Metal
{
var blitEncoder = _pipeline.GetOrCreateBlitEncoder();
MTLBuffer src = _device.NewBuffer((ulong)data.Length, MTLResourceOptions.ResourceStorageModeManaged);
var span = new Span<byte>(src.Contents.ToPointer(), data.Length);
data.CopyTo(span);
src.DidModifyRange(new NSRange
using MTLBuffer src = _device.NewBuffer((ulong)data.Length, MTLResourceOptions.ResourceStorageModeManaged);
{
location = 0,
length = (ulong)data.Length
});
var span = new Span<byte>(src.Contents.ToPointer(), data.Length);
data.CopyTo(span);
src.DidModifyRange(new NSRange
{
location = 0,
length = (ulong)data.Length
});
MTLBuffer dst = new(Unsafe.As<BufferHandle, IntPtr>(ref buffer));
blitEncoder.CopyFromBuffer(src, 0, dst, (ulong)offset, (ulong)data.Length);
MTLBuffer dst = new(Unsafe.As<BufferHandle, IntPtr>(ref buffer));
blitEncoder.CopyFromBuffer(src, 0, dst, (ulong)offset, (ulong)data.Length);
}
}
public void UpdateCounters()

4
src/Ryujinx.Graphics.Metal/Program.cs
View file

@ -63,7 +63,9 @@ namespace Ryujinx.Graphics.Metal
public void Dispose()
{
return;
VertexFunction.Dispose();
FragmentFunction.Dispose();
ComputeFunction.Dispose();
}
}
}

1
src/Ryujinx.Graphics.Metal/Sampler.cs
View file

@ -45,6 +45,7 @@ namespace Ryujinx.Graphics.Metal
public void Dispose()
{
_mtlSamplerState.Dispose();
}
}
}

1
src/Ryujinx.Graphics.Metal/Texture.cs
View file

@ -329,6 +329,7 @@ namespace Ryujinx.Graphics.Metal
public void Dispose()
{
MTLTexture.SetPurgeableState(MTLPurgeableState.Volatile);
MTLTexture.Dispose();
}
}
}