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/gpu/effects/GrBicubicEffect.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/gpu/effects/GrBicubicEffect.cpp') diff --git a/src/gpu/effects/GrBicubicEffect.cpp b/src/gpu/effects/GrBicubicEffect.cpp index 803f2907a6..6607efc7b5 100644 --- a/src/gpu/effects/GrBicubicEffect.cpp +++ b/src/gpu/effects/GrBicubicEffect.cpp @@ -125,7 +125,7 @@ GrBicubicEffect::GrBicubicEffect(sk_sp proxy, , fTextureSampler(std::move(proxy), GrSamplerState(wrapModes, GrSamplerState::Filter::kNearest)) { this->addCoordTransform(&fCoordTransform); - this->addTextureSampler(&fTextureSampler); + this->setTextureSamplerCnt(1); } GrBicubicEffect::GrBicubicEffect(sk_sp proxy, @@ -136,7 +136,7 @@ GrBicubicEffect::GrBicubicEffect(sk_sp proxy, , fDomain(proxy.get(), domain, GrTextureDomain::kClamp_Mode) , fTextureSampler(std::move(proxy)) { this->addCoordTransform(&fCoordTransform); - this->addTextureSampler(&fTextureSampler); + this->setTextureSamplerCnt(1); } GrBicubicEffect::GrBicubicEffect(const GrBicubicEffect& that) @@ -145,7 +145,7 @@ GrBicubicEffect::GrBicubicEffect(const GrBicubicEffect& that) , fDomain(that.fDomain) , fTextureSampler(that.fTextureSampler) { this->addCoordTransform(&fCoordTransform); - this->addTextureSampler(&fTextureSampler); + this->setTextureSamplerCnt(1); } void GrBicubicEffect::onGetGLSLProcessorKey(const GrShaderCaps& caps, -- cgit v1.2.3