From f7dcd76c552a4e93a75a3808289de69a997da169 Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Mon, 30 Jul 2018 14:48:15 -0400 Subject: Remove array of TextureSampler pointers from GrIOResourceProcessor. Instead store sampler count on base class and subclasses implement a virtual to get the ith sampler. Change-Id: I13e2447a6467a09761d8615acb4aa360b87b1476 Reviewed-on: https://skia-review.googlesource.com/141563 Commit-Queue: Brian Salomon Reviewed-by: Robert Phillips --- src/effects/imagefilters/SkDisplacementMapEffect.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/effects/imagefilters/SkDisplacementMapEffect.cpp') diff --git a/src/effects/imagefilters/SkDisplacementMapEffect.cpp b/src/effects/imagefilters/SkDisplacementMapEffect.cpp index 026c03ea07..2ab8c5e051 100644 --- a/src/effects/imagefilters/SkDisplacementMapEffect.cpp +++ b/src/effects/imagefilters/SkDisplacementMapEffect.cpp @@ -208,6 +208,10 @@ private: sk_sp displacement, const SkMatrix& offsetMatrix, sk_sp color, const SkISize& colorDimensions); + const TextureSampler& onTextureSampler(int i) const override { + return IthTextureSampler(i, fDisplacementSampler, fColorSampler); + } + GR_DECLARE_FRAGMENT_PROCESSOR_TEST GrCoordTransform fDisplacementTransform; @@ -461,9 +465,8 @@ GrDisplacementMapEffect::GrDisplacementMapEffect( , fYChannelSelector(yChannelSelector) , fScale(scale) { this->addCoordTransform(&fDisplacementTransform); - this->addTextureSampler(&fDisplacementSampler); this->addCoordTransform(&fColorTransform); - this->addTextureSampler(&fColorSampler); + this->setTextureSamplerCnt(2); } GrDisplacementMapEffect::GrDisplacementMapEffect(const GrDisplacementMapEffect& that) @@ -478,9 +481,8 @@ GrDisplacementMapEffect::GrDisplacementMapEffect(const GrDisplacementMapEffect& , fYChannelSelector(that.fYChannelSelector) , fScale(that.fScale) { this->addCoordTransform(&fDisplacementTransform); - this->addTextureSampler(&fDisplacementSampler); this->addCoordTransform(&fColorTransform); - this->addTextureSampler(&fColorSampler); + this->setTextureSamplerCnt(2); } GrDisplacementMapEffect::~GrDisplacementMapEffect() {} -- cgit v1.2.3