commit 3c4d533d8ebd88c5167b3d105513dc3fa52e7507
author Herb Derby <herb@google.com> Fri Sep 07 15:27:57 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Sep 10 21:57:16 2018 +0000
tree 4a2c4b4fede18a86632856866d2cfa9788501812
parent 7891994e89a35273524c8aa672ec68a0aa0a6901

Simplify plots to always be 512x512 and simplify GrDrawOpAtlasConfig

With less stressful tests.

Change-Id: I600cb728f6efca5aab87a16e71039a0ed00c47e1
Reviewed-on: https://skia-review.googlesource.com/153220
Reviewed-by: Cary Clark <caryclark@google.com>
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Herb Derby <herb@google.com>

tests/TextBlobCacheTest.cpp

diff --git a/tests/TextBlobCacheTest.cpp b/tests/TextBlobCacheTest.cpp
index 4e8a704..3d083df 100644
--- a/tests/TextBlobCacheTest.cpp
+++ b/tests/TextBlobCacheTest.cpp
@@ -44,26 +44,7 @@
 static const int kHeight = 768;
 
 static void setup_always_evict_atlas(GrContext* context) {
-    int dim = SkGlyphCacheCommon::kSkSideTooBigForAtlas;
-    // These sizes were selected because they allow each atlas to hold a single plot and will thus
-    // stress the atlas
-    GrDrawOpAtlasConfig configs[3];
-    configs[kA8_GrMaskFormat].fWidth = dim;
-    configs[kA8_GrMaskFormat].fHeight = dim;
-    configs[kA8_GrMaskFormat].fPlotWidth = dim;
-    configs[kA8_GrMaskFormat].fPlotHeight = dim;
-
-    configs[kA565_GrMaskFormat].fWidth = dim;
-    configs[kA565_GrMaskFormat].fHeight = dim;
-    configs[kA565_GrMaskFormat].fPlotWidth = dim;
-    configs[kA565_GrMaskFormat].fPlotHeight = dim;
-
-    configs[kARGB_GrMaskFormat].fWidth = dim;
-    configs[kARGB_GrMaskFormat].fHeight = dim;
-    configs[kARGB_GrMaskFormat].fPlotWidth = dim;
-    configs[kARGB_GrMaskFormat].fPlotHeight = dim;
-
-    context->contextPriv().setTextContextAtlasSizes_ForTesting(configs);
+    context->contextPriv().getAtlasManager()->setAtlasSizesToMinimum_ForTesting();
 }
 
 // This test hammers the GPU textblobcache and font atlas
@@ -175,7 +156,7 @@
 }
 
 DEF_GPUTEST_FOR_NULLGL_CONTEXT(TextBlobStressCache, reporter, ctxInfo) {
-    text_blob_cache_inner(reporter, ctxInfo.grContext(), 256, 256, 10, true, true);
+    text_blob_cache_inner(reporter, ctxInfo.grContext(), 512, 256, 10, true, true);
 }
 
 DEF_GPUTEST_FOR_NULLGL_CONTEXT(TextBlobAbnormal, reporter, ctxInfo) {
@@ -183,5 +164,5 @@
 }
 
 DEF_GPUTEST_FOR_NULLGL_CONTEXT(TextBlobStressAbnormal, reporter, ctxInfo) {
-    text_blob_cache_inner(reporter, ctxInfo.grContext(), 256, 256, 10, false, true);
+    text_blob_cache_inner(reporter, ctxInfo.grContext(), 1024, 256, 10, false, true);
 }