Vulkan: Add strict flag to memory type selection

Source/Core/VideoBackends/Vulkan/BoundingBox.cpp

@@ -172,8 +172,10 @@ bool BoundingBox::CreateGPUBuffer()
   VkMemoryRequirements memory_requirements;
   vkGetBufferMemoryRequirements(g_vulkan_context->GetDevice(), buffer, &memory_requirements);
 
-  uint32_t memory_type_index = g_vulkan_context->GetMemoryType(memory_requirements.memoryTypeBits,
+  uint32_t memory_type_index = g_vulkan_context
-                                                               VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT);
+                                   ->GetMemoryType(memory_requirements.memoryTypeBits,
+                                                   VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, false)
+                                   .value_or(0);
   VkMemoryAllocateInfo memory_allocate_info = {
       VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO,  // VkStructureType    sType
       nullptr,                                 // const void*        pNext

Source/Core/VideoBackends/Vulkan/VKTexture.cpp

@@ -87,8 +87,10 @@ std::unique_ptr<VKTexture> VKTexture::Create(const TextureConfig& tex_config)
 
   VkMemoryAllocateInfo memory_info = {
       VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO, nullptr, memory_requirements.size,
-      g_vulkan_context->GetMemoryType(memory_requirements.memoryTypeBits,
+      g_vulkan_context
-                                      VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT)};
+          ->GetMemoryType(memory_requirements.memoryTypeBits, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
+                          false)
+          .value_or(0)};
 
   VkDeviceMemory device_memory;
   res = vkAllocateMemory(g_vulkan_context->GetDevice(), &memory_info, nullptr, &device_memory);

Source/Core/VideoBackends/Vulkan/VulkanContext.cpp

@@ -710,96 +710,97 @@ void VulkanContext::DisableDebugReports()
   }
 }
 
-bool VulkanContext::GetMemoryType(u32 bits, VkMemoryPropertyFlags properties, u32* out_type_index)
+std::optional<u32> VulkanContext::GetMemoryType(u32 bits, VkMemoryPropertyFlags properties,
+                                                bool strict, bool* is_coherent)
 {
+  static constexpr u32 ALL_MEMORY_PROPERTY_FLAGS = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT |
+                                                   VK_MEMORY_PROPERTY_HOST_COHERENT_BIT |
+                                                   VK_MEMORY_PROPERTY_HOST_CACHED_BIT;
+
+  const u32 mask = strict ? ALL_MEMORY_PROPERTY_FLAGS : properties;
+
   for (u32 i = 0; i < VK_MAX_MEMORY_TYPES; i++)
   {
     if ((bits & (1 << i)) != 0)
     {
-      u32 supported = m_device_memory_properties.memoryTypes[i].propertyFlags & properties;
+      const VkMemoryPropertyFlags type_flags =
+          m_device_memory_properties.memoryTypes[i].propertyFlags;
+      const VkMemoryPropertyFlags supported = type_flags & mask;
       if (supported == properties)
       {
-        *out_type_index = i;
+        if (is_coherent)
-        return true;
+          *is_coherent = (type_flags & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT) != 0;
+        return i;
       }
     }
   }
 
-  return false;
+  return std::nullopt;
-}
-
-u32 VulkanContext::GetMemoryType(u32 bits, VkMemoryPropertyFlags properties)
-{
-  u32 type_index = VK_MAX_MEMORY_TYPES;
-  if (!GetMemoryType(bits, properties, &type_index))
-    PanicAlert("Unable to find memory type for %x:%x", bits, properties);
-
-  return type_index;
 }
 
 u32 VulkanContext::GetUploadMemoryType(u32 bits, bool* is_coherent)
 {
-  // Try for coherent memory first.
+  static constexpr VkMemoryPropertyFlags COHERENT_FLAGS =
-  VkMemoryPropertyFlags flags =
       VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
 
-  u32 type_index;
+  // Try for coherent memory. Some drivers (looking at you, Adreno) have the cached type before the
-  if (!GetMemoryType(bits, flags, &type_index))
+  // uncached type, so use a strict check first.
+  std::optional<u32> type_index = GetMemoryType(bits, COHERENT_FLAGS, true, is_coherent);
+  if (type_index)
+    return type_index.value();
+
+  // Try for coherent memory, with any other bits set.
+  type_index = GetMemoryType(bits, COHERENT_FLAGS, false, is_coherent);
+  if (type_index)
   {
+    WARN_LOG(VIDEO,
+             "Strict check for upload memory properties failed, this may affect performance");
+    return type_index.value();
+  }
+
+  // Fall back to non-coherent memory.
   WARN_LOG(
       VIDEO,
       "Vulkan: Failed to find a coherent memory type for uploads, this will affect performance.");
+  type_index = GetMemoryType(bits, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, false, is_coherent);
+  if (type_index)
+    return type_index.value();
 
-    // Try non-coherent memory.
+  // Shouldn't happen, there should be at least one host-visible heap.
-    flags &= ~VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
-    if (!GetMemoryType(bits, flags, &type_index))
-    {
-      // We shouldn't have any memory types that aren't host-visible.
   PanicAlert("Unable to get memory type for upload.");
-      type_index = 0;
+  return 0;
-    }
-  }
-
-  if (is_coherent)
-    *is_coherent = ((flags & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT) != 0);
-
-  return type_index;
 }
 
-u32 VulkanContext::GetReadbackMemoryType(u32 bits, bool* is_coherent, bool* is_cached)
+u32 VulkanContext::GetReadbackMemoryType(u32 bits, bool* is_coherent)
 {
-  // Try for cached and coherent memory first.
+  std::optional<u32> type_index;
-  VkMemoryPropertyFlags flags = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT |
+
-                                VK_MEMORY_PROPERTY_HOST_CACHED_BIT |
+  // Optimal config uses cached+coherent.
-                                VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
+  type_index =
+      GetMemoryType(bits,
+                    VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT |
+                        VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
+                    true, is_coherent);
+  if (type_index)
+    return type_index.value();
+
+  // Otherwise, prefer cached over coherent if we must choose one.
+  type_index =
+      GetMemoryType(bits, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT,
+                    false, is_coherent);
+  if (type_index)
+    return type_index.value();
 
-  u32 type_index;
-  if (!GetMemoryType(bits, flags, &type_index))
-  {
-    // For readbacks, caching is more important than coherency.
-    flags &= ~VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
-    if (!GetMemoryType(bits, flags, &type_index))
-    {
   WARN_LOG(VIDEO, "Vulkan: Failed to find a cached memory type for readbacks, this will affect "
                   "performance.");
+  type_index = GetMemoryType(bits, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, false, is_coherent);
+  *is_coherent = false;
+  if (type_index)
+    return type_index.value();
 
-      // Remove the cached bit as well.
+  // We should have at least one host visible memory type...
-      flags &= ~VK_MEMORY_PROPERTY_HOST_CACHED_BIT;
-      if (!GetMemoryType(bits, flags, &type_index))
-      {
-        // We shouldn't have any memory types that aren't host-visible.
   PanicAlert("Unable to get memory type for upload.");
-        type_index = 0;
+  return 0;
-      }
-    }
-  }
-
-  if (is_coherent)
-    *is_coherent = ((flags & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT) != 0);
-  if (is_cached)
-    *is_cached = ((flags & VK_MEMORY_PROPERTY_HOST_CACHED_BIT) != 0);
-
-  return type_index;
 }
 
 void VulkanContext::InitDriverDetails()

Source/Core/VideoBackends/Vulkan/VulkanContext.h

@@ -5,6 +5,7 @@
 #pragma once
 
 #include <memory>
+#include <optional>
 #include <vector>
 
 #include "Common/CommonTypes.h"
@@ -99,12 +100,12 @@ public:
   float GetMaxSamplerAnisotropy() const { return m_device_properties.limits.maxSamplerAnisotropy; }
   // Finds a memory type index for the specified memory properties and the bits returned by
   // vkGetImageMemoryRequirements
-  bool GetMemoryType(u32 bits, VkMemoryPropertyFlags properties, u32* out_type_index);
+  std::optional<u32> GetMemoryType(u32 bits, VkMemoryPropertyFlags properties, bool strict,
-  u32 GetMemoryType(u32 bits, VkMemoryPropertyFlags properties);
+                                   bool* is_coherent = nullptr);
 
   // Finds a memory type for upload or readback buffers.
   u32 GetUploadMemoryType(u32 bits, bool* is_coherent = nullptr);
-  u32 GetReadbackMemoryType(u32 bits, bool* is_coherent = nullptr, bool* is_cached = nullptr);
+  u32 GetReadbackMemoryType(u32 bits, bool* is_coherent = nullptr);
 
 private:
   using ExtensionList = std::vector<const char*>;