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

Do not clear unbound framebuffer color attachments

Browse source
This commit is contained in:
gdk 2022-04-13 22:46:51 -03:00 committed by riperiperi
parent de87ed3edc
commit 2713703d45
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Ryujinx.Graphics.Vulkan/FramebufferParams.cs
View file

@ -10,12 +10,13 @@ namespace Ryujinx.Graphics.Vulkan
{ {
private readonly Device _device; private readonly Device _device;
private readonly Auto<DisposableImageView>[] _attachments; private readonly Auto<DisposableImageView>[] _attachments;
private uint _validColorAttachments;
public uint Width { get; } public uint Width { get; }
public uint Height { get; } public uint Height { get; }
public uint Layers { get; } public uint Layers { get; }
public uint[] AttachmentSamples { get; } public uint[] AttachmentSamples { get; }
public VkFormat[] AttachmentFormats { get; } public VkFormat[] AttachmentFormats { get; }
public int[] AttachmentIndices { get; } public int[] AttachmentIndices { get; }
@ -34,6 +35,7 @@ namespace Ryujinx.Graphics.Vulkan
{ {
_device = device; _device = device;
_attachments = new[] { view }; _attachments = new[] { view };
_validColorAttachments = 1u;
Width = width; Width = width;
Height = height; Height = height;
@ -77,6 +79,7 @@ namespace Ryujinx.Graphics.Vulkan
var texture = (TextureView)color; var texture = (TextureView)color;
_attachments[index] = texture.GetImageViewForAttachment(); _attachments[index] = texture.GetImageViewForAttachment();
_validColorAttachments |= 1u << bindIndex;
AttachmentSamples[index] = (uint)texture.Info.Samples; AttachmentSamples[index] = (uint)texture.Info.Samples;
AttachmentFormats[index] = texture.VkFormat; AttachmentFormats[index] = texture.VkFormat;
@ -131,6 +134,11 @@ namespace Ryujinx.Graphics.Vulkan
return _attachments[index]; return _attachments[index];
} }
public bool IsVaidColorAttachment(int bindIndex)
{
return (uint)bindIndex < Constants.MaxRenderTargets && (_validColorAttachments & (1u << bindIndex)) != 0;
}
private static bool IsValidTextureView(ITexture texture) private static bool IsValidTextureView(ITexture texture)
{ {
return texture is TextureView view && view.Valid; return texture is TextureView view && view.Valid;

4
Ryujinx.Graphics.Vulkan/PipelineBase.cs
View file

@ -167,7 +167,7 @@ namespace Ryujinx.Graphics.Vulkan
public unsafe void ClearRenderTargetColor(int index, ColorF color) public unsafe void ClearRenderTargetColor(int index, ColorF color)
{ {
if (_framebuffer == null) if (FramebufferParams == null || !FramebufferParams.IsVaidColorAttachment(index))
{ {
return; return;
} }
@ -190,7 +190,7 @@ namespace Ryujinx.Graphics.Vulkan
{ {
// TODO: Use stencilMask (fully) // TODO: Use stencilMask (fully)
if (_framebuffer == null || !FramebufferParams.HasDepthStencil) if (FramebufferParams == null || !FramebufferParams.HasDepthStencil)
{ {
return; return;
} }