ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-30 04:13:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove CancellationToken from GetFromRaw(Sync)

Browse source
This commit is contained in:
Soreepeong 2024-02-22 16:53:13 +09:00
parent 80875247b6
commit 3bf907002f
2 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Dalamud/Interface/Internal/TextureManager.cs
View file

@ -265,8 +265,7 @@ internal sealed class TextureManager : IServiceType, IDisposable, ITextureProvid
/// <inheritdoc/> /// <inheritdoc/>
public IDalamudTextureWrap GetFromRaw( public IDalamudTextureWrap GetFromRaw(
RawImageSpecification specs, RawImageSpecification specs,
ReadOnlySpan<byte> bytes, ReadOnlySpan<byte> bytes) =>
CancellationToken cancellationToken = default) =>
this.interfaceManager.LoadImageFromDxgiFormat( this.interfaceManager.LoadImageFromDxgiFormat(
bytes, bytes,
specs.Pitch, specs.Pitch,
@ -281,7 +280,7 @@ internal sealed class TextureManager : IServiceType, IDisposable, ITextureProvid
CancellationToken cancellationToken = default) => CancellationToken cancellationToken = default) =>
this.textureLoadThrottler.CreateLoader( this.textureLoadThrottler.CreateLoader(
new TextureLoadThrottler.ReadOnlyThrottleBasisProvider(), new TextureLoadThrottler.ReadOnlyThrottleBasisProvider(),
ct => Task.FromResult(this.GetFromRaw(specs, bytes.Span, ct)), ct => Task.FromResult(this.GetFromRaw(specs, bytes.Span)),
cancellationToken); cancellationToken);
/// <inheritdoc/> /// <inheritdoc/>

4
Dalamud/Plugin/Services/ITextureProvider.cs
View file

@ -152,12 +152,10 @@ public partial interface ITextureProvider
/// <summary>Gets a texture from the given bytes, interpreting it as a raw bitmap.</summary> /// <summary>Gets a texture from the given bytes, interpreting it as a raw bitmap.</summary>
/// <param name="specs">The specifications for the raw bitmap.</param> /// <param name="specs">The specifications for the raw bitmap.</param>
/// <param name="bytes">The bytes to load.</param> /// <param name="bytes">The bytes to load.</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>The texture loaded from the supplied raw bitmap. Dispose after use.</returns> /// <returns>The texture loaded from the supplied raw bitmap. Dispose after use.</returns>
IDalamudTextureWrap GetFromRaw( IDalamudTextureWrap GetFromRaw(
RawImageSpecification specs, RawImageSpecification specs,
ReadOnlySpan<byte> bytes, ReadOnlySpan<byte> bytes);
CancellationToken cancellationToken = default);
/// <summary>Gets a texture from the given bytes, interpreting it as a raw bitmap.</summary> /// <summary>Gets a texture from the given bytes, interpreting it as a raw bitmap.</summary>
/// <param name="specs">The specifications for the raw bitmap.</param> /// <param name="specs">The specifications for the raw bitmap.</param>