diff options
| author | gdkchan <gab.dark.100@gmail.com> | 2023-01-13 02:09:48 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-13 06:09:48 +0100 |
| commit | dca5b14493e730960ed5cd67906278ecea969b3a (patch) | |
| tree | a9f45030868bc8a03453d25b818cef04789fd33f /Ryujinx.Graphics.Vulkan/MemoryAllocator.cs | |
| parent | 4d2c8e2a442d2859a75c6c9162a192a0a9a221be (diff) | |
Relax Vulkan requirements (#4228)1.1.551
Diffstat (limited to 'Ryujinx.Graphics.Vulkan/MemoryAllocator.cs')
| -rw-r--r-- | Ryujinx.Graphics.Vulkan/MemoryAllocator.cs | 33 |
1 files changed, 28 insertions, 5 deletions
diff --git a/Ryujinx.Graphics.Vulkan/MemoryAllocator.cs b/Ryujinx.Graphics.Vulkan/MemoryAllocator.cs index eea4e60b..83c0a324 100644 --- a/Ryujinx.Graphics.Vulkan/MemoryAllocator.cs +++ b/Ryujinx.Graphics.Vulkan/MemoryAllocator.cs @@ -27,7 +27,16 @@ namespace Ryujinx.Graphics.Vulkan MemoryRequirements requirements, MemoryPropertyFlags flags = 0) { - int memoryTypeIndex = FindSuitableMemoryTypeIndex(_api, physicalDevice, requirements.MemoryTypeBits, flags); + return AllocateDeviceMemory(physicalDevice, requirements, flags, flags); + } + + public MemoryAllocation AllocateDeviceMemory( + PhysicalDevice physicalDevice, + MemoryRequirements requirements, + MemoryPropertyFlags flags, + MemoryPropertyFlags alternativeFlags) + { + int memoryTypeIndex = FindSuitableMemoryTypeIndex(_api, physicalDevice, requirements.MemoryTypeBits, flags, alternativeFlags); if (memoryTypeIndex < 0) { return default; @@ -56,21 +65,35 @@ namespace Ryujinx.Graphics.Vulkan return newBl.Allocate(size, alignment, map); } - private static int FindSuitableMemoryTypeIndex(Vk api, PhysicalDevice physicalDevice, uint memoryTypeBits, MemoryPropertyFlags flags) + private static int FindSuitableMemoryTypeIndex( + Vk api, + PhysicalDevice physicalDevice, + uint memoryTypeBits, + MemoryPropertyFlags flags, + MemoryPropertyFlags alternativeFlags) { + int bestCandidateIndex = -1; + api.GetPhysicalDeviceMemoryProperties(physicalDevice, out var properties); for (int i = 0; i < properties.MemoryTypeCount; i++) { var type = properties.MemoryTypes[i]; - if ((memoryTypeBits & (1 << i)) != 0 && type.PropertyFlags.HasFlag(flags)) + if ((memoryTypeBits & (1 << i)) != 0) { - return i; + if (type.PropertyFlags.HasFlag(flags)) + { + return i; + } + else if (type.PropertyFlags.HasFlag(alternativeFlags)) + { + bestCandidateIndex = i; + } } } - return -1; + return bestCandidateIndex; } public void Dispose() |