diff options
| author | jhorv <38920027+jhorv@users.noreply.github.com> | 2024-04-14 16:06:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-14 17:06:14 -0300 |
| commit | 268c9aecf8e9181bb7114cf1dd826f00b2237714 (patch) | |
| tree | 7e14ab6cde7c7edaf99bd2151abfb73d5b00f103 /src/Ryujinx.Common/Memory/SpanOrArray.cs | |
| parent | e916662b0f17b93d8987d481784cd45073335990 (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.Common/Memory/SpanOrArray.cs')
| -rw-r--r-- | src/Ryujinx.Common/Memory/SpanOrArray.cs | 89 |
1 files changed, 0 insertions, 89 deletions
diff --git a/src/Ryujinx.Common/Memory/SpanOrArray.cs b/src/Ryujinx.Common/Memory/SpanOrArray.cs deleted file mode 100644 index 269ac02f..00000000 --- a/src/Ryujinx.Common/Memory/SpanOrArray.cs +++ /dev/null @@ -1,89 +0,0 @@ -using System; - -namespace Ryujinx.Common.Memory -{ - /// <summary> - /// A struct that can represent both a Span and Array. - /// This is useful to keep the Array representation when possible to avoid copies. - /// </summary> - /// <typeparam name="T">Element Type</typeparam> - public readonly ref struct SpanOrArray<T> where T : unmanaged - { - public readonly T[] Array; - public readonly ReadOnlySpan<T> Span; - - /// <summary> - /// Create a new SpanOrArray from an array. - /// </summary> - /// <param name="array">Array to store</param> - public SpanOrArray(T[] array) - { - Array = array; - Span = ReadOnlySpan<T>.Empty; - } - - /// <summary> - /// Create a new SpanOrArray from a readonly span. - /// </summary> - /// <param name="array">Span to store</param> - public SpanOrArray(ReadOnlySpan<T> span) - { - Array = null; - Span = span; - } - - /// <summary> - /// Return the contained array, or convert the span if necessary. - /// </summary> - /// <returns>An array containing the data</returns> - public T[] ToArray() - { - return Array ?? Span.ToArray(); - } - - /// <summary> - /// Return a ReadOnlySpan from either the array or ReadOnlySpan. - /// </summary> - /// <returns>A ReadOnlySpan containing the data</returns> - public ReadOnlySpan<T> AsSpan() - { - return Array ?? Span; - } - - /// <summary> - /// Cast an array to a SpanOrArray. - /// </summary> - /// <param name="array">Source array</param> - public static implicit operator SpanOrArray<T>(T[] array) - { - return new SpanOrArray<T>(array); - } - - /// <summary> - /// Cast a ReadOnlySpan to a SpanOrArray. - /// </summary> - /// <param name="span">Source ReadOnlySpan</param> - public static implicit operator SpanOrArray<T>(ReadOnlySpan<T> span) - { - return new SpanOrArray<T>(span); - } - - /// <summary> - /// Cast a Span to a SpanOrArray. - /// </summary> - /// <param name="span">Source Span</param> - public static implicit operator SpanOrArray<T>(Span<T> span) - { - return new SpanOrArray<T>(span); - } - - /// <summary> - /// Cast a SpanOrArray to a ReadOnlySpan - /// </summary> - /// <param name="spanOrArray">Source SpanOrArray</param> - public static implicit operator ReadOnlySpan<T>(SpanOrArray<T> spanOrArray) - { - return spanOrArray.AsSpan(); - } - } -} |
