diff options
Diffstat (limited to 'src/gpu/ops')
-rw-r--r-- | src/gpu/ops/GrDrawPathOp.cpp | 5 | ||||
-rw-r--r-- | src/gpu/ops/GrDrawPathOp.h | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/gpu/ops/GrDrawPathOp.cpp b/src/gpu/ops/GrDrawPathOp.cpp index a32d7080e0..c2b4fdb4bc 100644 --- a/src/gpu/ops/GrDrawPathOp.cpp +++ b/src/gpu/ops/GrDrawPathOp.cpp @@ -99,11 +99,10 @@ bool GrDrawPathRangeOp::onCombineIfPossible(GrOp* t, const GrCaps& caps) { // numbers, and we only partially account for this by not allowing even/odd paths to be // combined. (Glyphs in the same font tend to wind the same direction so it works out OK.) if (GrPathRendering::kWinding_FillType != this->fillType() || - GrPathRendering::kWinding_FillType != that->fillType() || - this->blendsWithDst()) { + GrPathRendering::kWinding_FillType != that->fillType() || this->xpReadsDst()) { return false; } - SkASSERT(!that->blendsWithDst()); + SkASSERT(!that->xpReadsDst()); fTotalPathCount += that->fTotalPathCount; while (Draw* head = that->fDraws.head()) { Draw* draw = fDraws.addToTail(); diff --git a/src/gpu/ops/GrDrawPathOp.h b/src/gpu/ops/GrDrawPathOp.h index a18a351162..e82ff22845 100644 --- a/src/gpu/ops/GrDrawPathOp.h +++ b/src/gpu/ops/GrDrawPathOp.h @@ -33,7 +33,7 @@ protected: const SkMatrix& viewMatrix() const { return fViewMatrix; } GrColor color() const { return fColor; } GrPathRendering::FillType fillType() const { return fFillType; } - bool blendsWithDst() const { return fBlendsWithDst; } + bool xpReadsDst() const { return fXPReadsDst; } private: void getPipelineAnalysisInput(GrPipelineAnalysisDrawOpInput* input) const override { @@ -43,7 +43,7 @@ private: void applyPipelineOptimizations(const GrPipelineOptimizations& optimizations) override { optimizations.getOverrideColorIfSet(&fColor); - fBlendsWithDst = optimizations.willColorBlendWithDst(); + fXPReadsDst = optimizations.xpReadsDst(); } void onPrepare(GrOpFlushState*) override; // Initializes fStencilPassSettings. @@ -52,7 +52,7 @@ private: GrColor fColor; GrPathRendering::FillType fFillType; GrStencilSettings fStencilPassSettings; - bool fBlendsWithDst; + bool fXPReadsDst; typedef GrDrawOp INHERITED; }; |