commit 9251eb9369ab72e5fade372f9926d269917fa5da
author android-build-prod (mdb) <android-build-team-robot@google.com> Wed Jul 29 16:03:19 2020 +0000
committer android-build-prod (mdb) <android-build-team-robot@google.com> Wed Jul 29 16:03:19 2020 +0000
tree 69f51dab036f2b574bc06234ec52a4e38130254d
parent d0bc23456d36a073c2d512ca490f35e1f4284698
parent 302959347fe3fafd4c61d0e068a76d941155ac7b

Snap for 6718073 from 302959347fe3fafd4c61d0e068a76d941155ac7b to pie-vts-release

Change-Id: I7712dc799d1f01761600df071e60e8a60aa5f386

src/gpu/vk/GrVkMemory.cpp

diff --git a/src/gpu/vk/GrVkMemory.cpp b/src/gpu/vk/GrVkMemory.cpp
index e391d02..affa5f6 100644
--- a/src/gpu/vk/GrVkMemory.cpp
+++ b/src/gpu/vk/GrVkMemory.cpp
@@ -191,7 +191,8 @@
                                                      VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
                                                      &typeIndex,
                                                      &heapIndex));
-        if (memReqs.size <= kMaxSmallImageSize) {
+        // select the heap based on the device alignment
+        if (align_size(memReqs.size, memReqs.alignment) <= kMaxSmallImageSize) {
             heap = gpu->getHeap(GrVkGpu::kSmallOptimalImage_Heap);
         } else {
             heap = gpu->getHeap(GrVkGpu::kOptimalImage_Heap);