commit 57b0430e19f3c8c2ebda4d8b705bc339af00e0fb
author Brian Salomon <bsalomon@google.com> Tue Jan 30 15:43:49 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jan 30 21:08:50 2018 +0000
tree ca8688d829b33e7d3d3bb9c8c1d609d829ccede8
parent f650ad99780ad04ac59dff93009a25ba50548f7e

Fix mock tex rt gpu mem size

Change-Id: Ieeab32d3eb8fdbb16c004537f2d50956d6ec74d3
Reviewed-on: https://skia-review.googlesource.com/102022
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/gpu/mock/GrMockTexture.h

diff --git a/src/gpu/mock/GrMockTexture.h b/src/gpu/mock/GrMockTexture.h
index 0be1da1..9b6501a 100644
--- a/src/gpu/mock/GrMockTexture.h
+++ b/src/gpu/mock/GrMockTexture.h
@@ -90,8 +90,10 @@
     }
 
     size_t onGpuMemorySize() const override {
+        // The plus 1 is to account for the resolve texture.
+        int numColorSamples = this->numColorSamples() + 1;
         return GrSurface::ComputeSize(this->config(), this->width(), this->height(),
-                                      this->numStencilSamples(),
+                                      numColorSamples,
                                       this->texturePriv().mipMapped());
     }
 

tests/PathRendererCacheTests.cpp

diff --git a/tests/PathRendererCacheTests.cpp b/tests/PathRendererCacheTests.cpp
index cc64582..15b1faa 100644
--- a/tests/PathRendererCacheTests.cpp
+++ b/tests/PathRendererCacheTests.cpp
@@ -76,7 +76,7 @@
                       GrStyle style = GrStyle(SkStrokeRec::kFill_InitStyle)) {
     sk_sp<GrContext> ctx = GrContext::MakeMock(nullptr);
     // The cache needs to be big enough that nothing gets flushed, or our expectations can be wrong
-    ctx->setResourceCacheLimits(100, 1000000);
+    ctx->setResourceCacheLimits(100, 8000000);
     GrResourceCache* cache = ctx->contextPriv().getResourceCache();
 
     sk_sp<GrRenderTargetContext> rtc(ctx->makeDeferredRenderTargetContext(