aboutsummaryrefslogtreecommitdiff
path: root/src/Ryujinx.Graphics.Gpu/Image
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.Gpu/Image
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.Gpu/Image')
-rw-r--r--src/Ryujinx.Graphics.Gpu/Image/Texture.cs169
-rw-r--r--src/Ryujinx.Graphics.Gpu/Image/TextureGroup.cs4
2 files changed, 111 insertions, 62 deletions
diff --git a/src/Ryujinx.Graphics.Gpu/Image/Texture.cs b/src/Ryujinx.Graphics.Gpu/Image/Texture.cs
index 7a043b2b..e67caea8 100644
--- a/src/Ryujinx.Graphics.Gpu/Image/Texture.cs
+++ b/src/Ryujinx.Graphics.Gpu/Image/Texture.cs
@@ -1,5 +1,4 @@
using Ryujinx.Common.Logging;
-using Ryujinx.Common.Memory;
using Ryujinx.Graphics.GAL;
using Ryujinx.Graphics.Gpu.Memory;
using Ryujinx.Graphics.Texture;
@@ -7,6 +6,7 @@ using Ryujinx.Graphics.Texture.Astc;
using Ryujinx.Memory;
using Ryujinx.Memory.Range;
using System;
+using System.Buffers;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
@@ -661,7 +661,7 @@ namespace Ryujinx.Graphics.Gpu.Image
}
}
- SpanOrArray<byte> result = ConvertToHostCompatibleFormat(data);
+ IMemoryOwner<byte> result = ConvertToHostCompatibleFormat(data);
if (ScaleFactor != 1f && AllowScaledSetData())
{
@@ -684,7 +684,7 @@ namespace Ryujinx.Graphics.Gpu.Image
/// Uploads new texture data to the host GPU.
/// </summary>
/// <param name="data">New data</param>
- public void SetData(SpanOrArray<byte> data)
+ public void SetData(IMemoryOwner<byte> data)
{
BlacklistScale();
@@ -703,7 +703,7 @@ namespace Ryujinx.Graphics.Gpu.Image
/// <param name="data">New data</param>
/// <param name="layer">Target layer</param>
/// <param name="level">Target level</param>
- public void SetData(SpanOrArray<byte> data, int layer, int level)
+ public void SetData(IMemoryOwner<byte> data, int layer, int level)
{
BlacklistScale();
@@ -721,7 +721,7 @@ namespace Ryujinx.Graphics.Gpu.Image
/// <param name="layer">Target layer</param>
/// <param name="level">Target level</param>
/// <param name="region">Target sub-region of the texture to update</param>
- public void SetData(ReadOnlySpan<byte> data, int layer, int level, Rectangle<int> region)
+ public void SetData(IMemoryOwner<byte> data, int layer, int level, Rectangle<int> region)
{
BlacklistScale();
@@ -739,7 +739,7 @@ namespace Ryujinx.Graphics.Gpu.Image
/// <param name="level">Mip level to convert</param>
/// <param name="single">True to convert a single slice</param>
/// <returns>Converted data</returns>
- public SpanOrArray<byte> ConvertToHostCompatibleFormat(ReadOnlySpan<byte> data, int level = 0, bool single = false)
+ public IMemoryOwner<byte> ConvertToHostCompatibleFormat(ReadOnlySpan<byte> data, int level = 0, bool single = false)
{
int width = Info.Width;
int height = Info.Height;
@@ -754,11 +754,11 @@ namespace Ryujinx.Graphics.Gpu.Image
int sliceDepth = single ? 1 : depth;
- SpanOrArray<byte> result;
+ IMemoryOwner<byte> linear;
if (Info.IsLinear)
{
- result = LayoutConverter.ConvertLinearStridedToLinear(
+ linear = LayoutConverter.ConvertLinearStridedToLinear(
width,
height,
Info.FormatInfo.BlockWidth,
@@ -770,7 +770,7 @@ namespace Ryujinx.Graphics.Gpu.Image
}
else
{
- result = LayoutConverter.ConvertBlockLinearToLinear(
+ linear = LayoutConverter.ConvertBlockLinearToLinear(
width,
height,
depth,
@@ -787,33 +787,41 @@ namespace Ryujinx.Graphics.Gpu.Image
data);
}
+ IMemoryOwner<byte> result = linear;
+
// Handle compressed cases not supported by the host:
// - ASTC is usually not supported on desktop cards.
// - BC4/BC5 is not supported on 3D textures.
if (!_context.Capabilities.SupportsAstcCompression && Format.IsAstc())
{
- if (!AstcDecoder.TryDecodeToRgba8P(
- result.ToArray(),
- Info.FormatInfo.BlockWidth,
- Info.FormatInfo.BlockHeight,
- width,
- height,
- sliceDepth,
- levels,
- layers,
- out byte[] decoded))
+ using (result)
{
- string texInfo = $"{Info.Target} {Info.FormatInfo.Format} {Info.Width}x{Info.Height}x{Info.DepthOrLayers} levels {Info.Levels}";
+ if (!AstcDecoder.TryDecodeToRgba8P(
+ result.Memory,
+ Info.FormatInfo.BlockWidth,
+ Info.FormatInfo.BlockHeight,
+ width,
+ height,
+ sliceDepth,
+ levels,
+ layers,
+ out IMemoryOwner<byte> decoded))
+ {
+ string texInfo = $"{Info.Target} {Info.FormatInfo.Format} {Info.Width}x{Info.Height}x{Info.DepthOrLayers} levels {Info.Levels}";
- Logger.Debug?.Print(LogClass.Gpu, $"Invalid ASTC texture at 0x{Info.GpuAddress:X} ({texInfo}).");
- }
+ Logger.Debug?.Print(LogClass.Gpu, $"Invalid ASTC texture at 0x{Info.GpuAddress:X} ({texInfo}).");
+ }
- if (GraphicsConfig.EnableTextureRecompression)
- {
- decoded = BCnEncoder.EncodeBC7(decoded, width, height, sliceDepth, levels, layers);
- }
+ if (GraphicsConfig.EnableTextureRecompression)
+ {
+ using (decoded)
+ {
+ return BCnEncoder.EncodeBC7(decoded.Memory, width, height, sliceDepth, levels, layers);
+ }
+ }
- result = decoded;
+ return decoded;
+ }
}
else if (!_context.Capabilities.SupportsEtc2Compression && Format.IsEtc2())
{
@@ -821,16 +829,22 @@ namespace Ryujinx.Graphics.Gpu.Image
{
case Format.Etc2RgbaSrgb:
case Format.Etc2RgbaUnorm:
- result = ETC2Decoder.DecodeRgba(result, width, height, sliceDepth, levels, layers);
- break;
+ using (result)
+ {
+ return ETC2Decoder.DecodeRgba(result.Memory.Span, width, height, sliceDepth, levels, layers);
+ }
case Format.Etc2RgbPtaSrgb:
case Format.Etc2RgbPtaUnorm:
- result = ETC2Decoder.DecodePta(result, width, height, sliceDepth, levels, layers);
- break;
+ using (result)
+ {
+ return ETC2Decoder.DecodePta(result.Memory.Span, width, height, sliceDepth, levels, layers);
+ }
case Format.Etc2RgbSrgb:
case Format.Etc2RgbUnorm:
- result = ETC2Decoder.DecodeRgb(result, width, height, sliceDepth, levels, layers);
- break;
+ using (result)
+ {
+ return ETC2Decoder.DecodeRgb(result.Memory.Span, width, height, sliceDepth, levels, layers);
+ }
}
}
else if (!TextureCompatibility.HostSupportsBcFormat(Format, Target, _context.Capabilities))
@@ -839,48 +853,75 @@ namespace Ryujinx.Graphics.Gpu.Image
{
case Format.Bc1RgbaSrgb:
case Format.Bc1RgbaUnorm:
- result = BCnDecoder.DecodeBC1(result, width, height, sliceDepth, levels, layers);
- break;
+ using (result)
+ {
+ return BCnDecoder.DecodeBC1(result.Memory.Span, width, height, sliceDepth, levels, layers);
+ }
case Format.Bc2Srgb:
case Format.Bc2Unorm:
- result = BCnDecoder.DecodeBC2(result, width, height, sliceDepth, levels, layers);
- break;
+ using (result)
+ {
+ return BCnDecoder.DecodeBC2(result.Memory.Span, width, height, sliceDepth, levels, layers);
+ }
case Format.Bc3Srgb:
case Format.Bc3Unorm:
- result = BCnDecoder.DecodeBC3(result, width, height, sliceDepth, levels, layers);
- break;
+ using (result)
+ {
+ return BCnDecoder.DecodeBC3(result.Memory.Span, width, height, sliceDepth, levels, layers);
+ }
case Format.Bc4Snorm:
case Format.Bc4Unorm:
- result = BCnDecoder.DecodeBC4(result, width, height, sliceDepth, levels, layers, Format == Format.Bc4Snorm);
- break;
+ using (result)
+ {
+ return BCnDecoder.DecodeBC4(result.Memory.Span, width, height, sliceDepth, levels, layers, Format == Format.Bc4Snorm);
+ }
case Format.Bc5Snorm:
case Format.Bc5Unorm:
- result = BCnDecoder.DecodeBC5(result, width, height, sliceDepth, levels, layers, Format == Format.Bc5Snorm);
- break;
+ using (result)
+ {
+ return BCnDecoder.DecodeBC5(result.Memory.Span, width, height, sliceDepth, levels, layers, Format == Format.Bc5Snorm);
+ }
case Format.Bc6HSfloat:
case Format.Bc6HUfloat:
- result = BCnDecoder.DecodeBC6(result, width, height, sliceDepth, levels, layers, Format == Format.Bc6HSfloat);
- break;
+ using (result)
+ {
+ return BCnDecoder.DecodeBC6(result.Memory.Span, width, height, sliceDepth, levels, layers, Format == Format.Bc6HSfloat);
+ }
case Format.Bc7Srgb:
case Format.Bc7Unorm:
- result = BCnDecoder.DecodeBC7(result, width, height, sliceDepth, levels, layers);
- break;
+ using (result)
+ {
+ return BCnDecoder.DecodeBC7(result.Memory.Span, width, height, sliceDepth, levels, layers);
+ }
}
}
else if (!_context.Capabilities.SupportsR4G4Format && Format == Format.R4G4Unorm)
{
- result = PixelConverter.ConvertR4G4ToR4G4B4A4(result, width);
-
- if (!_context.Capabilities.SupportsR4G4B4A4Format)
+ using (result)
{
- result = PixelConverter.ConvertR4G4B4A4ToR8G8B8A8(result, width);
+ var converted = PixelConverter.ConvertR4G4ToR4G4B4A4(result.Memory.Span, width);
+
+ if (_context.Capabilities.SupportsR4G4B4A4Format)
+ {
+ return converted;
+ }
+ else
+ {
+ using (converted)
+ {
+ return PixelConverter.ConvertR4G4B4A4ToR8G8B8A8(converted.Memory.Span, width);
+ }
+ }
}
}
else if (Format == Format.R4G4B4A4Unorm)
{
if (!_context.Capabilities.SupportsR4G4B4A4Format)
{
- result = PixelConverter.ConvertR4G4B4A4ToR8G8B8A8(result, width);
+ using (result)
+ {
+ return PixelConverter.ConvertR4G4B4A4ToR8G8B8A8(result.Memory.Span, width);
+ }
}
}
else if (!_context.Capabilities.Supports5BitComponentFormat && Format.Is16BitPacked())
@@ -889,19 +930,27 @@ namespace Ryujinx.Graphics.Gpu.Image
{
case Format.B5G6R5Unorm:
case Format.R5G6B5Unorm:
- result = PixelConverter.ConvertR5G6B5ToR8G8B8A8(result, width);
- break;
+ using (result)
+ {
+ return PixelConverter.ConvertR5G6B5ToR8G8B8A8(result.Memory.Span, width);
+ }
case Format.B5G5R5A1Unorm:
case Format.R5G5B5X1Unorm:
case Format.R5G5B5A1Unorm:
- result = PixelConverter.ConvertR5G5B5ToR8G8B8A8(result, width, Format == Format.R5G5B5X1Unorm);
- break;
+ using (result)
+ {
+ return PixelConverter.ConvertR5G5B5ToR8G8B8A8(result.Memory.Span, width, Format == Format.R5G5B5X1Unorm);
+ }
case Format.A1B5G5R5Unorm:
- result = PixelConverter.ConvertA1B5G5R5ToR8G8B8A8(result, width);
- break;
+ using (result)
+ {
+ return PixelConverter.ConvertA1B5G5R5ToR8G8B8A8(result.Memory.Span, width);
+ }
case Format.R4G4B4A4Unorm:
- result = PixelConverter.ConvertR4G4B4A4ToR8G8B8A8(result, width);
- break;
+ using (result)
+ {
+ return PixelConverter.ConvertR4G4B4A4ToR8G8B8A8(result.Memory.Span, width);
+ }
}
}
diff --git a/src/Ryujinx.Graphics.Gpu/Image/TextureGroup.cs b/src/Ryujinx.Graphics.Gpu/Image/TextureGroup.cs
index 97858394..de9c47c9 100644
--- a/src/Ryujinx.Graphics.Gpu/Image/TextureGroup.cs
+++ b/src/Ryujinx.Graphics.Gpu/Image/TextureGroup.cs
@@ -1,4 +1,3 @@
-using Ryujinx.Common.Memory;
using Ryujinx.Graphics.GAL;
using Ryujinx.Graphics.Gpu.Memory;
using Ryujinx.Graphics.Texture;
@@ -6,6 +5,7 @@ using Ryujinx.Memory;
using Ryujinx.Memory.Range;
using Ryujinx.Memory.Tracking;
using System;
+using System.Buffers;
using System.Collections.Generic;
using System.Runtime.CompilerServices;
@@ -445,7 +445,7 @@ namespace Ryujinx.Graphics.Gpu.Image
ReadOnlySpan<byte> data = dataSpan[(offset - spanBase)..];
- SpanOrArray<byte> result = Storage.ConvertToHostCompatibleFormat(data, info.BaseLevel + level, true);
+ IMemoryOwner<byte> result = Storage.ConvertToHostCompatibleFormat(data, info.BaseLevel + level, true);
Storage.SetData(result, info.BaseLayer + layer, info.BaseLevel + level);
}