diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-02-28 16:20:03 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-28 22:07:05 +0000 |
| commit | 32f2818c9d10090efeea62ccc211d48a33322dfb (patch) | |
| tree | fd301bc81387a3c3e0cc767cba43ba214a314f86 /src/effects/SkDisplacementMapEffect.cpp | |
| parent | dac5f6bcbec7130a209a6899444feb022719498d (diff) | |
Clean up/remove unused GrFragmentProcessor-derived ctors
This is the simple (i.e., non-TextureAdjuster) portion of: https://skia-review.googlesource.com/c/8823/ (Remove GrFragmentProcessor-derived class' GrTexture-based ctors)
Change-Id: I8f673ebe922e03c69473c18c166bcf818507c662
Reviewed-on: https://skia-review.googlesource.com/8997
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/effects/SkDisplacementMapEffect.cpp')
| -rw-r--r-- | src/effects/SkDisplacementMapEffect.cpp | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp index 2e08180b3d..3c0a2d582a 100644 --- a/src/effects/SkDisplacementMapEffect.cpp +++ b/src/effects/SkDisplacementMapEffect.cpp @@ -214,17 +214,6 @@ void SkDisplacementMapEffect::flatten(SkWriteBuffer& buffer) const { #if SK_SUPPORT_GPU class GrDisplacementMapEffect : public GrFragmentProcessor { public: - static sk_sp<GrFragmentProcessor> Make( - SkDisplacementMapEffect::ChannelSelectorType xChannelSelector, - SkDisplacementMapEffect::ChannelSelectorType yChannelSelector, SkVector scale, - GrTexture* displacement, const SkMatrix& offsetMatrix, GrTexture* color, - sk_sp<GrColorSpaceXform> colorSpaceXform, const SkISize& colorDimensions) { - return sk_sp<GrFragmentProcessor>( - new GrDisplacementMapEffect(xChannelSelector, yChannelSelector, scale, displacement, - offsetMatrix, color, std::move(colorSpaceXform), - colorDimensions)); - } - static sk_sp<GrFragmentProcessor> Make(GrContext* context, SkDisplacementMapEffect::ChannelSelectorType xChannelSelector, SkDisplacementMapEffect::ChannelSelectorType yChannelSelector, SkVector scale, @@ -259,13 +248,6 @@ private: bool onIsEqual(const GrFragmentProcessor&) const override; - GrDisplacementMapEffect(SkDisplacementMapEffect::ChannelSelectorType xChannelSelector, - SkDisplacementMapEffect::ChannelSelectorType yChannelSelector, - const SkVector& scale, - GrTexture* displacement, const SkMatrix& offsetMatrix, - GrTexture* color, sk_sp<GrColorSpaceXform> colorSpaceXform, - const SkISize& colorDimensions); - GrDisplacementMapEffect(GrContext*, SkDisplacementMapEffect::ChannelSelectorType xChannelSelector, SkDisplacementMapEffect::ChannelSelectorType yChannelSelector, @@ -503,34 +485,6 @@ void GrDisplacementMapEffect::onGetGLSLProcessorKey(const GrShaderCaps& caps, } GrDisplacementMapEffect::GrDisplacementMapEffect( - SkDisplacementMapEffect::ChannelSelectorType xChannelSelector, - SkDisplacementMapEffect::ChannelSelectorType yChannelSelector, - const SkVector& scale, - GrTexture* displacement, - const SkMatrix& offsetMatrix, - GrTexture* color, - sk_sp<GrColorSpaceXform> colorSpaceXform, - const SkISize& colorDimensions) - : INHERITED(GrPixelConfigIsOpaque(color->config()) ? kPreservesOpaqueInput_OptimizationFlag - : kNone_OptimizationFlags) - , fDisplacementTransform(offsetMatrix, displacement, GrSamplerParams::kNone_FilterMode) - , fDisplacementSampler(displacement) - , fColorTransform(color, GrSamplerParams::kNone_FilterMode) - , fDomain(color, GrTextureDomain::MakeTexelDomain(SkIRect::MakeSize(colorDimensions)), - GrTextureDomain::kDecal_Mode) - , fColorSampler(color) - , fColorSpaceXform(std::move(colorSpaceXform)) - , fXChannelSelector(xChannelSelector) - , fYChannelSelector(yChannelSelector) - , fScale(scale) { - this->initClassID<GrDisplacementMapEffect>(); - this->addCoordTransform(&fDisplacementTransform); - this->addTextureSampler(&fDisplacementSampler); - this->addCoordTransform(&fColorTransform); - this->addTextureSampler(&fColorSampler); -} - -GrDisplacementMapEffect::GrDisplacementMapEffect( GrContext* context, SkDisplacementMapEffect::ChannelSelectorType xChannelSelector, SkDisplacementMapEffect::ChannelSelectorType yChannelSelector, |