| Index: src/gpu/GrOptDrawState.h
|
| diff --git a/src/gpu/GrOptDrawState.h b/src/gpu/GrOptDrawState.h
|
| index cf5737373caa44ba3134f6a7d9efb56bc52ecef4..8a7b47e6206fbeaac16baaae42ec6813c09d271c 100644
|
| --- a/src/gpu/GrOptDrawState.h
|
| +++ b/src/gpu/GrOptDrawState.h
|
| @@ -79,7 +79,8 @@ public:
|
| int numCoverageStages() const { return fFragmentStages.count() - fNumColorStages; }
|
| int numFragmentStages() const { return fFragmentStages.count(); }
|
| int numTotalStages() const {
|
| - return this->numFragmentStages() + (this->hasGeometryProcessor() ? 1 : 0);
|
| + // the + 1 at the end is for the xferProcessor which will always be present
|
| + return this->numFragmentStages() + (this->hasGeometryProcessor() ? 1 : 0) + 1;
|
| }
|
|
|
| bool hasGeometryProcessor() const { return SkToBool(fGeometryProcessor.get()); }
|
| @@ -103,21 +104,6 @@ public:
|
| /// @}
|
|
|
| ///////////////////////////////////////////////////////////////////////////
|
| - /// @name Blending
|
| - ////
|
| -
|
| - GrBlendCoeff getSrcBlendCoeff() const { return fSrcBlend; }
|
| - GrBlendCoeff getDstBlendCoeff() const { return fDstBlend; }
|
| -
|
| - /**
|
| - * Retrieves the last value set by setBlendConstant()
|
| - * @return the blending constant value
|
| - */
|
| - GrColor getBlendConstant() const { return fBlendConstant; }
|
| -
|
| - /// @}
|
| -
|
| - ///////////////////////////////////////////////////////////////////////////
|
| /// @name View Matrix
|
| ////
|
|
|
| @@ -223,13 +209,10 @@ private:
|
| ScissorState fScissorState;
|
| GrColor fColor;
|
| SkMatrix fViewMatrix;
|
| - GrColor fBlendConstant;
|
| GrStencilSettings fStencilSettings;
|
| uint8_t fCoverage;
|
| GrDrawState::DrawFace fDrawFace;
|
| GrDeviceCoordTexture fDstCopy;
|
| - GrBlendCoeff fSrcBlend;
|
| - GrBlendCoeff fDstBlend;
|
| uint32_t fFlags;
|
| ProgramGeometryProcessor fGeometryProcessor;
|
| GrBatchTracker fBatchTracker;
|
|
|