deadcade/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Vulkan: Fix swapchain image view leak (#6509)

Browse source
This commit is contained in:
gdkchan 2024-04-06 13:38:52 -03:00 committed by GitHub
parent 791bf22109
commit 3be616207d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Ryujinx.Graphics.Vulkan/RenderPassHolder.cs
View file

@ -122,7 +122,6 @@ namespace Ryujinx.Graphics.Vulkan
gd.Api.CreateRenderPass(device, renderPassCreateInfo, null, out var renderPass).ThrowOnError(); gd.Api.CreateRenderPass(device, renderPassCreateInfo, null, out var renderPass).ThrowOnError();
_renderPass?.Dispose();
_renderPass = new Auto<DisposableRenderPass>(new DisposableRenderPass(gd.Api, device, renderPass)); _renderPass = new Auto<DisposableRenderPass>(new DisposableRenderPass(gd.Api, device, renderPass));
} }
@ -162,7 +161,7 @@ namespace Ryujinx.Graphics.Vulkan
public void Dispose() public void Dispose()
{ {
// Dispose all framebuffers // Dispose all framebuffers.
foreach (var fb in _framebuffers.Values) foreach (var fb in _framebuffers.Values)
{ {
@ -175,6 +174,10 @@ namespace Ryujinx.Graphics.Vulkan
{ {
texture.RemoveRenderPass(_key); texture.RemoveRenderPass(_key);
} }
// Dispose render pass.
_renderPass.Dispose();
} }
} }
} }

27
src/Ryujinx.Graphics.Vulkan/TextureView.cs
View file

@ -4,6 +4,7 @@ using Silk.NET.Vulkan;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading;
using Format = Ryujinx.Graphics.GAL.Format; using Format = Ryujinx.Graphics.GAL.Format;
using VkBuffer = Silk.NET.Vulkan.Buffer; using VkBuffer = Silk.NET.Vulkan.Buffer;
using VkFormat = Silk.NET.Vulkan.Format; using VkFormat = Silk.NET.Vulkan.Format;
@ -36,7 +37,8 @@ namespace Ryujinx.Graphics.Vulkan
public int FirstLayer { get; } public int FirstLayer { get; }
public int FirstLevel { get; } public int FirstLevel { get; }
public VkFormat VkFormat { get; } public VkFormat VkFormat { get; }
public bool Valid { get; private set; } private int _isValid;
public bool Valid => Volatile.Read(ref _isValid) != 0;
public TextureView( public TextureView(
VulkanRenderer gd, VulkanRenderer gd,
@ -158,7 +160,7 @@ namespace Ryujinx.Graphics.Vulkan
} }
} }
Valid = true; _isValid = 1;
} }
/// <summary> /// <summary>
@ -178,7 +180,7 @@ namespace Ryujinx.Graphics.Vulkan
VkFormat = format; VkFormat = format;
Valid = true; _isValid = 1;
} }
public Auto<DisposableImage> GetImage() public Auto<DisposableImage> GetImage()
@ -1017,10 +1019,11 @@ namespace Ryujinx.Graphics.Vulkan
{ {
if (disposing) if (disposing)
{ {
Valid = false; bool wasValid = Interlocked.Exchange(ref _isValid, 0) != 0;
if (wasValid)
if (_gd.Textures.Remove(this))
{ {
_gd.Textures.Remove(this);
_imageView.Dispose(); _imageView.Dispose();
_imageView2dArray?.Dispose(); _imageView2dArray?.Dispose();
@ -1034,7 +1037,7 @@ namespace Ryujinx.Graphics.Vulkan
_imageViewDraw.Dispose(); _imageViewDraw.Dispose();
} }
Storage.DecrementViewsCount(); Storage?.DecrementViewsCount();
if (_renderPasses != null) if (_renderPasses != null)
{ {
@ -1045,12 +1048,7 @@ namespace Ryujinx.Graphics.Vulkan
pass.Dispose(); pass.Dispose();
} }
} }
}
}
}
public void Dispose()
{
if (_selfManagedViews != null) if (_selfManagedViews != null)
{ {
foreach (var view in _selfManagedViews.Values) foreach (var view in _selfManagedViews.Values)
@ -1060,7 +1058,12 @@ namespace Ryujinx.Graphics.Vulkan
_selfManagedViews = null; _selfManagedViews = null;
} }
}
}
}
public void Dispose()
{
Dispose(true); Dispose(true);
} }