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/gpu/effects/GrSimpleTextureEffect.h | |
| 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/gpu/effects/GrSimpleTextureEffect.h')
| -rw-r--r-- | src/gpu/effects/GrSimpleTextureEffect.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/gpu/effects/GrSimpleTextureEffect.h b/src/gpu/effects/GrSimpleTextureEffect.h index 11564bb6e2..8d3fba12bb 100644 --- a/src/gpu/effects/GrSimpleTextureEffect.h +++ b/src/gpu/effects/GrSimpleTextureEffect.h @@ -24,26 +24,27 @@ public: sk_sp<GrColorSpaceXform> colorSpaceXform, const SkMatrix& matrix) { - return std::unique_ptr<GrFragmentProcessor>(new GrSimpleTextureEffect( - std::move(proxy), std::move(colorSpaceXform), matrix, - GrSamplerParams(SkShader::kClamp_TileMode, GrSamplerParams::kNone_FilterMode))); + return std::unique_ptr<GrFragmentProcessor>( + new GrSimpleTextureEffect(std::move(proxy), std::move(colorSpaceXform), matrix, + GrSamplerState(GrSamplerState::WrapMode::kClamp, + GrSamplerState::Filter::kNearest))); } static std::unique_ptr<GrFragmentProcessor> Make(sk_sp<GrTextureProxy> proxy, sk_sp<GrColorSpaceXform> colorSpaceXform, const SkMatrix& matrix, - GrSamplerParams::FilterMode filterMode) { - return std::unique_ptr<GrFragmentProcessor>( - new GrSimpleTextureEffect(std::move(proxy), std::move(colorSpaceXform), matrix, - GrSamplerParams(SkShader::kClamp_TileMode, filterMode))); + GrSamplerState::Filter filter) { + return std::unique_ptr<GrFragmentProcessor>(new GrSimpleTextureEffect( + std::move(proxy), std::move(colorSpaceXform), matrix, + GrSamplerState(GrSamplerState::WrapMode::kClamp, filter))); } static std::unique_ptr<GrFragmentProcessor> Make(sk_sp<GrTextureProxy> proxy, sk_sp<GrColorSpaceXform> colorSpaceXform, const SkMatrix& matrix, - const GrSamplerParams& p) { + const GrSamplerState& p) { return std::unique_ptr<GrFragmentProcessor>( new GrSimpleTextureEffect(std::move(proxy), std::move(colorSpaceXform), matrix, p)); } @@ -53,7 +54,7 @@ public: private: GrSimpleTextureEffect(sk_sp<GrTextureProxy> image, sk_sp<GrColorSpaceXform> colorXform, - SkMatrix44 matrix, GrSamplerParams samplerParams) + SkMatrix44 matrix, GrSamplerState samplerParams) : INHERITED((OptimizationFlags)kCompatibleWithCoverageAsAlpha_OptimizationFlag | (GrPixelConfigIsOpaque(image->config()) ? kPreservesOpaqueInput_OptimizationFlag |