diff options
Diffstat (limited to 'Ryujinx.Graphics.Gpu/Image/Texture.cs')
| -rw-r--r-- | Ryujinx.Graphics.Gpu/Image/Texture.cs | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/Ryujinx.Graphics.Gpu/Image/Texture.cs b/Ryujinx.Graphics.Gpu/Image/Texture.cs index f80f20ed..84808a84 100644 --- a/Ryujinx.Graphics.Gpu/Image/Texture.cs +++ b/Ryujinx.Graphics.Gpu/Image/Texture.cs @@ -1022,13 +1022,12 @@ namespace Ryujinx.Graphics.Gpu.Image /// This method should be used to retrieve data that was modified by the host GPU. /// This is not cheap, avoid doing that unless strictly needed. /// </remarks> - /// <param name="output">An output span to place the texture data into. If empty, one is generated</param> + /// <param name="output">An output span to place the texture data into</param> /// <param name="blacklist">True if the texture should be blacklisted, false otherwise</param> /// <param name="texture">The specific host texture to flush. Defaults to this texture</param> - /// <returns>The span containing the texture data</returns> - private ReadOnlySpan<byte> GetTextureDataFromGpu(Span<byte> output, bool blacklist, ITexture texture = null) + private void GetTextureDataFromGpu(Span<byte> output, bool blacklist, ITexture texture = null) { - ReadOnlySpan<byte> data; + PinnedSpan<byte> data; if (texture != null) { @@ -1054,9 +1053,9 @@ namespace Ryujinx.Graphics.Gpu.Image } } - data = ConvertFromHostCompatibleFormat(output, data); + ConvertFromHostCompatibleFormat(output, data.Get()); - return data; + data.Dispose(); } /// <summary> @@ -1071,10 +1070,9 @@ namespace Ryujinx.Graphics.Gpu.Image /// <param name="level">The level of the texture to flush</param> /// <param name="blacklist">True if the texture should be blacklisted, false otherwise</param> /// <param name="texture">The specific host texture to flush. Defaults to this texture</param> - /// <returns>The span containing the texture data</returns> - public ReadOnlySpan<byte> GetTextureDataSliceFromGpu(Span<byte> output, int layer, int level, bool blacklist, ITexture texture = null) + public void GetTextureDataSliceFromGpu(Span<byte> output, int layer, int level, bool blacklist, ITexture texture = null) { - ReadOnlySpan<byte> data; + PinnedSpan<byte> data; if (texture != null) { @@ -1100,9 +1098,9 @@ namespace Ryujinx.Graphics.Gpu.Image } } - data = ConvertFromHostCompatibleFormat(output, data, level, true); + ConvertFromHostCompatibleFormat(output, data.Get(), level, true); - return data; + data.Dispose(); } /// <summary> |