diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-06-05 09:26:07 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-05 14:03:10 +0000 |
| commit | eee4d6e4e8cc5c4c79f065abcc3ce609f71238f9 (patch) | |
| tree | 9a855a9892a8b3017370164355b88c2a4ac9c89c /tests/ClipStackTest.cpp | |
| parent | 9beafc41afa3c78ffa12649dcde73628c277da9c (diff) | |
Make instantiate return a Boolean
From an off-line conversation:
The longer term idea will be to create a helper class isolates the
ability to instantiate proxies until flush time. The peek* methods
could then be moved to GrSurfaceProxy.
Change-Id: I8e8c02c098475b77d515791c0d6b81f7e4a327dd
Reviewed-on: https://skia-review.googlesource.com/18076
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'tests/ClipStackTest.cpp')
| -rw-r--r-- | tests/ClipStackTest.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/ClipStackTest.cpp b/tests/ClipStackTest.cpp index ba80933009..e0df2ca902 100644 --- a/tests/ClipStackTest.cpp +++ b/tests/ClipStackTest.cpp @@ -16,6 +16,7 @@ #include "GrClipStackClip.h" #include "GrReducedClip.h" #include "GrResourceCache.h" +#include "GrSurfaceProxyPriv.h" #include "GrTextureProxy.h" typedef GrReducedClip::ElementList ElementList; typedef GrReducedClip::InitialState InitialState; @@ -1442,7 +1443,8 @@ 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->instantiateTexture(context->resourceProvider()); + mask->instantiate(context->resourceProvider()); + GrTexture* tex = mask->priv().peekTexture(); REPORTER_ASSERT(reporter, 0 == strcmp(tex->getUniqueKey().tag(), kTag)); // Make sure mask isn't pinned in cache. mask.reset(nullptr); |