mirror of
https://git.naxdy.org/Mirror/Ryujinx.git
synced 2024-12-27 19:13:04 +00:00
c0f2491eae
* Ensure descriptor sets are only re-used when all command buffers using it have completed * Fix some SPIR-V capabilities * Set update after bind flag if we exceed limits * Simpler fix for Intel * Format whitespace * Make struct readonly * Add barriers for extra set arrays too
115 lines
4.5 KiB
C#
115 lines
4.5 KiB
C#
using Ryujinx.Common.Memory;
|
|
using Ryujinx.Graphics.GAL;
|
|
using Silk.NET.Vulkan;
|
|
using System;
|
|
using System.Collections.ObjectModel;
|
|
|
|
namespace Ryujinx.Graphics.Vulkan
|
|
{
|
|
record struct ResourceLayouts(DescriptorSetLayout[] DescriptorSetLayouts, bool[] DescriptorSetLayoutsUpdateAfterBind, PipelineLayout PipelineLayout);
|
|
|
|
static class PipelineLayoutFactory
|
|
{
|
|
public static unsafe ResourceLayouts Create(
|
|
VulkanRenderer gd,
|
|
Device device,
|
|
ReadOnlyCollection<ResourceDescriptorCollection> setDescriptors,
|
|
bool usePushDescriptors)
|
|
{
|
|
DescriptorSetLayout[] layouts = new DescriptorSetLayout[setDescriptors.Count];
|
|
bool[] updateAfterBindFlags = new bool[setDescriptors.Count];
|
|
|
|
bool isMoltenVk = gd.IsMoltenVk;
|
|
|
|
for (int setIndex = 0; setIndex < setDescriptors.Count; setIndex++)
|
|
{
|
|
ResourceDescriptorCollection rdc = setDescriptors[setIndex];
|
|
|
|
ResourceStages activeStages = ResourceStages.None;
|
|
|
|
if (isMoltenVk)
|
|
{
|
|
for (int descIndex = 0; descIndex < rdc.Descriptors.Count; descIndex++)
|
|
{
|
|
activeStages |= rdc.Descriptors[descIndex].Stages;
|
|
}
|
|
}
|
|
|
|
DescriptorSetLayoutBinding[] layoutBindings = new DescriptorSetLayoutBinding[rdc.Descriptors.Count];
|
|
|
|
bool hasArray = false;
|
|
|
|
for (int descIndex = 0; descIndex < rdc.Descriptors.Count; descIndex++)
|
|
{
|
|
ResourceDescriptor descriptor = rdc.Descriptors[descIndex];
|
|
ResourceStages stages = descriptor.Stages;
|
|
|
|
if (descriptor.Type == ResourceType.StorageBuffer && isMoltenVk)
|
|
{
|
|
// There's a bug on MoltenVK where using the same buffer across different stages
|
|
// causes invalid resource errors, allow the binding on all active stages as workaround.
|
|
stages = activeStages;
|
|
}
|
|
|
|
layoutBindings[descIndex] = new DescriptorSetLayoutBinding
|
|
{
|
|
Binding = (uint)descriptor.Binding,
|
|
DescriptorType = descriptor.Type.Convert(),
|
|
DescriptorCount = (uint)descriptor.Count,
|
|
StageFlags = stages.Convert(),
|
|
};
|
|
|
|
if (descriptor.Count > 1)
|
|
{
|
|
hasArray = true;
|
|
}
|
|
}
|
|
|
|
fixed (DescriptorSetLayoutBinding* pLayoutBindings = layoutBindings)
|
|
{
|
|
DescriptorSetLayoutCreateFlags flags = DescriptorSetLayoutCreateFlags.None;
|
|
|
|
if (usePushDescriptors && setIndex == 0)
|
|
{
|
|
flags = DescriptorSetLayoutCreateFlags.PushDescriptorBitKhr;
|
|
}
|
|
|
|
if (gd.Vendor == Vendor.Intel && hasArray)
|
|
{
|
|
// Some vendors (like Intel) have low per-stage limits.
|
|
// We must set the flag if we exceed those limits.
|
|
flags |= DescriptorSetLayoutCreateFlags.UpdateAfterBindPoolBit;
|
|
|
|
updateAfterBindFlags[setIndex] = true;
|
|
}
|
|
|
|
var descriptorSetLayoutCreateInfo = new DescriptorSetLayoutCreateInfo
|
|
{
|
|
SType = StructureType.DescriptorSetLayoutCreateInfo,
|
|
PBindings = pLayoutBindings,
|
|
BindingCount = (uint)layoutBindings.Length,
|
|
Flags = flags,
|
|
};
|
|
|
|
gd.Api.CreateDescriptorSetLayout(device, descriptorSetLayoutCreateInfo, null, out layouts[setIndex]).ThrowOnError();
|
|
}
|
|
}
|
|
|
|
PipelineLayout layout;
|
|
|
|
fixed (DescriptorSetLayout* pLayouts = layouts)
|
|
{
|
|
var pipelineLayoutCreateInfo = new PipelineLayoutCreateInfo
|
|
{
|
|
SType = StructureType.PipelineLayoutCreateInfo,
|
|
PSetLayouts = pLayouts,
|
|
SetLayoutCount = (uint)layouts.Length,
|
|
};
|
|
|
|
gd.Api.CreatePipelineLayout(device, &pipelineLayoutCreateInfo, null, out layout).ThrowOnError();
|
|
}
|
|
|
|
return new ResourceLayouts(layouts, updateAfterBindFlags, layout);
|
|
}
|
|
}
|
|
}
|