diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-05-17 13:49:59 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-17 18:17:50 +0000 |
| commit | bb5711a5e4b9c83f0fc49f2d4ee19ca1e4592e14 (patch) | |
| tree | e743c265e75a1dad32c1425bf3b9ed88abad2c52 /tests | |
| parent | 9f1c403362d8de6038328c7238b6ac56be552324 (diff) | |
Remove GrSurfaceDesc member from GrSurfaceProxy.
Stores the config, origin, and dimensions in GrSurfaceProxy, sample count in GrRenderTargetProxy, and "was constructed with mip maps" in GrTextureProxy.
Change-Id: Iee058674dce49107a991cca9d083cd33e3572809
Reviewed-on: https://skia-review.googlesource.com/17209
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ClipStackTest.cpp | 2 | ||||
| -rw-r--r-- | tests/ImageFilterCacheTest.cpp | 2 | ||||
| -rw-r--r-- | tests/ProxyTest.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tests/ClipStackTest.cpp b/tests/ClipStackTest.cpp index 31dffcb6c2..ba80933009 100644 --- a/tests/ClipStackTest.cpp +++ b/tests/ClipStackTest.cpp @@ -1442,7 +1442,7 @@ DEF_GPUTEST_FOR_ALL_CONTEXTS(ClipMaskCache, reporter, ctxInfo) { stack.save(); stack.clipPath(path, m, SkClipOp::kIntersect, true); sk_sp<GrTextureProxy> mask = GrClipStackClip(&stack).testingOnly_createClipMask(context); - GrTexture* tex = mask->instantiate(context->resourceProvider()); + GrTexture* tex = mask->instantiateTexture(context->resourceProvider()); REPORTER_ASSERT(reporter, 0 == strcmp(tex->getUniqueKey().tag(), kTag)); // Make sure mask isn't pinned in cache. mask.reset(nullptr); diff --git a/tests/ImageFilterCacheTest.cpp b/tests/ImageFilterCacheTest.cpp index 0dda42e3a8..a8b8f87981 100644 --- a/tests/ImageFilterCacheTest.cpp +++ b/tests/ImageFilterCacheTest.cpp @@ -206,7 +206,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ImageFilterCache_ImageBackedGPU, reporter, ct return; } - GrTexture* tex = srcProxy->instantiate(context->resourceProvider()); + GrTexture* tex = srcProxy->instantiateTexture(context->resourceProvider()); if (!tex) { return; } diff --git a/tests/ProxyTest.cpp b/tests/ProxyTest.cpp index 7b3600f800..0bd8537b6b 100644 --- a/tests/ProxyTest.cpp +++ b/tests/ProxyTest.cpp @@ -49,7 +49,7 @@ static void check_rendertarget(skiatest::Reporter* reporter, REPORTER_ASSERT(reporter, rtProxy->numStencilSamples() == numSamples); GrSurfaceProxy::UniqueID idBefore = rtProxy->uniqueID(); - GrRenderTarget* rt = rtProxy->instantiate(provider); + GrRenderTarget* rt = rtProxy->instantiateRenderTarget(provider); REPORTER_ASSERT(reporter, rt); REPORTER_ASSERT(reporter, rtProxy->uniqueID() == idBefore); @@ -83,7 +83,7 @@ static void check_texture(skiatest::Reporter* reporter, SkBackingFit fit, bool wasWrapped) { GrSurfaceProxy::UniqueID idBefore = texProxy->uniqueID(); - GrTexture* tex = texProxy->instantiate(provider); + GrTexture* tex = texProxy->instantiateTexture(provider); REPORTER_ASSERT(reporter, tex); REPORTER_ASSERT(reporter, texProxy->uniqueID() == idBefore); |