diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-09-07 12:36:34 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-09-07 16:58:31 +0000 |
| commit | 2bbdcc44c63974f29f3743bb58d929601a3f65c6 (patch) | |
| tree | d420f298f606b061054e56866d1930ab84f00ed5 /src/effects/SkArithmeticImageFilter.cpp | |
| parent | 4df0092eac6e9bb5afc516773a0c618630193dc6 (diff) | |
Rework GrSamplerParams to be more compact and use its own wrap mode enum.
The main change is to make GrSamplerParams smaller by making its enums have byte-sized underlying types. The rest is cosmetic.
Change-Id: Ib71ea50612d24619a85e463826c6b8dfb9b445e3
Reviewed-on: https://skia-review.googlesource.com/43200
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'src/effects/SkArithmeticImageFilter.cpp')
| -rw-r--r-- | src/effects/SkArithmeticImageFilter.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/effects/SkArithmeticImageFilter.cpp b/src/effects/SkArithmeticImageFilter.cpp index 34df27546c..dde38b78d5 100644 --- a/src/effects/SkArithmeticImageFilter.cpp +++ b/src/effects/SkArithmeticImageFilter.cpp @@ -359,9 +359,9 @@ sk_sp<SkSpecialImage> ArithmeticImageFilterImpl::filterImageGPU( sk_sp<GrColorSpaceXform> bgXform = GrColorSpaceXform::Make(background->getColorSpace(), outputProperties.colorSpace()); bgFP = GrTextureDomainEffect::Make( - std::move(backgroundProxy), std::move(bgXform), - backgroundMatrix, GrTextureDomain::MakeTexelDomain(background->subset()), - GrTextureDomain::kDecal_Mode, GrSamplerParams::kNone_FilterMode); + std::move(backgroundProxy), std::move(bgXform), backgroundMatrix, + GrTextureDomain::MakeTexelDomain(background->subset()), + GrTextureDomain::kDecal_Mode, GrSamplerState::Filter::kNearest); } else { bgFP = GrConstColorProcessor::Make(GrColor4f::TransparentBlack(), GrConstColorProcessor::kIgnore_InputMode); @@ -375,7 +375,7 @@ sk_sp<SkSpecialImage> ArithmeticImageFilterImpl::filterImageGPU( auto foregroundFP = GrTextureDomainEffect::Make( std::move(foregroundProxy), std::move(fgXform), foregroundMatrix, GrTextureDomain::MakeTexelDomain(foreground->subset()), - GrTextureDomain::kDecal_Mode, GrSamplerParams::kNone_FilterMode); + GrTextureDomain::kDecal_Mode, GrSamplerState::Filter::kNearest); paint.addColorFragmentProcessor(std::move(foregroundFP)); std::unique_ptr<GrFragmentProcessor> xferFP = |