mirror of
https://github.com/GreemDev/Ryujinx.git
synced 2024-12-23 13:55:47 +00:00
4218311e6a
* Fix Push Descriptors * Use push descriptor templates * Use reserved bindings * Formatting * Disable when using MVK ("my heart will go on" starts playing as thousands of mac users shed a tear in unison) * Introduce limit on push descriptor binding number The bitmask used for updating push descriptors is ulong, so only 64 bindings can be tracked for now. * Address feedback * Fix logic for binding rejection Should only offset limit when reserved bindings are less than the requested one. * Workaround pascal and older nv bug * Add GPU number detection for nvidia * Only do workaround if it's valid to do so.
245 lines
9.4 KiB
C#
245 lines
9.4 KiB
C#
using Ryujinx.Graphics.GAL;
|
|
using Silk.NET.Vulkan;
|
|
using System;
|
|
using System.Numerics;
|
|
using System.Runtime.CompilerServices;
|
|
|
|
namespace Ryujinx.Graphics.Vulkan
|
|
{
|
|
class DescriptorSetTemplate : IDisposable
|
|
{
|
|
/// <summary>
|
|
/// Renderdoc seems to crash when doing a templated uniform update with count > 1 on a push descriptor.
|
|
/// When this is true, consecutive buffers are always updated individually.
|
|
/// </summary>
|
|
private const bool RenderdocPushCountBug = true;
|
|
|
|
private readonly VulkanRenderer _gd;
|
|
private readonly Device _device;
|
|
|
|
public readonly DescriptorUpdateTemplate Template;
|
|
public readonly int Size;
|
|
|
|
public unsafe DescriptorSetTemplate(
|
|
VulkanRenderer gd,
|
|
Device device,
|
|
ResourceBindingSegment[] segments,
|
|
PipelineLayoutCacheEntry plce,
|
|
PipelineBindPoint pbp,
|
|
int setIndex)
|
|
{
|
|
_gd = gd;
|
|
_device = device;
|
|
|
|
// Create a template from the set usages. Assumes the descriptor set is updated in segment order then binding order.
|
|
|
|
DescriptorUpdateTemplateEntry* entries = stackalloc DescriptorUpdateTemplateEntry[segments.Length];
|
|
nuint structureOffset = 0;
|
|
|
|
for (int seg = 0; seg < segments.Length; seg++)
|
|
{
|
|
ResourceBindingSegment segment = segments[seg];
|
|
|
|
int binding = segment.Binding;
|
|
int count = segment.Count;
|
|
|
|
if (setIndex == PipelineBase.UniformSetIndex)
|
|
{
|
|
entries[seg] = new DescriptorUpdateTemplateEntry()
|
|
{
|
|
DescriptorType = DescriptorType.UniformBuffer,
|
|
DstBinding = (uint)binding,
|
|
DescriptorCount = (uint)count,
|
|
Offset = structureOffset,
|
|
Stride = (nuint)Unsafe.SizeOf<DescriptorBufferInfo>()
|
|
};
|
|
|
|
structureOffset += (nuint)(Unsafe.SizeOf<DescriptorBufferInfo>() * count);
|
|
}
|
|
else if (setIndex == PipelineBase.StorageSetIndex)
|
|
{
|
|
entries[seg] = new DescriptorUpdateTemplateEntry()
|
|
{
|
|
DescriptorType = DescriptorType.StorageBuffer,
|
|
DstBinding = (uint)binding,
|
|
DescriptorCount = (uint)count,
|
|
Offset = structureOffset,
|
|
Stride = (nuint)Unsafe.SizeOf<DescriptorBufferInfo>()
|
|
};
|
|
|
|
structureOffset += (nuint)(Unsafe.SizeOf<DescriptorBufferInfo>() * count);
|
|
}
|
|
else if (setIndex == PipelineBase.TextureSetIndex)
|
|
{
|
|
if (segment.Type != ResourceType.BufferTexture)
|
|
{
|
|
entries[seg] = new DescriptorUpdateTemplateEntry()
|
|
{
|
|
DescriptorType = DescriptorType.CombinedImageSampler,
|
|
DstBinding = (uint)binding,
|
|
DescriptorCount = (uint)count,
|
|
Offset = structureOffset,
|
|
Stride = (nuint)Unsafe.SizeOf<DescriptorImageInfo>()
|
|
};
|
|
|
|
structureOffset += (nuint)(Unsafe.SizeOf<DescriptorImageInfo>() * count);
|
|
}
|
|
else
|
|
{
|
|
entries[seg] = new DescriptorUpdateTemplateEntry()
|
|
{
|
|
DescriptorType = DescriptorType.UniformTexelBuffer,
|
|
DstBinding = (uint)binding,
|
|
DescriptorCount = (uint)count,
|
|
Offset = structureOffset,
|
|
Stride = (nuint)Unsafe.SizeOf<BufferView>()
|
|
};
|
|
|
|
structureOffset += (nuint)(Unsafe.SizeOf<BufferView>() * count);
|
|
}
|
|
}
|
|
else if (setIndex == PipelineBase.ImageSetIndex)
|
|
{
|
|
if (segment.Type != ResourceType.BufferImage)
|
|
{
|
|
entries[seg] = new DescriptorUpdateTemplateEntry()
|
|
{
|
|
DescriptorType = DescriptorType.StorageImage,
|
|
DstBinding = (uint)binding,
|
|
DescriptorCount = (uint)count,
|
|
Offset = structureOffset,
|
|
Stride = (nuint)Unsafe.SizeOf<DescriptorImageInfo>()
|
|
};
|
|
|
|
structureOffset += (nuint)(Unsafe.SizeOf<DescriptorImageInfo>() * count);
|
|
}
|
|
else
|
|
{
|
|
entries[seg] = new DescriptorUpdateTemplateEntry()
|
|
{
|
|
DescriptorType = DescriptorType.StorageTexelBuffer,
|
|
DstBinding = (uint)binding,
|
|
DescriptorCount = (uint)count,
|
|
Offset = structureOffset,
|
|
Stride = (nuint)Unsafe.SizeOf<BufferView>()
|
|
};
|
|
|
|
structureOffset += (nuint)(Unsafe.SizeOf<BufferView>() * count);
|
|
}
|
|
}
|
|
}
|
|
|
|
Size = (int)structureOffset;
|
|
|
|
var info = new DescriptorUpdateTemplateCreateInfo()
|
|
{
|
|
SType = StructureType.DescriptorUpdateTemplateCreateInfo,
|
|
DescriptorUpdateEntryCount = (uint)segments.Length,
|
|
PDescriptorUpdateEntries = entries,
|
|
|
|
TemplateType = DescriptorUpdateTemplateType.DescriptorSet,
|
|
DescriptorSetLayout = plce.DescriptorSetLayouts[setIndex],
|
|
PipelineBindPoint = pbp,
|
|
PipelineLayout = plce.PipelineLayout,
|
|
Set = (uint)setIndex,
|
|
};
|
|
|
|
DescriptorUpdateTemplate result;
|
|
gd.Api.CreateDescriptorUpdateTemplate(device, &info, null, &result).ThrowOnError();
|
|
|
|
Template = result;
|
|
}
|
|
|
|
public unsafe DescriptorSetTemplate(
|
|
VulkanRenderer gd,
|
|
Device device,
|
|
ResourceDescriptorCollection descriptors,
|
|
long updateMask,
|
|
PipelineLayoutCacheEntry plce,
|
|
PipelineBindPoint pbp,
|
|
int setIndex)
|
|
{
|
|
_gd = gd;
|
|
_device = device;
|
|
|
|
// Create a template from the set usages. Assumes the descriptor set is updated in segment order then binding order.
|
|
int segmentCount = BitOperations.PopCount((ulong)updateMask);
|
|
|
|
DescriptorUpdateTemplateEntry* entries = stackalloc DescriptorUpdateTemplateEntry[segmentCount];
|
|
int entry = 0;
|
|
nuint structureOffset = 0;
|
|
|
|
void AddBinding(int binding, int count)
|
|
{
|
|
entries[entry++] = new DescriptorUpdateTemplateEntry()
|
|
{
|
|
DescriptorType = DescriptorType.UniformBuffer,
|
|
DstBinding = (uint)binding,
|
|
DescriptorCount = (uint)count,
|
|
Offset = structureOffset,
|
|
Stride = (nuint)Unsafe.SizeOf<DescriptorBufferInfo>()
|
|
};
|
|
|
|
structureOffset += (nuint)(Unsafe.SizeOf<DescriptorBufferInfo>() * count);
|
|
}
|
|
|
|
int startBinding = 0;
|
|
int bindingCount = 0;
|
|
|
|
foreach (ResourceDescriptor descriptor in descriptors.Descriptors)
|
|
{
|
|
for (int i = 0; i < descriptor.Count; i++)
|
|
{
|
|
int binding = descriptor.Binding + i;
|
|
|
|
if ((updateMask & (1L << binding)) != 0)
|
|
{
|
|
if (bindingCount > 0 && (RenderdocPushCountBug || startBinding + bindingCount != binding))
|
|
{
|
|
AddBinding(startBinding, bindingCount);
|
|
|
|
bindingCount = 0;
|
|
}
|
|
|
|
if (bindingCount == 0)
|
|
{
|
|
startBinding = binding;
|
|
}
|
|
|
|
bindingCount++;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (bindingCount > 0)
|
|
{
|
|
AddBinding(startBinding, bindingCount);
|
|
}
|
|
|
|
Size = (int)structureOffset;
|
|
|
|
var info = new DescriptorUpdateTemplateCreateInfo()
|
|
{
|
|
SType = StructureType.DescriptorUpdateTemplateCreateInfo,
|
|
DescriptorUpdateEntryCount = (uint)entry,
|
|
PDescriptorUpdateEntries = entries,
|
|
|
|
TemplateType = DescriptorUpdateTemplateType.PushDescriptorsKhr,
|
|
DescriptorSetLayout = plce.DescriptorSetLayouts[setIndex],
|
|
PipelineBindPoint = pbp,
|
|
PipelineLayout = plce.PipelineLayout,
|
|
Set = (uint)setIndex,
|
|
};
|
|
|
|
DescriptorUpdateTemplate result;
|
|
gd.Api.CreateDescriptorUpdateTemplate(device, &info, null, &result).ThrowOnError();
|
|
|
|
Template = result;
|
|
}
|
|
|
|
public unsafe void Dispose()
|
|
{
|
|
_gd.Api.DestroyDescriptorUpdateTemplate(_device, Template, null);
|
|
}
|
|
}
|
|
}
|