diff --git a/DEPS b/DEPS index c88de3ed2d4f0..2c9643e3c30e8 100644 --- a/DEPS +++ b/DEPS @@ -18,7 +18,7 @@ vars = { 'llvm_git': 'https://llvm.googlesource.com', # OCMock is for testing only so there is no google clone 'ocmock_git': 'https://github.com/erikdoe/ocmock.git', - 'skia_revision': '971c342c30304ef6048384595b073b67d618b417', + 'skia_revision': '280ac8882cffff56e83d5a3af6de903b5fcc87ac', # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version. diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index a3aa0726985d4..066f05c946d8c 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 734f452db823000268dff4a6e6d2e13e +Signature: b1c69055420e97d4bd0f5d5d85ca9776 UNUSED LICENSES: diff --git a/flutter_vma/flutter_skia_vma.cc b/flutter_vma/flutter_skia_vma.cc index 5b4eb89ae4a39..fdcf2282e4c03 100644 --- a/flutter_vma/flutter_skia_vma.cc +++ b/flutter_vma/flutter_skia_vma.cc @@ -259,16 +259,12 @@ VkResult FlutterSkiaVulkanMemoryAllocator::invalidateMemory( return vmaInvalidateAllocation(allocator_, allocation, offset, size); } -uint64_t FlutterSkiaVulkanMemoryAllocator::totalUsedMemory() const { +std::pair +FlutterSkiaVulkanMemoryAllocator::totalAllocatedAndUsedMemory() const { VmaTotalStatistics stats; vmaCalculateStatistics(allocator_, &stats); - return stats.total.statistics.allocationBytes; -} - -uint64_t FlutterSkiaVulkanMemoryAllocator::totalAllocatedMemory() const { - VmaTotalStatistics stats; - vmaCalculateStatistics(allocator_, &stats); - return stats.total.statistics.blockBytes; + return {stats.total.statistics.blockBytes, + stats.total.statistics.allocationBytes}; } } // namespace flutter diff --git a/flutter_vma/flutter_skia_vma.h b/flutter_vma/flutter_skia_vma.h index fd6a6078d4e39..9faccf030573f 100644 --- a/flutter_vma/flutter_skia_vma.h +++ b/flutter_vma/flutter_skia_vma.h @@ -48,8 +48,7 @@ class FlutterSkiaVulkanMemoryAllocator : public skgpu::VulkanMemoryAllocator { VkDeviceSize offset, VkDeviceSize size) override; - uint64_t totalUsedMemory() const override; - uint64_t totalAllocatedMemory() const override; + std::pair totalAllocatedAndUsedMemory() const override; private: FlutterSkiaVulkanMemoryAllocator(