summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Kertels <robin.kertels@gmail.com>2021-07-26 23:01:25 +0200
committerRobin Kertels <robin.kertels@gmail.com>2021-07-26 23:37:18 +0200
commit75050c788cc0d7d3266b7e18698d4566d6d1a01f (patch)
tree4f969afb66afe4a5cbd67e0abed52a69bc5e1973
parentMerge pull request #6736 from CaptV0rt3x/patch-1 (diff)
downloadyuzu-75050c788cc0d7d3266b7e18698d4566d6d1a01f.tar
yuzu-75050c788cc0d7d3266b7e18698d4566d6d1a01f.tar.gz
yuzu-75050c788cc0d7d3266b7e18698d4566d6d1a01f.tar.bz2
yuzu-75050c788cc0d7d3266b7e18698d4566d6d1a01f.tar.lz
yuzu-75050c788cc0d7d3266b7e18698d4566d6d1a01f.tar.xz
yuzu-75050c788cc0d7d3266b7e18698d4566d6d1a01f.tar.zst
yuzu-75050c788cc0d7d3266b7e18698d4566d6d1a01f.zip
-rw-r--r--src/video_core/renderer_vulkan/vk_staging_buffer_pool.cpp29
1 files changed, 21 insertions, 8 deletions
diff --git a/src/video_core/renderer_vulkan/vk_staging_buffer_pool.cpp b/src/video_core/renderer_vulkan/vk_staging_buffer_pool.cpp
index 555b12ed7..5d5329abf 100644
--- a/src/video_core/renderer_vulkan/vk_staging_buffer_pool.cpp
+++ b/src/video_core/renderer_vulkan/vk_staging_buffer_pool.cpp
@@ -61,11 +61,15 @@ std::optional<u32> FindMemoryTypeIndex(const VkPhysicalDeviceMemoryProperties& p
return std::nullopt;
}
-u32 FindMemoryTypeIndex(const VkPhysicalDeviceMemoryProperties& props, u32 type_mask) {
- // Try to find a DEVICE_LOCAL_BIT type, Nvidia and AMD have a dedicated heap for this
- std::optional<u32> type = FindMemoryTypeIndex(props, type_mask, STREAM_FLAGS);
- if (type) {
- return *type;
+u32 FindMemoryTypeIndex(const VkPhysicalDeviceMemoryProperties& props, u32 type_mask,
+ bool try_device_local) {
+ std::optional<u32> type;
+ if (try_device_local) {
+ // Try to find a DEVICE_LOCAL_BIT type, Nvidia and AMD have a dedicated heap for this
+ type = FindMemoryTypeIndex(props, type_mask, STREAM_FLAGS);
+ if (type) {
+ return *type;
+ }
}
// Otherwise try without the DEVICE_LOCAL_BIT
type = FindMemoryTypeIndex(props, type_mask, HOST_FLAGS);
@@ -115,12 +119,21 @@ StagingBufferPool::StagingBufferPool(const Device& device_, MemoryAllocator& mem
.buffer = *stream_buffer,
};
const auto memory_properties = device.GetPhysical().GetMemoryProperties();
- stream_memory = dev.AllocateMemory(VkMemoryAllocateInfo{
+ VkMemoryAllocateInfo stream_memory_info{
.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO,
.pNext = make_dedicated ? &dedicated_info : nullptr,
.allocationSize = requirements.size,
- .memoryTypeIndex = FindMemoryTypeIndex(memory_properties, requirements.memoryTypeBits),
- });
+ .memoryTypeIndex =
+ FindMemoryTypeIndex(memory_properties, requirements.memoryTypeBits, true),
+ };
+ stream_memory = dev.TryAllocateMemory(stream_memory_info);
+ if (!stream_memory) {
+ LOG_INFO(Render_Vulkan, "Dynamic memory allocation failed, trying with system memory");
+ stream_memory_info.memoryTypeIndex =
+ FindMemoryTypeIndex(memory_properties, requirements.memoryTypeBits, false);
+ stream_memory = dev.AllocateMemory(stream_memory_info);
+ }
+
if (device.HasDebuggingToolAttached()) {
stream_memory.SetObjectNameEXT("Stream Buffer Memory");
}