mirror of
https://github.com/ryujinx-mirror/ryujinx.git
synced 2024-11-25 11:35:12 +00:00
3e6e0e4afa
* Add support for large sampler arrays on Vulkan * Shader cache version bump * Format whitespace * Move DescriptorSetManager to PipelineLayoutCacheEntry to allow different pool sizes per layout * Handle array textures with different types on the same buffer * Somewhat better caching system * Avoid useless buffer data modification checks * Move redundant bindings update checking to the backend * Fix an issue where texture arrays would get the same bindings across stages on Vulkan * Backport some fixes from part 2 * Fix typo * PR feedback * Format whitespace * Add some missing XML docs
231 lines
8.2 KiB
C#
231 lines
8.2 KiB
C#
using Silk.NET.Vulkan;
|
|
using System;
|
|
using System.Diagnostics;
|
|
|
|
namespace Ryujinx.Graphics.Vulkan
|
|
{
|
|
class DescriptorSetManager : IDisposable
|
|
{
|
|
public const uint MaxSets = 8;
|
|
|
|
public class DescriptorPoolHolder : IDisposable
|
|
{
|
|
public Vk Api { get; }
|
|
public Device Device { get; }
|
|
|
|
private readonly DescriptorPool _pool;
|
|
private int _freeDescriptors;
|
|
private int _totalSets;
|
|
private int _setsInUse;
|
|
private bool _done;
|
|
|
|
public unsafe DescriptorPoolHolder(Vk api, Device device, ReadOnlySpan<DescriptorPoolSize> poolSizes, bool updateAfterBind)
|
|
{
|
|
Api = api;
|
|
Device = device;
|
|
|
|
foreach (var poolSize in poolSizes)
|
|
{
|
|
_freeDescriptors += (int)poolSize.DescriptorCount;
|
|
}
|
|
|
|
fixed (DescriptorPoolSize* pPoolsSize = poolSizes)
|
|
{
|
|
var descriptorPoolCreateInfo = new DescriptorPoolCreateInfo
|
|
{
|
|
SType = StructureType.DescriptorPoolCreateInfo,
|
|
Flags = updateAfterBind ? DescriptorPoolCreateFlags.UpdateAfterBindBit : DescriptorPoolCreateFlags.None,
|
|
MaxSets = MaxSets,
|
|
PoolSizeCount = (uint)poolSizes.Length,
|
|
PPoolSizes = pPoolsSize,
|
|
};
|
|
|
|
Api.CreateDescriptorPool(device, descriptorPoolCreateInfo, null, out _pool).ThrowOnError();
|
|
}
|
|
}
|
|
|
|
public unsafe DescriptorSetCollection AllocateDescriptorSets(ReadOnlySpan<DescriptorSetLayout> layouts, int consumedDescriptors)
|
|
{
|
|
TryAllocateDescriptorSets(layouts, consumedDescriptors, isTry: false, out var dsc);
|
|
return dsc;
|
|
}
|
|
|
|
public bool TryAllocateDescriptorSets(ReadOnlySpan<DescriptorSetLayout> layouts, int consumedDescriptors, out DescriptorSetCollection dsc)
|
|
{
|
|
return TryAllocateDescriptorSets(layouts, consumedDescriptors, isTry: true, out dsc);
|
|
}
|
|
|
|
private unsafe bool TryAllocateDescriptorSets(
|
|
ReadOnlySpan<DescriptorSetLayout> layouts,
|
|
int consumedDescriptors,
|
|
bool isTry,
|
|
out DescriptorSetCollection dsc)
|
|
{
|
|
Debug.Assert(!_done);
|
|
|
|
DescriptorSet[] descriptorSets = new DescriptorSet[layouts.Length];
|
|
|
|
fixed (DescriptorSet* pDescriptorSets = descriptorSets)
|
|
{
|
|
fixed (DescriptorSetLayout* pLayouts = layouts)
|
|
{
|
|
var descriptorSetAllocateInfo = new DescriptorSetAllocateInfo
|
|
{
|
|
SType = StructureType.DescriptorSetAllocateInfo,
|
|
DescriptorPool = _pool,
|
|
DescriptorSetCount = (uint)layouts.Length,
|
|
PSetLayouts = pLayouts,
|
|
};
|
|
|
|
var result = Api.AllocateDescriptorSets(Device, &descriptorSetAllocateInfo, pDescriptorSets);
|
|
if (isTry && result == Result.ErrorOutOfPoolMemory)
|
|
{
|
|
_totalSets = (int)MaxSets;
|
|
_done = true;
|
|
DestroyIfDone();
|
|
dsc = default;
|
|
return false;
|
|
}
|
|
|
|
result.ThrowOnError();
|
|
}
|
|
}
|
|
|
|
_freeDescriptors -= consumedDescriptors;
|
|
_totalSets += layouts.Length;
|
|
_setsInUse += layouts.Length;
|
|
|
|
dsc = new DescriptorSetCollection(this, descriptorSets);
|
|
return true;
|
|
}
|
|
|
|
public void FreeDescriptorSets(DescriptorSetCollection dsc)
|
|
{
|
|
_setsInUse -= dsc.SetsCount;
|
|
Debug.Assert(_setsInUse >= 0);
|
|
DestroyIfDone();
|
|
}
|
|
|
|
public bool CanFit(int setsCount, int descriptorsCount)
|
|
{
|
|
// Try to determine if an allocation with the given parameters will succeed.
|
|
// An allocation may fail if the sets count or descriptors count exceeds the available counts
|
|
// of the pool.
|
|
// Not getting that right is not fatal, it will just create a new pool and try again,
|
|
// but it is less efficient.
|
|
|
|
if (_totalSets + setsCount <= MaxSets && _freeDescriptors >= descriptorsCount)
|
|
{
|
|
return true;
|
|
}
|
|
|
|
_done = true;
|
|
DestroyIfDone();
|
|
return false;
|
|
}
|
|
|
|
private unsafe void DestroyIfDone()
|
|
{
|
|
if (_done && _setsInUse == 0)
|
|
{
|
|
Api.DestroyDescriptorPool(Device, _pool, null);
|
|
}
|
|
}
|
|
|
|
protected virtual void Dispose(bool disposing)
|
|
{
|
|
if (disposing)
|
|
{
|
|
unsafe
|
|
{
|
|
Api.DestroyDescriptorPool(Device, _pool, null);
|
|
}
|
|
}
|
|
}
|
|
|
|
public void Dispose()
|
|
{
|
|
GC.SuppressFinalize(this);
|
|
Dispose(true);
|
|
}
|
|
}
|
|
|
|
private readonly Device _device;
|
|
private readonly DescriptorPoolHolder[] _currentPools;
|
|
|
|
public DescriptorSetManager(Device device, int poolCount)
|
|
{
|
|
_device = device;
|
|
_currentPools = new DescriptorPoolHolder[poolCount];
|
|
}
|
|
|
|
public Auto<DescriptorSetCollection> AllocateDescriptorSet(
|
|
Vk api,
|
|
DescriptorSetLayout layout,
|
|
ReadOnlySpan<DescriptorPoolSize> poolSizes,
|
|
int poolIndex,
|
|
int consumedDescriptors,
|
|
bool updateAfterBind)
|
|
{
|
|
Span<DescriptorSetLayout> layouts = stackalloc DescriptorSetLayout[1];
|
|
layouts[0] = layout;
|
|
return AllocateDescriptorSets(api, layouts, poolSizes, poolIndex, consumedDescriptors, updateAfterBind);
|
|
}
|
|
|
|
public Auto<DescriptorSetCollection> AllocateDescriptorSets(
|
|
Vk api,
|
|
ReadOnlySpan<DescriptorSetLayout> layouts,
|
|
ReadOnlySpan<DescriptorPoolSize> poolSizes,
|
|
int poolIndex,
|
|
int consumedDescriptors,
|
|
bool updateAfterBind)
|
|
{
|
|
// If we fail the first time, just create a new pool and try again.
|
|
|
|
var pool = GetPool(api, poolSizes, poolIndex, layouts.Length, consumedDescriptors, updateAfterBind);
|
|
if (!pool.TryAllocateDescriptorSets(layouts, consumedDescriptors, out var dsc))
|
|
{
|
|
pool = GetPool(api, poolSizes, poolIndex, layouts.Length, consumedDescriptors, updateAfterBind);
|
|
dsc = pool.AllocateDescriptorSets(layouts, consumedDescriptors);
|
|
}
|
|
|
|
return new Auto<DescriptorSetCollection>(dsc);
|
|
}
|
|
|
|
private DescriptorPoolHolder GetPool(
|
|
Vk api,
|
|
ReadOnlySpan<DescriptorPoolSize> poolSizes,
|
|
int poolIndex,
|
|
int setsCount,
|
|
int descriptorsCount,
|
|
bool updateAfterBind)
|
|
{
|
|
ref DescriptorPoolHolder currentPool = ref _currentPools[poolIndex];
|
|
|
|
if (currentPool == null || !currentPool.CanFit(setsCount, descriptorsCount))
|
|
{
|
|
currentPool = new DescriptorPoolHolder(api, _device, poolSizes, updateAfterBind);
|
|
}
|
|
|
|
return currentPool;
|
|
}
|
|
|
|
protected virtual void Dispose(bool disposing)
|
|
{
|
|
if (disposing)
|
|
{
|
|
for (int index = 0; index < _currentPools.Length; index++)
|
|
{
|
|
_currentPools[index]?.Dispose();
|
|
_currentPools[index] = null;
|
|
}
|
|
}
|
|
}
|
|
|
|
public void Dispose()
|
|
{
|
|
GC.SuppressFinalize(this);
|
|
Dispose(true);
|
|
}
|
|
}
|
|
}
|