Vulkan: Use 4 MB as preferredLargeHeapBlockSize for allocator.

include/platform/FeaturesVk.h

@@ -376,6 +376,13 @@ struct FeaturesVk : FeatureSetBase
     Feature enableMultisampledRenderToTexture = {
         "enable_multisampled_render_to_texture", FeatureCategory::VulkanWorkarounds,
         "Expose EXT_multisampled_render_to_texture", &members, "http://anglebug.com/4937"};
+
+    // Qualcomm fails some tests when reducing the preferred block size to 4M.
+    // http://anglebug.com/4995
+    Feature preferredLargeHeapBlockSize4MB = {
+        "preferred_large_heap_block_size_4M", FeatureCategory::VulkanWorkarounds,
+        "Use 4 MB preferred large heap block size with AMD allocator", &members,
+        "http://anglebug.com/4995"};
 };
 
 inline FeaturesVk::FeaturesVk()  = default;

src/libANGLE/renderer/vulkan/RendererVk.cpp

@@ -852,9 +852,19 @@ angle::Result RendererVk::initialize(DisplayVk *displayVk,
         ANGLE_TRY(initializeDevice(displayVk, firstGraphicsQueueFamily));
     }
 
+    VkDeviceSize preferredLargeHeapBlockSize = 0;
+    if (mFeatures.preferredLargeHeapBlockSize4MB.enabled)
+    {
+        // This number matches Chromium and was picked by looking at memory usage of
+        // Android apps. The allocator will start making blocks at 1/8 the max size
+        // and builds up block size as needed before capping at the max set here.
+        preferredLargeHeapBlockSize = 4 * 1024 * 1024;
+    }
+
     // Create VMA allocator
     ANGLE_VK_TRY(displayVk,
-                 mAllocator.init(mPhysicalDevice, mDevice, mInstance, applicationInfo.apiVersion));
+                 mAllocator.init(mPhysicalDevice, mDevice, mInstance, applicationInfo.apiVersion,
+                                 preferredLargeHeapBlockSize));
 
     // Store the physical device memory properties so we can find the right memory pools.
     mMemoryProperties.init(mPhysicalDevice);
@@ -1855,6 +1865,8 @@ void RendererVk::initFeatures(DisplayVk *displayVk, const ExtensionNameList &dev
     ANGLE_FEATURE_CONDITION(&mFeatures, enableMultisampledRenderToTexture,
                             !(IsApple() && isSwiftShader));
 
+    ANGLE_FEATURE_CONDITION(&mFeatures, preferredLargeHeapBlockSize4MB, !isQualcomm);
+
     angle::PlatformMethods *platform = ANGLEPlatformCurrent();
     platform->overrideFeaturesVk(platform, &mFeatures);
 

src/libANGLE/renderer/vulkan/vk_mem_alloc_wrapper.cpp

@@ -17,6 +17,7 @@ VkResult InitAllocator(VkPhysicalDevice physicalDevice,
                        VkDevice device,
                        VkInstance instance,
                        uint32_t apiVersion,
+                       VkDeviceSize preferredLargeHeapBlockSize,
                        VmaAllocator *pAllocator)
 {
     VmaVulkanFunctions funcs                  = {};
@@ -55,12 +56,13 @@ VkResult InitAllocator(VkPhysicalDevice physicalDevice,
         funcs.vkGetPhysicalDeviceMemoryProperties2KHR = vkGetPhysicalDeviceMemoryProperties2KHR;
     }
 
-    VmaAllocatorCreateInfo allocatorInfo = {};
-    allocatorInfo.physicalDevice         = physicalDevice;
-    allocatorInfo.device                 = device;
-    allocatorInfo.instance               = instance;
-    allocatorInfo.pVulkanFunctions       = &funcs;
-    allocatorInfo.vulkanApiVersion       = apiVersion;
+    VmaAllocatorCreateInfo allocatorInfo      = {};
+    allocatorInfo.physicalDevice              = physicalDevice;
+    allocatorInfo.device                      = device;
+    allocatorInfo.instance                    = instance;
+    allocatorInfo.pVulkanFunctions            = &funcs;
+    allocatorInfo.vulkanApiVersion            = apiVersion;
+    allocatorInfo.preferredLargeHeapBlockSize = preferredLargeHeapBlockSize;
 
     return vmaCreateAllocator(&allocatorInfo, pAllocator);
 }

src/libANGLE/renderer/vulkan/vk_mem_alloc_wrapper.h

@@ -21,6 +21,7 @@ VkResult InitAllocator(VkPhysicalDevice physicalDevice,
                        VkDevice device,
                        VkInstance instance,
                        uint32_t apiVersion,
+                       VkDeviceSize preferredLargeHeapBlockSize,
                        VmaAllocator *pAllocator);
 
 void DestroyAllocator(VmaAllocator allocator);

src/libANGLE/renderer/vulkan/vk_wrapper.h

@@ -469,7 +469,8 @@ class Allocator : public WrappedObject<Allocator, VmaAllocator>
     VkResult init(VkPhysicalDevice physicalDevice,
                   VkDevice device,
                   VkInstance instance,
-                  uint32_t apiVersion);
+                  uint32_t apiVersion,
+                  VkDeviceSize preferredLargeHeapBlockSize);
 
     // Initializes the buffer handle and memory allocation.
     VkResult createBuffer(const VkBufferCreateInfo &bufferCreateInfo,
@@ -1394,10 +1395,12 @@ ANGLE_INLINE void Allocator::destroy()
 ANGLE_INLINE VkResult Allocator::init(VkPhysicalDevice physicalDevice,
                                       VkDevice device,
                                       VkInstance instance,
-                                      uint32_t apiVersion)
+                                      uint32_t apiVersion,
+                                      VkDeviceSize preferredLargeHeapBlockSize)
 {
     ASSERT(!valid());
-    return vma::InitAllocator(physicalDevice, device, instance, apiVersion, &mHandle);
+    return vma::InitAllocator(physicalDevice, device, instance, apiVersion,
+                              preferredLargeHeapBlockSize, &mHandle);
 }
 
 ANGLE_INLINE VkResult Allocator::createBuffer(const VkBufferCreateInfo &bufferCreateInfo,