diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-03-15 10:42:12 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-15 15:20:40 +0000 |
| commit | 296b1ccf9b8e9c8b945645efcbaa9c71c7135f58 (patch) | |
| tree | e8085e48ed8cd2a3b66316e95215f5b06f39bf50 /src/gpu/GrTextureProducer.cpp | |
| parent | e0d4fbac00f240603e725b50d58d89048fd8b21f (diff) | |
Retract GrContext from src/gpu/effects
Change-Id: Iceb7263098286bafb2605ef17d1fe6bb25d71e97
Reviewed-on: https://skia-review.googlesource.com/9693
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/GrTextureProducer.cpp')
| -rw-r--r-- | src/gpu/GrTextureProducer.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/gpu/GrTextureProducer.cpp b/src/gpu/GrTextureProducer.cpp index bc16bb5fcf..26fb3bbda2 100644 --- a/src/gpu/GrTextureProducer.cpp +++ b/src/gpu/GrTextureProducer.cpp @@ -110,11 +110,12 @@ sk_sp<GrTextureProxy> GrTextureProducer::CopyOnGpu(GrContext* context, // better! SkASSERT(copyParams.fFilter != GrSamplerParams::kMipMap_FilterMode); paint.addColorFragmentProcessor( - GrTextureDomainEffect::Make(context, std::move(inputProxy), nullptr, SkMatrix::I(), + GrTextureDomainEffect::Make(context->resourceProvider(), std::move(inputProxy), + nullptr, SkMatrix::I(), domain, GrTextureDomain::kClamp_Mode, copyParams.fFilter)); } else { GrSamplerParams params(SkShader::kClamp_TileMode, copyParams.fFilter); - paint.addColorTextureProcessor(context, std::move(inputProxy), + paint.addColorTextureProcessor(context->resourceProvider(), std::move(inputProxy), nullptr, SkMatrix::I(), params); } paint.setPorterDuffXPFactory(SkBlendMode::kSrc); @@ -296,7 +297,7 @@ sk_sp<GrFragmentProcessor> GrTextureProducer::CreateFragmentProcessorForDomainAn } sk_sp<GrFragmentProcessor> GrTextureProducer::CreateFragmentProcessorForDomainAndFilter( - GrContext* context, + GrResourceProvider* resourceProvider, sk_sp<GrTextureProxy> proxy, sk_sp<GrColorSpaceXform> colorSpaceXform, const SkMatrix& textureMatrix, @@ -306,24 +307,26 @@ sk_sp<GrFragmentProcessor> GrTextureProducer::CreateFragmentProcessorForDomainAn SkASSERT(kTightCopy_DomainMode != domainMode); if (filterOrNullForBicubic) { if (kDomain_DomainMode == domainMode) { - return GrTextureDomainEffect::Make(context, std::move(proxy), + return GrTextureDomainEffect::Make(resourceProvider, std::move(proxy), std::move(colorSpaceXform), textureMatrix, domain, GrTextureDomain::kClamp_Mode, *filterOrNullForBicubic); } else { GrSamplerParams params(SkShader::kClamp_TileMode, *filterOrNullForBicubic); - return GrSimpleTextureEffect::Make(context, std::move(proxy), + return GrSimpleTextureEffect::Make(resourceProvider, std::move(proxy), std::move(colorSpaceXform), textureMatrix, params); } } else { if (kDomain_DomainMode == domainMode) { - return GrBicubicEffect::Make(context, std::move(proxy), std::move(colorSpaceXform), + return GrBicubicEffect::Make(resourceProvider, std::move(proxy), + std::move(colorSpaceXform), textureMatrix, domain); } else { static const SkShader::TileMode kClampClamp[] = { SkShader::kClamp_TileMode, SkShader::kClamp_TileMode }; - return GrBicubicEffect::Make(context, std::move(proxy), std::move(colorSpaceXform), + return GrBicubicEffect::Make(resourceProvider, std::move(proxy), + std::move(colorSpaceXform), textureMatrix, kClampClamp); } } |