aboutsummaryrefslogtreecommitdiff
path: root/src/Ryujinx.Graphics.Vulkan/TextureView.cs
diff options
context:
space:
mode:
authorjhorv <38920027+jhorv@users.noreply.github.com>2024-04-14 16:06:14 -0400
committerGitHub <noreply@github.com>2024-04-14 17:06:14 -0300
commit268c9aecf8e9181bb7114cf1dd826f00b2237714 (patch)
tree7e14ab6cde7c7edaf99bd2151abfb73d5b00f103 /src/Ryujinx.Graphics.Vulkan/TextureView.cs
parente916662b0f17b93d8987d481784cd45073335990 (diff)
Texture loading: reduce memory allocations (#6623)
* rebase * add methods Ryyjinx.Common EmbeddedResources and SteamUtils * GAL changes - change SetData() methods and ThreadedTexture commands to use IMemoryOwner<byte> instead of SpanOrArray<byte> * Ryujinx.Graphics.Texture: change texture conversion methods to return IMemoryOwner<byte> and allocate from ByteMemoryPool * Ryujinx.Graphics.OpenGL: update ITexture and Texture-like types with SetData() methods to take IMemoryOwner<byte> instead of SpanOrArray<byte> * Ryujinx.Graphics.Vulkan: update ITexture and Texture-like types with SetData() methods to take IMemoryOwner<byte> instead of SpanOrArray<byte> * Ryujinx.Graphics.Gpu: update ITexture and Texture-like types with SetData() methods to take IMemoryOwner<byte> instead of SpanOrArray<byte> * Remove now-unused SpanOrArray<T> * post-rebase cleanup * PixelConverter: remove unsafe modifier on safe methods, and remove one unnecessary cast * use ByteMemoryPool.Rent() in GetWritableRegion() impls * fix formatting, rename `ReadRentedMemory()` to `ReadFileToRentedMemory()`` * Texture.ConvertToHostCompatibleFormat(): dispose of `result` in Astc decode branch
Diffstat (limited to 'src/Ryujinx.Graphics.Vulkan/TextureView.cs')
-rw-r--r--src/Ryujinx.Graphics.Vulkan/TextureView.cs20
1 files changed, 13 insertions, 7 deletions
diff --git a/src/Ryujinx.Graphics.Vulkan/TextureView.cs b/src/Ryujinx.Graphics.Vulkan/TextureView.cs
index d918f965..f2aaf469 100644
--- a/src/Ryujinx.Graphics.Vulkan/TextureView.cs
+++ b/src/Ryujinx.Graphics.Vulkan/TextureView.cs
@@ -1,7 +1,7 @@
-using Ryujinx.Common.Memory;
using Ryujinx.Graphics.GAL;
using Silk.NET.Vulkan;
using System;
+using System.Buffers;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
@@ -702,19 +702,25 @@ namespace Ryujinx.Graphics.Vulkan
return GetDataFromBuffer(result, size, result);
}
- public void SetData(SpanOrArray<byte> data)
+ /// <inheritdoc/>
+ public void SetData(IMemoryOwner<byte> data)
{
- SetData(data, 0, 0, Info.GetLayers(), Info.Levels, singleSlice: false);
+ SetData(data.Memory.Span, 0, 0, Info.GetLayers(), Info.Levels, singleSlice: false);
+ data.Dispose();
}
- public void SetData(SpanOrArray<byte> data, int layer, int level)
+ /// <inheritdoc/>
+ public void SetData(IMemoryOwner<byte> data, int layer, int level)
{
- SetData(data, layer, level, 1, 1, singleSlice: true);
+ SetData(data.Memory.Span, layer, level, 1, 1, singleSlice: true);
+ data.Dispose();
}
- public void SetData(SpanOrArray<byte> data, int layer, int level, Rectangle<int> region)
+ /// <inheritdoc/>
+ public void SetData(IMemoryOwner<byte> data, int layer, int level, Rectangle<int> region)
{
- SetData(data, layer, level, 1, 1, singleSlice: true, region);
+ SetData(data.Memory.Span, layer, level, 1, 1, singleSlice: true, region);
+ data.Dispose();
}
private void SetData(ReadOnlySpan<byte> data, int layer, int level, int layers, int levels, bool singleSlice, Rectangle<int>? region = null)