manuth/Ryujinx
1
0
Fork 0
mirror of https://git.naxdy.org/Mirror/Ryujinx.git synced 2025-02-22 17:10:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

TextureStorage should hold a ref of the foreign storage, otherwise it might be freed while in use

Browse source
This commit is contained in:
gdkchan 2021-09-04 01:43:52 -03:00 committed by riperiperi
parent c31dda3c1b
commit ceeb70a996
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Ryujinx.Graphics.Vulkan/TextureStorage.cs
View file

@ -33,6 +33,7 @@ namespace Ryujinx.Graphics.Vulkan
private readonly Image _image; private readonly Image _image;
private readonly Auto<DisposableImage> _imageAuto; private readonly Auto<DisposableImage> _imageAuto;
private readonly Auto<MemoryAllocation> _allocationAuto; private readonly Auto<MemoryAllocation> _allocationAuto;
private Auto<MemoryAllocation> _foreignAllocationAuto;
private Dictionary<GAL.Format, TextureStorage> _aliasedStorages; private Dictionary<GAL.Format, TextureStorage> _aliasedStorages;
@ -140,6 +141,8 @@ namespace Ryujinx.Graphics.Vulkan
} }
else else
{ {
_foreignAllocationAuto = foreignAllocation;
foreignAllocation.IncrementReferenceCount();
var allocation = foreignAllocation.GetUnsafe(); var allocation = foreignAllocation.GetUnsafe();
gd.Api.BindImageMemory(device, _image, allocation.Memory, allocation.Offset).ThrowOnError(); gd.Api.BindImageMemory(device, _image, allocation.Memory, allocation.Offset).ThrowOnError();
@ -277,6 +280,8 @@ namespace Ryujinx.Graphics.Vulkan
_imageAuto.Dispose(); _imageAuto.Dispose();
_allocationAuto?.Dispose(); _allocationAuto?.Dispose();
_foreignAllocationAuto?.DecrementReferenceCount();
_foreignAllocationAuto = null;
} }
} }
} }