diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/SkGpuBlurUtils.cpp | 14 | ||||
| -rw-r--r-- | src/core/SkImageFilter.cpp | 6 | ||||
| -rw-r--r-- | src/core/SkSpecialSurface.cpp | 5 |
3 files changed, 15 insertions, 10 deletions
diff --git a/src/core/SkGpuBlurUtils.cpp b/src/core/SkGpuBlurUtils.cpp index 755e8daf70..b42bb04782 100644 --- a/src/core/SkGpuBlurUtils.cpp +++ b/src/core/SkGpuBlurUtils.cpp @@ -250,8 +250,8 @@ sk_sp<GrRenderTargetContext> GaussianBlur(GrContext* context, // We shouldn't be scaling because this is a small size blur SkASSERT((1 == scaleFactorX) && (1 == scaleFactorY)); - dstRenderTargetContext = context->makeDeferredRenderTargetContext(fit, width, height, - config, colorSpace); + dstRenderTargetContext = context->contextPriv().makeDeferredRenderTargetContext( + fit, width, height, config, colorSpace); if (!dstRenderTargetContext) { return nullptr; } @@ -272,7 +272,7 @@ sk_sp<GrRenderTargetContext> GaussianBlur(GrContext* context, SkIRect dstRect(srcRect); shrink_irect_by_2(&dstRect, i < scaleFactorX, i < scaleFactorY); - dstRenderTargetContext = context->makeDeferredRenderTargetContext( + dstRenderTargetContext = context->contextPriv().makeDeferredRenderTargetContext( fit, SkTMin(dstRect.fRight, width), SkTMin(dstRect.fBottom, height), @@ -327,7 +327,8 @@ sk_sp<GrRenderTargetContext> GaussianBlur(GrContext* context, } SkASSERT(srcRect.width() <= width && srcRect.height() <= height); - dstRenderTargetContext = context->makeDeferredRenderTargetContext(fit, srcRect.width(), + dstRenderTargetContext = context->contextPriv().makeDeferredRenderTargetContext( + fit, srcRect.width(), srcRect.height(), config, colorSpace); if (!dstRenderTargetContext) { @@ -362,7 +363,8 @@ sk_sp<GrRenderTargetContext> GaussianBlur(GrContext* context, } SkASSERT(srcRect.width() <= width && srcRect.height() <= height); - dstRenderTargetContext = context->makeDeferredRenderTargetContext(fit, srcRect.width(), + dstRenderTargetContext = context->contextPriv().makeDeferredRenderTargetContext( + fit, srcRect.width(), srcRect.height(), config, colorSpace); if (!dstRenderTargetContext) { @@ -394,7 +396,7 @@ sk_sp<GrRenderTargetContext> GaussianBlur(GrContext* context, SkIRect dstRect(srcRect); scale_irect(&dstRect, scaleFactorX, scaleFactorY); - dstRenderTargetContext = context->makeDeferredRenderTargetContext( + dstRenderTargetContext = context->contextPriv().makeDeferredRenderTargetContext( fit, SkTMin(dstRect.width(), width), SkTMin(dstRect.height(), height), config, colorSpace); diff --git a/src/core/SkImageFilter.cpp b/src/core/SkImageFilter.cpp index b2220a7651..ae3b53a69e 100644 --- a/src/core/SkImageFilter.cpp +++ b/src/core/SkImageFilter.cpp @@ -302,8 +302,10 @@ sk_sp<SkSpecialImage> SkImageFilter::DrawWithFP(GrContext* context, sk_sp<SkColorSpace> colorSpace = sk_ref_sp(outputProperties.colorSpace()); GrPixelConfig config = GrRenderableConfigForColorSpace(colorSpace.get()); - sk_sp<GrRenderTargetContext> renderTargetContext(context->makeDeferredRenderTargetContext( - SkBackingFit::kApprox, bounds.width(), bounds.height(), config, std::move(colorSpace))); + sk_sp<GrRenderTargetContext> renderTargetContext( + context->contextPriv().makeDeferredRenderTargetContext( + SkBackingFit::kApprox, bounds.width(), bounds.height(), + config, std::move(colorSpace))); if (!renderTargetContext) { return nullptr; } diff --git a/src/core/SkSpecialSurface.cpp b/src/core/SkSpecialSurface.cpp index ef78a3e0ad..19a149fe45 100644 --- a/src/core/SkSpecialSurface.cpp +++ b/src/core/SkSpecialSurface.cpp @@ -171,8 +171,9 @@ sk_sp<SkSpecialSurface> SkSpecialSurface::MakeRenderTarget(GrContext* context, return nullptr; } - sk_sp<GrRenderTargetContext> renderTargetContext(context->makeDeferredRenderTargetContext( - SkBackingFit::kApprox, width, height, config, std::move(colorSpace))); + sk_sp<GrRenderTargetContext> renderTargetContext( + context->contextPriv().makeDeferredRenderTargetContext( + SkBackingFit::kApprox, width, height, config, std::move(colorSpace))); if (!renderTargetContext) { return nullptr; } |