From f43473ae3801b41942f72983f5c287317487623c Mon Sep 17 00:00:00 2001 From: Aaron Clarke Date: Tue, 2 Jul 2024 08:42:28 -0700 Subject: [PATCH 1/3] [Impeller] fixed units for memory measurement --- impeller/renderer/backend/metal/allocator_mtl.mm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/impeller/renderer/backend/metal/allocator_mtl.mm b/impeller/renderer/backend/metal/allocator_mtl.mm index 913f7333205a8..6a9e4437f4bb5 100644 --- a/impeller/renderer/backend/metal/allocator_mtl.mm +++ b/impeller/renderer/backend/metal/allocator_mtl.mm @@ -99,7 +99,8 @@ static bool SupportsLossyTextureCompression(id device) { } size_t DebugAllocatorStats::GetAllocationSizeMB() { - size_t new_value = size_ / 1000000; + // RAM is measured in MiB, thus a divisor of 2^20 instead of 1,000,000. + size_t new_value = size_ / (1024 * 1024); return new_value; } From c2f67a3a66d23db14c643604e512d19b420fecc9 Mon Sep 17 00:00:00 2001 From: Aaron Clarke Date: Tue, 2 Jul 2024 08:49:07 -0700 Subject: [PATCH 2/3] updated test --- impeller/renderer/backend/metal/allocator_mtl_unittests.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/impeller/renderer/backend/metal/allocator_mtl_unittests.mm b/impeller/renderer/backend/metal/allocator_mtl_unittests.mm index 4150caf20ce9d..ea1bac5421b67 100644 --- a/impeller/renderer/backend/metal/allocator_mtl_unittests.mm +++ b/impeller/renderer/backend/metal/allocator_mtl_unittests.mm @@ -36,7 +36,7 @@ TextureDescriptor desc; desc.format = PixelFormat::kR8G8B8A8UNormInt; desc.storage_mode = StorageMode::kDeviceTransient; - desc.size = {1000, 1000}; + desc.size = {1024, 1024}; auto texture_1 = allocator->CreateTexture(desc); EXPECT_EQ(allocator->DebugGetHeapUsage(), 0u); From 7518efbc9730cfbd024e84846b58e8d9732e3930 Mon Sep 17 00:00:00 2001 From: Aaron Clarke Date: Tue, 2 Jul 2024 10:46:48 -0700 Subject: [PATCH 3/3] updated vulkan --- impeller/renderer/backend/vulkan/allocator_vk.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/impeller/renderer/backend/vulkan/allocator_vk.cc b/impeller/renderer/backend/vulkan/allocator_vk.cc index 364b9aa49afbd..032f9d7e7d51b 100644 --- a/impeller/renderer/backend/vulkan/allocator_vk.cc +++ b/impeller/renderer/backend/vulkan/allocator_vk.cc @@ -519,7 +519,7 @@ size_t AllocatorVK::DebugGetHeapUsage() const { total_usage += budget.usage; } // Convert bytes to MB. - total_usage *= 1e-6; + total_usage /= (1024 * 1024); return total_usage; }