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/core/SkGpuBlurUtils.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/core/SkGpuBlurUtils.cpp')
| -rw-r--r-- | src/core/SkGpuBlurUtils.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/core/SkGpuBlurUtils.cpp b/src/core/SkGpuBlurUtils.cpp index b328eea75a..39857134bf 100644 --- a/src/core/SkGpuBlurUtils.cpp +++ b/src/core/SkGpuBlurUtils.cpp @@ -256,7 +256,7 @@ sk_sp<GrRenderTargetContext> GaussianBlur(GrContext* context, SkASSERT(SkIsPow2(scaleFactorX) && SkIsPow2(scaleFactorY)); - // GrTextureDomainEffect does not support kRepeat_Mode with GrSamplerParams::FilterMode. + // GrTextureDomainEffect does not support kRepeat_Mode with GrSamplerState::Filter. GrTextureDomain::Mode modeForScaling = GrTextureDomain::kRepeat_Mode == mode ? GrTextureDomain::kDecal_Mode : mode; for (int i = 1; i < scaleFactorX || i < scaleFactorY; i *= 2) { @@ -284,14 +284,13 @@ sk_sp<GrRenderTargetContext> GaussianBlur(GrContext* context, SkMatrix::I(), domain, modeForScaling, - GrSamplerParams::kBilerp_FilterMode); + GrSamplerState::Filter::kBilerp); paint.addColorFragmentProcessor(std::move(fp)); srcRect.offset(-srcOffset); srcOffset.set(0, 0); } else { - GrSamplerParams params(SkShader::kClamp_TileMode, GrSamplerParams::kBilerp_FilterMode); - paint.addColorTextureProcessor(std::move(srcProxy), - nullptr, SkMatrix::I(), params); + paint.addColorTextureProcessor(std::move(srcProxy), nullptr, SkMatrix::I(), + GrSamplerState::ClampBilerp()); } paint.setPorterDuffXPFactory(SkBlendMode::kSrc); @@ -405,12 +404,12 @@ sk_sp<GrRenderTargetContext> GaussianBlur(GrContext* context, SkMatrix::I(), domain, modeForScaling, - GrSamplerParams::kBilerp_FilterMode); + GrSamplerState::Filter::kBilerp); paint.addColorFragmentProcessor(std::move(fp)); } else { // FIXME: this should be mitchell, not bilinear. - GrSamplerParams params(SkShader::kClamp_TileMode, GrSamplerParams::kBilerp_FilterMode); - paint.addColorTextureProcessor(std::move(srcProxy), nullptr, SkMatrix::I(), params); + paint.addColorTextureProcessor(std::move(srcProxy), nullptr, SkMatrix::I(), + GrSamplerState::ClampBilerp()); } paint.setPorterDuffXPFactory(SkBlendMode::kSrc); |