| Index: src/gpu/GrDrawState.cpp
|
| diff --git a/src/gpu/GrDrawState.cpp b/src/gpu/GrDrawState.cpp
|
| index b4cf9c8b4106228fc45d57a72e8ec5e7a7a8b9dd..f967a6fa76182d536bd9aba26221c685335c7896 100644
|
| --- a/src/gpu/GrDrawState.cpp
|
| +++ b/src/gpu/GrDrawState.cpp
|
| @@ -12,29 +12,6 @@
|
|
|
| //////////////////////////////////////////////////////////////////////////////s
|
|
|
| -GrOptDrawState* GrDrawState::createOptState(const GrDrawTargetCaps& caps) const {
|
| - if (NULL == fCachedOptState || caps.getUniqueID() != fCachedCapsID) {
|
| - GrBlendCoeff srcCoeff;
|
| - GrBlendCoeff dstCoeff;
|
| - GrOptDrawState::BlendOptFlags blendFlags =
|
| - (GrOptDrawState::BlendOptFlags) this->getBlendOpts(false, &srcCoeff, &dstCoeff);
|
| - fCachedOptState = SkNEW_ARGS(GrOptDrawState, (*this, blendFlags, srcCoeff, dstCoeff, caps));
|
| - fCachedCapsID = caps.getUniqueID();
|
| - } else {
|
| -#ifdef SK_DEBUG
|
| - GrBlendCoeff srcCoeff;
|
| - GrBlendCoeff dstCoeff;
|
| - GrOptDrawState::BlendOptFlags blendFlags =
|
| - (GrOptDrawState::BlendOptFlags) this->getBlendOpts(false, &srcCoeff, &dstCoeff);
|
| - SkASSERT(GrOptDrawState(*this, blendFlags, srcCoeff, dstCoeff, caps) == *fCachedOptState);
|
| -#endif
|
| - }
|
| - fCachedOptState->ref();
|
| - return fCachedOptState;
|
| -}
|
| -
|
| -//////////////////////////////////////////////////////////////////////////////s
|
| -
|
| bool GrDrawState::isEqual(const GrDrawState& that) const {
|
| bool usingVertexColors = this->hasColorVertexAttribute();
|
| if (!usingVertexColors && this->fColor != that.fColor) {
|
|
|