diff options
author | Brian Salomon <bsalomon@google.com> | 2018-07-30 14:48:15 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-30 19:40:03 +0000 |
commit | f7dcd76c552a4e93a75a3808289de69a997da169 (patch) | |
tree | 29fe08e9681f29e3d3d2af8e721ecfba6dd09beb /src/gpu/effects/GrTextureDomain.cpp | |
parent | 7226c232d73356a37ec8cfef0ed55147e68dd2fd (diff) |
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 <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/gpu/effects/GrTextureDomain.cpp')
-rw-r--r-- | src/gpu/effects/GrTextureDomain.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gpu/effects/GrTextureDomain.cpp b/src/gpu/effects/GrTextureDomain.cpp index e2197023b1..ee27cc0479 100644 --- a/src/gpu/effects/GrTextureDomain.cpp +++ b/src/gpu/effects/GrTextureDomain.cpp @@ -234,7 +234,7 @@ GrTextureDomainEffect::GrTextureDomainEffect(sk_sp<GrTextureProxy> proxy, SkASSERT(mode != GrTextureDomain::kRepeat_Mode || filterMode == GrSamplerState::Filter::kNearest); this->addCoordTransform(&fCoordTransform); - this->addTextureSampler(&fTextureSampler); + this->setTextureSamplerCnt(1); } GrTextureDomainEffect::GrTextureDomainEffect(const GrTextureDomainEffect& that) @@ -243,7 +243,7 @@ GrTextureDomainEffect::GrTextureDomainEffect(const GrTextureDomainEffect& that) , fTextureDomain(that.fTextureDomain) , fTextureSampler(that.fTextureSampler) { this->addCoordTransform(&fCoordTransform); - this->addTextureSampler(&fTextureSampler); + this->setTextureSamplerCnt(1); } void GrTextureDomainEffect::onGetGLSLProcessorKey(const GrShaderCaps& caps, @@ -334,7 +334,7 @@ GrDeviceSpaceTextureDecalFragmentProcessor::GrDeviceSpaceTextureDecalFragmentPro , fTextureSampler(proxy, GrSamplerState::ClampNearest()) , fTextureDomain(proxy.get(), GrTextureDomain::MakeTexelDomain(subset), GrTextureDomain::kDecal_Mode) { - this->addTextureSampler(&fTextureSampler); + this->setTextureSamplerCnt(1); fDeviceSpaceOffset.fX = deviceSpaceOffset.fX - subset.fLeft; fDeviceSpaceOffset.fY = deviceSpaceOffset.fY - subset.fTop; } @@ -346,7 +346,7 @@ GrDeviceSpaceTextureDecalFragmentProcessor::GrDeviceSpaceTextureDecalFragmentPro , fTextureSampler(that.fTextureSampler) , fTextureDomain(that.fTextureDomain) , fDeviceSpaceOffset(that.fDeviceSpaceOffset) { - this->addTextureSampler(&fTextureSampler); + this->setTextureSamplerCnt(1); } std::unique_ptr<GrFragmentProcessor> GrDeviceSpaceTextureDecalFragmentProcessor::clone() const { |