e18d258fa0
* WIP texture pre-flush Improve performance of TextureView GetData to buffer Fix copy/sync ordering Fix minor bug Make this actually work WIP host mapping stuff * Fix usage flags * message * Cleanup 1 * Fix rebase * Fix * Improve pre-flush rules * Fix pre-flush * A lot of cleanup * Use the host memory bits * Select the correct memory type * Cleanup TextureGroupHandle * Missing comment * Remove debugging logs * Revert BufferHandle _value access modifier * One interrupt action at a time. * Support D32S8 to D24S8 conversion, safeguards * Interrupt cannot happen in sync handle's lock Waitable needs to be checked twice now, but this should stop it from deadlocking. * Remove unused using * Address some feedback * Address feedback * Address more feedback * Address more feedback * Improve sync rules Should allow for faster sync in some cases.
101 lines
3.4 KiB
C#
101 lines
3.4 KiB
C#
using Silk.NET.Vulkan;
|
|
using System;
|
|
using System.Collections.Generic;
|
|
|
|
namespace Ryujinx.Graphics.Vulkan
|
|
{
|
|
class MemoryAllocator : IDisposable
|
|
{
|
|
private ulong MaxDeviceMemoryUsageEstimate = 16UL * 1024 * 1024 * 1024;
|
|
|
|
private readonly Vk _api;
|
|
private readonly VulkanPhysicalDevice _physicalDevice;
|
|
private readonly Device _device;
|
|
private readonly List<MemoryAllocatorBlockList> _blockLists;
|
|
private readonly int _blockAlignment;
|
|
|
|
public MemoryAllocator(Vk api, VulkanPhysicalDevice physicalDevice, Device device)
|
|
{
|
|
_api = api;
|
|
_physicalDevice = physicalDevice;
|
|
_device = device;
|
|
_blockLists = new List<MemoryAllocatorBlockList>();
|
|
_blockAlignment = (int)Math.Min(int.MaxValue, MaxDeviceMemoryUsageEstimate / (ulong)_physicalDevice.PhysicalDeviceProperties.Limits.MaxMemoryAllocationCount);
|
|
}
|
|
|
|
public MemoryAllocation AllocateDeviceMemory(
|
|
MemoryRequirements requirements,
|
|
MemoryPropertyFlags flags = 0,
|
|
bool isBuffer = false)
|
|
{
|
|
int memoryTypeIndex = FindSuitableMemoryTypeIndex(requirements.MemoryTypeBits, flags);
|
|
if (memoryTypeIndex < 0)
|
|
{
|
|
return default;
|
|
}
|
|
|
|
bool map = flags.HasFlag(MemoryPropertyFlags.HostVisibleBit);
|
|
return Allocate(memoryTypeIndex, requirements.Size, requirements.Alignment, map, isBuffer);
|
|
}
|
|
|
|
private MemoryAllocation Allocate(int memoryTypeIndex, ulong size, ulong alignment, bool map, bool isBuffer)
|
|
{
|
|
for (int i = 0; i < _blockLists.Count; i++)
|
|
{
|
|
var bl = _blockLists[i];
|
|
if (bl.MemoryTypeIndex == memoryTypeIndex && bl.ForBuffer == isBuffer)
|
|
{
|
|
lock (bl)
|
|
{
|
|
return bl.Allocate(size, alignment, map);
|
|
}
|
|
}
|
|
}
|
|
|
|
var newBl = new MemoryAllocatorBlockList(_api, _device, memoryTypeIndex, _blockAlignment, isBuffer);
|
|
_blockLists.Add(newBl);
|
|
return newBl.Allocate(size, alignment, map);
|
|
}
|
|
|
|
internal int FindSuitableMemoryTypeIndex(
|
|
uint memoryTypeBits,
|
|
MemoryPropertyFlags flags)
|
|
{
|
|
for (int i = 0; i < _physicalDevice.PhysicalDeviceMemoryProperties.MemoryTypeCount; i++)
|
|
{
|
|
var type = _physicalDevice.PhysicalDeviceMemoryProperties.MemoryTypes[i];
|
|
|
|
if ((memoryTypeBits & (1 << i)) != 0)
|
|
{
|
|
if (type.PropertyFlags.HasFlag(flags))
|
|
{
|
|
return i;
|
|
}
|
|
}
|
|
}
|
|
|
|
return -1;
|
|
}
|
|
|
|
public static bool IsDeviceMemoryShared(VulkanPhysicalDevice physicalDevice)
|
|
{
|
|
for (int i = 0; i < physicalDevice.PhysicalDeviceMemoryProperties.MemoryHeapCount; i++)
|
|
{
|
|
if (!physicalDevice.PhysicalDeviceMemoryProperties.MemoryHeaps[i].Flags.HasFlag(MemoryHeapFlags.DeviceLocalBit))
|
|
{
|
|
return false;
|
|
}
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
public void Dispose()
|
|
{
|
|
for (int i = 0; i < _blockLists.Count; i++)
|
|
{
|
|
_blockLists[i].Dispose();
|
|
}
|
|
}
|
|
}
|
|
}
|