DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Manual roll of Skia from 971c342c3030 to 280ac8882cff (flutter/engine#38257)

Browse Source 
This roll changed a VulkanMemoryAllocator API
This commit is contained in:
Jason Simmons 2022-12-13 11:52:32 -08:00 committed by GitHub
parent fd06286e6a
commit 569f04007e
4 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -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.

2
engine/src/flutter/ci/licenses_golden/licenses_skia
View File

@ -1,4 +1,4 @@
Signature: 734f452db823000268dff4a6e6d2e13e
Signature: b1c69055420e97d4bd0f5d5d85ca9776
UNUSED LICENSES:

12
engine/src/flutter/flutter_vma/flutter_skia_vma.cc
View File

@ -259,16 +259,12 @@ VkResult FlutterSkiaVulkanMemoryAllocator::invalidateMemory(
return vmaInvalidateAllocation(allocator_, allocation, offset, size);
}
uint64_t FlutterSkiaVulkanMemoryAllocator::totalUsedMemory() const {
std::pair<uint64_t, uint64_t>
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

3
engine/src/flutter/flutter_vma/flutter_skia_vma.h
View File

@ -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<uint64_t, uint64_t> totalAllocatedAndUsedMemory() const override;
private:
FlutterSkiaVulkanMemoryAllocator(