| Index: src/gpu/GrRODrawState.cpp
|
| diff --git a/src/gpu/GrRODrawState.cpp b/src/gpu/GrRODrawState.cpp
|
| index b79e8fce4340df6253c676610b6682a05dea7037..48c0674f5d8baf79d2a32eb6ebb37a440e3e0a1f 100644
|
| --- a/src/gpu/GrRODrawState.cpp
|
| +++ b/src/gpu/GrRODrawState.cpp
|
| @@ -186,17 +186,7 @@ GrRODrawState::BlendOptFlags GrRODrawState::getBlendOpts(bool forceCoverage,
|
| return this->calcBlendOpts(true, srcCoeff, dstCoeff);
|
| }
|
|
|
| - if (0 == (fBlendOptFlags & kInvalid_BlendOptFlag)) {
|
| - *srcCoeff = fOptSrcBlend;
|
| - *dstCoeff = fOptDstBlend;
|
| - return fBlendOptFlags;
|
| - }
|
| -
|
| - fBlendOptFlags = this->calcBlendOpts(forceCoverage, srcCoeff, dstCoeff);
|
| - fOptSrcBlend = *srcCoeff;
|
| - fOptDstBlend = *dstCoeff;
|
| -
|
| - return fBlendOptFlags;
|
| + return this->calcBlendOpts(forceCoverage, srcCoeff, dstCoeff);
|
| }
|
|
|
| GrRODrawState::BlendOptFlags GrRODrawState::calcBlendOpts(bool forceCoverage,
|
| @@ -370,13 +360,3 @@ bool GrRODrawState::srcAlphaWillBeOne() const {
|
| return (kA_GrColorComponentFlag & validComponentFlags) && 0xFF == GrColorUnpackA(color);
|
| }
|
|
|
| -////////////////////////////////////////////////////////////////////////////////
|
| -
|
| -bool GrRODrawState::canIgnoreColorAttribute() const {
|
| - if (fBlendOptFlags & kInvalid_BlendOptFlag) {
|
| - this->getBlendOpts();
|
| - }
|
| - return SkToBool(fBlendOptFlags & (GrRODrawState::kEmitTransBlack_BlendOptFlag |
|
| - GrRODrawState::kEmitCoverage_BlendOptFlag));
|
| -}
|
| -
|
|
|