801b71a128
* dotnet format style --severity info Some changes were manually reverted. * dotnet format analyzers --serverity info Some changes have been minimally adapted. * Restore a few unused methods and variables * Silence dotnet format IDE0060 warnings * Silence dotnet format IDE0059 warnings * Address dotnet format CA1816 warnings * Fix new dotnet-format issues after rebase * Address most dotnet format whitespace warnings * Apply dotnet format whitespace formatting A few of them have been manually reverted and the corresponding warning was silenced * Format if-blocks correctly * Another rebase, another dotnet format run * Run dotnet format whitespace after rebase * Run dotnet format style after rebase * Run dotnet format analyzers after rebase * Run dotnet format style after rebase * Run dotnet format after rebase and remove unused usings - analyzers - style - whitespace * Disable 'prefer switch expression' rule * Add comments to disabled warnings * Simplify properties and array initialization, Use const when possible, Remove trailing commas * Run dotnet format after rebase * Address IDE0251 warnings * Address a few disabled IDE0060 warnings * Silence IDE0060 in .editorconfig * Revert "Simplify properties and array initialization, Use const when possible, Remove trailing commas" This reverts commit 9462e4136c0a2100dc28b20cf9542e06790aa67e. * dotnet format whitespace after rebase * First dotnet format pass * Fix naming rule violations * Remove redundant code * Rename generics * Address review feedback * Remove SetOrigin
88 lines
3.5 KiB
C#
88 lines
3.5 KiB
C#
using Ryujinx.Graphics.GAL;
|
|
using Silk.NET.Vulkan;
|
|
using System.Collections.ObjectModel;
|
|
|
|
namespace Ryujinx.Graphics.Vulkan
|
|
{
|
|
static class PipelineLayoutFactory
|
|
{
|
|
public static unsafe (DescriptorSetLayout[], PipelineLayout) Create(
|
|
VulkanRenderer gd,
|
|
Device device,
|
|
ReadOnlyCollection<ResourceDescriptorCollection> setDescriptors,
|
|
bool usePushDescriptors)
|
|
{
|
|
DescriptorSetLayout[] layouts = new DescriptorSetLayout[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];
|
|
|
|
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(),
|
|
};
|
|
}
|
|
|
|
fixed (DescriptorSetLayoutBinding* pLayoutBindings = layoutBindings)
|
|
{
|
|
var descriptorSetLayoutCreateInfo = new DescriptorSetLayoutCreateInfo
|
|
{
|
|
SType = StructureType.DescriptorSetLayoutCreateInfo,
|
|
PBindings = pLayoutBindings,
|
|
BindingCount = (uint)layoutBindings.Length,
|
|
Flags = usePushDescriptors && setIndex == 0 ? DescriptorSetLayoutCreateFlags.PushDescriptorBitKhr : DescriptorSetLayoutCreateFlags.None,
|
|
};
|
|
|
|
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 (layouts, layout);
|
|
}
|
|
}
|
|
}
|