diff options
| author |  Robert Phillips <robertphillips@google.com> | 2018-01-08 14:53:35 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-01-08 20:23:31 +0000 |
| commit | 579f094f1259931c30dfd1623e8e22d74b4a7531 (patch) | |
| tree | 03995e86a274aea4bad096ec7bbfe247a465a707 /src/gpu/effects/GrRRectBlurEffect.fp | |
| parent | 1afd4cdb0800e2e395b465da24eb71e0e834dafa (diff) | |
Fix build
This fixes two issues with https://skia-review.googlesource.com/c/skia/+/91501:
1) The .fp files weren't updated to handle the move of proxyProvider to GrContextPriv
2) There were some missing guards for abandoned context's in the proxyprovider
Change-Id: I2a704ff2aec5f8f9a7ebaab9b8632abb5cf2e42c
Reviewed-on: https://skia-review.googlesource.com/92084
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/gpu/effects/GrRRectBlurEffect.fp')
| -rw-r--r-- | src/gpu/effects/GrRRectBlurEffect.fp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gpu/effects/GrRRectBlurEffect.fp b/src/gpu/effects/GrRRectBlurEffect.fp index c21c4f07c7..3724331ccd 100644 --- a/src/gpu/effects/GrRRectBlurEffect.fp +++ b/src/gpu/effects/GrRRectBlurEffect.fp @@ -8,6 +8,7 @@ uniform half blurRadius; @header { #include "GrClip.h" #include "GrContext.h" + #include "GrContextPriv.h" #include "GrPaint.h" #include "GrProxyProvider.h" #include "GrRenderTargetContext.h" @@ -36,7 +37,9 @@ uniform half blurRadius; } builder.finish(); - sk_sp<GrTextureProxy> mask(context->proxyProvider()->findOrCreateProxyByUniqueKey( + GrProxyProvider* proxyProvider = context->contextPriv().proxyProvider(); + + sk_sp<GrTextureProxy> mask(proxyProvider->findOrCreateProxyByUniqueKey( key, kBottomLeft_GrSurfaceOrigin)); if (!mask) { // TODO: this could be approx but the texture coords will need to be updated @@ -75,7 +78,7 @@ uniform half blurRadius; return nullptr; } SkASSERT(mask->origin() == kBottomLeft_GrSurfaceOrigin); - context->proxyProvider()->assignUniqueKeyToProxy(key, mask.get()); + proxyProvider->assignUniqueKeyToProxy(key, mask.get()); } return mask; |