diff options
Diffstat (limited to 'src/gpu/ops')
-rw-r--r-- | src/gpu/ops/GrLatticeOp.cpp | 4 | ||||
-rw-r--r-- | src/gpu/ops/GrTextureOp.cpp | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/gpu/ops/GrLatticeOp.cpp b/src/gpu/ops/GrLatticeOp.cpp index 07821c016e..00dbef537f 100644 --- a/src/gpu/ops/GrLatticeOp.cpp +++ b/src/gpu/ops/GrLatticeOp.cpp @@ -96,7 +96,7 @@ private: GrSamplerState::Filter filter) : INHERITED(kLatticeGP_ClassID), fColorSpaceXform(std::move(csxf)) { fSampler.reset(std::move(proxy), filter); - this->addTextureSampler(&fSampler); + this->setTextureSamplerCnt(1); this->setVertexAttributeCnt(4); } @@ -104,6 +104,8 @@ private: return IthAttribute(i, kPositions, kTextureCoords, kTextureDomain, kColors); } + const TextureSampler& onTextureSampler(int) const override { return fSampler; } + static constexpr Attribute kPositions = {"position", kFloat2_GrVertexAttribType}; static constexpr Attribute kTextureCoords = {"textureCoords", kFloat2_GrVertexAttribType}; static constexpr Attribute kTextureDomain = {"textureDomain", kFloat4_GrVertexAttribType}; diff --git a/src/gpu/ops/GrTextureOp.cpp b/src/gpu/ops/GrTextureOp.cpp index 516cee628f..9b2baeb42b 100644 --- a/src/gpu/ops/GrTextureOp.cpp +++ b/src/gpu/ops/GrTextureOp.cpp @@ -296,12 +296,10 @@ private: , fPaintColorSpaceXform(std::move(paintColorSpaceXform)) { SkASSERT(proxyCnt > 0 && samplerCnt >= proxyCnt); fSamplers[0].reset(std::move(proxies[0]), filters[0]); - this->addTextureSampler(&fSamplers[0]); for (int i = 1; i < proxyCnt; ++i) { // This class has one sampler built in, the rest come from memory this processor was // placement-newed into and so haven't been constructed. new (&fSamplers[i]) TextureSampler(std::move(proxies[i]), filters[i]); - this->addTextureSampler(&fSamplers[i]); } if (perspective) { @@ -319,7 +317,6 @@ private: GrTextureProxy* dupeProxy = fSamplers[proxyCnt - 1].proxy(); for (int i = proxyCnt; i < samplerCnt; ++i) { new (&fSamplers[i]) TextureSampler(sk_ref_sp(dupeProxy), filters[proxyCnt - 1]); - this->addTextureSampler(&fSamplers[i]); } SkASSERT(caps.integerSupport()); fTextureIdx = {"textureIdx", kInt_GrVertexAttribType}; @@ -337,6 +334,7 @@ private: vertexAttributeCnt += 4; } this->setVertexAttributeCnt(vertexAttributeCnt); + this->setTextureSamplerCnt(samplerCnt); } const Attribute& onVertexAttribute(int i) const override { @@ -344,6 +342,8 @@ private: fAAEdges[0], fAAEdges[1], fAAEdges[2], fAAEdges[3]); } + const TextureSampler& onTextureSampler(int i) const override { return fSamplers[i]; } + Attribute fPositions; Attribute fColors; Attribute fTextureCoords; |