aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/image/SkImage_Gpu.h
diff options
context:
space:
mode:
authorGravatar Robert Phillips <robertphillips@google.com>2017-06-05 09:26:07 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-06-05 14:03:10 +0000
commiteee4d6e4e8cc5c4c79f065abcc3ce609f71238f9 (patch)
tree9a855a9892a8b3017370164355b88c2a4ac9c89c /src/image/SkImage_Gpu.h
parent9beafc41afa3c78ffa12649dcde73628c277da9c (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 'src/image/SkImage_Gpu.h')
-rw-r--r--src/image/SkImage_Gpu.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/image/SkImage_Gpu.h b/src/image/SkImage_Gpu.h
index 273f93e5c5..fbe29d8650 100644
--- a/src/image/SkImage_Gpu.h
+++ b/src/image/SkImage_Gpu.h
@@ -36,7 +36,11 @@ public:
return fProxy.get();
}
GrTexture* peekTexture() const override {
- return fProxy->instantiateTexture(fContext->resourceProvider());
+ if (!fProxy->instantiate(fContext->resourceProvider())) {
+ return nullptr;
+ }
+
+ return fProxy->priv().peekTexture();
}
sk_sp<GrTextureProxy> asTextureProxyRef() const override {
return fProxy;