diff options
| author |  Robert Phillips <robertphillips@google.com> | 2018-03-06 09:59:39 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-06 16:15:56 +0000 |
| commit | 8bac928009b8689f082e48ad5bc62f65297b894b (patch) | |
| tree | 216d5198933d78d0a2563236f74486194c758544 | |
| parent | ba8feb56c301563186852023eb531bb2076eaf9a (diff) | |
Fix .fp files
This fixes the failures in https://skia-review.googlesource.com/c/skia/+/112262 (Move internal calls from GrContext to GrContextPriv)
TBR=egdaniel@google.com
Change-Id: I4b7223f6795a50d8c3848992af6d52812b282db9
Reviewed-on: https://skia-review.googlesource.com/112480
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
| -rw-r--r-- | src/gpu/effects/GrConfigConversionEffect.fp | 16 | ||||
| -rw-r--r-- | src/gpu/effects/GrRRectBlurEffect.fp | 6 | ||||
| -rw-r--r-- | src/gpu/effects/GrRRectBlurEffect.h | 6 |
3 files changed, 15 insertions, 13 deletions
diff --git a/src/gpu/effects/GrConfigConversionEffect.fp b/src/gpu/effects/GrConfigConversionEffect.fp index 63dc358a8e..d5e9eae827 100644 --- a/src/gpu/effects/GrConfigConversionEffect.fp +++ b/src/gpu/effects/GrConfigConversionEffect.fp @@ -38,14 +38,14 @@ const SkImageInfo ii = SkImageInfo::Make(kSize, kSize, kRGBA_8888_SkColorType, kPremul_SkAlphaType); - sk_sp<GrRenderTargetContext> readRTC(context->makeDeferredRenderTargetContext( - SkBackingFit::kExact, - kSize, kSize, - kConfig, nullptr)); - sk_sp<GrRenderTargetContext> tempRTC(context->makeDeferredRenderTargetContext( - SkBackingFit::kExact, - kSize, kSize, - kConfig, nullptr)); + sk_sp<GrRenderTargetContext> readRTC( + context->contextPriv().makeDeferredRenderTargetContext(SkBackingFit::kExact, + kSize, kSize, + kConfig, nullptr)); + sk_sp<GrRenderTargetContext> tempRTC( + context->contextPriv().makeDeferredRenderTargetContext(SkBackingFit::kExact, + kSize, kSize, + kConfig, nullptr)); if (!readRTC || !readRTC->asTextureProxy() || !tempRTC) { return false; } diff --git a/src/gpu/effects/GrRRectBlurEffect.fp b/src/gpu/effects/GrRRectBlurEffect.fp index c9e70bbba8..73f8491691 100644 --- a/src/gpu/effects/GrRRectBlurEffect.fp +++ b/src/gpu/effects/GrRRectBlurEffect.fp @@ -52,8 +52,10 @@ uniform half blurRadius; key, kBottomLeft_GrSurfaceOrigin)); if (!mask) { // TODO: this could be approx but the texture coords will need to be updated - sk_sp<GrRenderTargetContext> rtc(context->makeDeferredRenderTargetContextWithFallback( - SkBackingFit::kExact, size.fWidth, size.fHeight, kAlpha_8_GrPixelConfig, nullptr)); + sk_sp<GrRenderTargetContext> rtc( + context->contextPriv().makeDeferredRenderTargetContextWithFallback( + SkBackingFit::kExact, size.fWidth, size.fHeight, + kAlpha_8_GrPixelConfig, nullptr)); if (!rtc) { return nullptr; } diff --git a/src/gpu/effects/GrRRectBlurEffect.h b/src/gpu/effects/GrRRectBlurEffect.h index 4aa0ac19db..1d382a0dfa 100644 --- a/src/gpu/effects/GrRRectBlurEffect.h +++ b/src/gpu/effects/GrRRectBlurEffect.h @@ -54,9 +54,9 @@ public: if (!mask) { // TODO: this could be approx but the texture coords will need to be updated sk_sp<GrRenderTargetContext> rtc( - context->contextPriv().makeDeferredRenderTargetContextWithFallback( - SkBackingFit::kExact, size.fWidth, size.fHeight, kAlpha_8_GrPixelConfig, - nullptr)); + context->contextPriv().makeDeferredRenderTargetContextWithFallback( + SkBackingFit::kExact, size.fWidth, size.fHeight, kAlpha_8_GrPixelConfig, + nullptr)); if (!rtc) { return nullptr; } |