diff options
| author |  Robert Phillips <robertphillips@google.com> | 2018-06-25 08:53:09 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-25 13:52:55 +0000 |
| commit | 6d36370c06fac5da22e6d7ea68b47ffee0d672aa (patch) | |
| tree | cc387851327f72b48535725b7a6613b221650fdd /tools/gpu | |
| parent | 93ae2337732bf206e6ef4faecc6b30c3881e8359 (diff) | |
Add bullet proofing for preAbandonContext
With the more agressive abandonment of the GrContext state in https://skia-review.googlesource.com/c/skia/+/137121 (Fix abandonment of programs) (i.e., nulling out of the interface) it is necessary to add more guards so that we don't try calling GL methods when the context has been abandoned.
Change-Id: Ib2a3c17b9eaebd1eb84eb82a2781cf9d5a6a34a3
Reviewed-on: https://skia-review.googlesource.com/137362
Reviewed-by: Joe Gregorio <jcgregorio@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'tools/gpu')
| -rw-r--r-- | tools/gpu/ProxyUtils.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/gpu/ProxyUtils.cpp b/tools/gpu/ProxyUtils.cpp index bba17de939..64af648068 100644 --- a/tools/gpu/ProxyUtils.cpp +++ b/tools/gpu/ProxyUtils.cpp @@ -18,6 +18,10 @@ sk_sp<GrTextureProxy> MakeTextureProxyFromData(GrContext* context, bool isRT, in GrColorType ct, GrSRGBEncoded srgbEncoded, GrSurfaceOrigin origin, const void* data, size_t rowBytes) { + if (context->contextPriv().abandoned()) { + return nullptr; + } + auto config = GrColorTypeToPixelConfig(ct, srgbEncoded); sk_sp<GrTextureProxy> proxy; if (kBottomLeft_GrSurfaceOrigin == origin) { |