diff options
author | Brian Salomon <bsalomon@google.com> | 2017-09-07 11:41:25 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-09-07 16:02:51 +0000 |
commit | 6e4bbbefe153495cf34ea42aa72691756e6ab40e (patch) | |
tree | 477ceefbff993e8fda299ce1f32e51b938082f77 /src/gpu/GrTextureMaker.cpp | |
parent | 7c627b49ed502e3ebb543d06c4176e630c7ddfc9 (diff) |
Remove "content" rect from GrTextureAdjuster.
Since we got rid of texture-backed bitmaps this is no longer required.
Change-Id: Id15c745994a3d6a1489e193b5d29916fa0931264
Reviewed-on: https://skia-review.googlesource.com/36340
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/gpu/GrTextureMaker.cpp')
-rw-r--r-- | src/gpu/GrTextureMaker.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gpu/GrTextureMaker.cpp b/src/gpu/GrTextureMaker.cpp index 7e257d8a78..bb30439e6e 100644 --- a/src/gpu/GrTextureMaker.cpp +++ b/src/gpu/GrTextureMaker.cpp @@ -59,7 +59,7 @@ sk_sp<GrTextureProxy> GrTextureMaker::refTextureProxyForParams(const GrSamplerPa sk_sp<GrTextureProxy> result; if (original) { - result = CopyOnGpu(fContext, std::move(original), nullptr, copyParams); + result = CopyOnGpu(fContext, std::move(original), copyParams); } else { result = this->generateTextureProxyForParams(copyParams, willBeMipped, dstColorSpace); } @@ -114,9 +114,8 @@ std::unique_ptr<GrFragmentProcessor> GrTextureMaker::createFragmentProcessor( adjustedMatrix.postScale(scaleAdjust[0], scaleAdjust[1]); SkRect domain; DomainMode domainMode = - DetermineDomainMode(constraintRect, filterConstraint, coordsLimitedToConstraintRect, - proxy.get(), - nullptr, fmForDetermineDomain, &domain); + DetermineDomainMode(constraintRect, filterConstraint, coordsLimitedToConstraintRect, + proxy.get(), fmForDetermineDomain, &domain); SkASSERT(kTightCopy_DomainMode != domainMode); sk_sp<GrColorSpaceXform> colorSpaceXform = GrColorSpaceXform::Make(texColorSpace.get(), dstColorSpace); @@ -135,5 +134,5 @@ sk_sp<GrTextureProxy> GrTextureMaker::generateTextureProxyForParams(const CopyPa return nullptr; } - return CopyOnGpu(fContext, std::move(original), nullptr, copyParams); + return CopyOnGpu(fContext, std::move(original), copyParams); } |