From 6d36370c06fac5da22e6d7ea68b47ffee0d672aa Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Mon, 25 Jun 2018 08:53:09 -0400 Subject: 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 Reviewed-by: Greg Daniel Commit-Queue: Robert Phillips --- tools/gpu/ProxyUtils.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tools/gpu') 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 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 proxy; if (kBottomLeft_GrSurfaceOrigin == origin) { -- cgit v1.2.3