Migrate the API of GrDirectContext about resource memory limit (flutt…

…er#31977)
pingbird · Mar 14, 2022 · 0cf0ea0 · 0cf0ea0
1 parent 57c05b3
commit 0cf0ea0
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 18 deletions.
diff --git a/shell/common/rasterizer.cc b/shell/common/rasterizer.cc
@@ -824,9 +824,7 @@ void Rasterizer::SetResourceCacheMaxBytes(size_t max_bytes, bool from_user) {
       return;
     }
 
-    int max_resources;
-    context->getResourceCacheLimits(&max_resources, nullptr);
-    context->setResourceCacheLimits(max_resources, max_bytes);
+    context->setResourceCacheLimit(max_bytes);
   }
 }
 
@@ -836,9 +834,7 @@ std::optional<size_t> Rasterizer::GetResourceCacheMaxBytes() const {
   }
   GrDirectContext* context = surface_->GetContext();
   if (context) {
-    size_t max_bytes;
-    context->getResourceCacheLimits(nullptr, &max_bytes);
-    return max_bytes;
+    return context->getResourceCacheLimit();
   }
   return std::nullopt;
 }

diff --git a/shell/common/shell_io_manager.cc b/shell/common/shell_io_manager.cc
@@ -23,7 +23,7 @@ sk_sp<GrDirectContext> ShellIOManager::CreateCompatibleResourceLoadingContext(
   if (auto context = GrDirectContext::MakeGL(gl_interface, options)) {
     // Do not cache textures created by the image decoder.  These textures
     // should be deleted when they are no longer referenced by an SkImage.
-    context->setResourceCacheLimits(0, 0);
+    context->setResourceCacheLimit(0);
     return context;
   }
 #endif

diff --git a/shell/common/shell_test_platform_view_vulkan.cc b/shell/common/shell_test_platform_view_vulkan.cc
@@ -125,8 +125,7 @@ bool ShellTestPlatformViewVulkan::OffScreenSurface::CreateSkiaGrContext() {
     return false;
   }
 
-  context->setResourceCacheLimits(vulkan::kGrCacheMaxCount,
-                                  vulkan::kGrCacheMaxByteSize);
+  context->setResourceCacheLimit(vulkan::kGrCacheMaxByteSize);
 
   context_ = context;
 

diff --git a/shell/gpu/gpu_surface_gl.cc b/shell/gpu/gpu_surface_gl.cc
@@ -25,9 +25,6 @@
 
 namespace flutter {
 
-// Default maximum number of budgeted resources in the cache.
-static const int kGrCacheMaxCount = 8192;
-
 // Default maximum number of bytes of GPU memory of budgeted resources in the
 // cache.
 // The shell will dynamically increase or decrease this cache based on the
@@ -54,7 +51,7 @@ sk_sp<GrDirectContext> GPUSurfaceGL::MakeGLContext(
     return nullptr;
   }
 
-  context->setResourceCacheLimits(kGrCacheMaxCount, kGrCacheMaxByteSize);
+  context->setResourceCacheLimit(kGrCacheMaxByteSize);
 
   PersistentCache::GetCacheForProcess()->PrecompileKnownSkSLs(context.get());
 

diff --git a/shell/platform/darwin/graphics/FlutterDarwinContextMetal.mm b/shell/platform/darwin/graphics/FlutterDarwinContextMetal.mm
@@ -60,7 +60,7 @@ - (instancetype)initWithMTLDevice:(id<MTLDevice>)device
       return nil;
     }
 
-    _resourceContext->setResourceCacheLimits(0u, 0u);
+    _resourceContext->setResourceCacheLimit(0u);
   }
   return self;
 }

diff --git a/shell/platform/fuchsia/flutter/vulkan_surface_producer.cc b/shell/platform/fuchsia/flutter/vulkan_surface_producer.cc
@@ -22,7 +22,6 @@ namespace flutter_runner {
 
 namespace {
 
-constexpr int kGrCacheMaxCount = 8192;
 // Tuning advice:
 // If you see the following 3 things happening simultaneously in a trace:
 //   * Over budget ("flutter", "GPURasterizer::Draw") durations
@@ -150,7 +149,7 @@ bool VulkanSurfaceProducer::Initialize(scenic::Session* scenic_session) {
   }
 
   // Use local limits specified in this file above instead of flutter defaults.
-  context_->setResourceCacheLimits(kGrCacheMaxCount, kGrCacheMaxByteSize);
+  context_->setResourceCacheLimit(kGrCacheMaxByteSize);
 
   surface_pool_ =
       std::make_unique<VulkanSurfacePool>(*this, context_, scenic_session);

diff --git a/vulkan/vulkan_application.h b/vulkan/vulkan_application.h
@@ -15,7 +15,6 @@
 
 namespace vulkan {
 
-static const int kGrCacheMaxCount = 8192;
 static const size_t kGrCacheMaxByteSize = 512 * (1 << 20);
 
 class VulkanDevice;

diff --git a/vulkan/vulkan_window.cc b/vulkan/vulkan_window.cc
@@ -123,7 +123,7 @@ bool VulkanWindow::CreateSkiaGrContext() {
     return false;
   }
 
-  context->setResourceCacheLimits(kGrCacheMaxCount, kGrCacheMaxByteSize);
+  context->setResourceCacheLimit(kGrCacheMaxByteSize);
 
   skia_gr_context_ = context;