diff options
Diffstat (limited to 'src/gpu/ops')
-rw-r--r-- | src/gpu/ops/GrTextureOp.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/gpu/ops/GrTextureOp.cpp b/src/gpu/ops/GrTextureOp.cpp index 1cee63ed43..565eb88c52 100644 --- a/src/gpu/ops/GrTextureOp.cpp +++ b/src/gpu/ops/GrTextureOp.cpp @@ -478,11 +478,6 @@ private: fDraws[i].fTextureIdx = map[fDraws[i].fTextureIdx]; } } else { - // We can get here when one of the ops is already multitextured but the other cannot - // be because of the dst rect size. - if (fProxyCnt > 1 || that->fProxyCnt > 1) { - return false; - } if (fProxy0->uniqueID() != that->fProxy0->uniqueID() || fFilter0 != that->fFilter0) { return false; } @@ -575,13 +570,13 @@ private: GrTextureProxy* fProxy0; GrTextureProxy** fProxyArray; }; - size_t fMaxApproxDstPixelArea; // The next four members should pack. GrSamplerState::Filter fFilter0; uint8_t fProxyCnt; // Used to track whether fProxy is ref'ed or has a pending IO after finalize() is called. uint8_t fFinalized; uint8_t fAllowSRGBInputs; + size_t fMaxApproxDstPixelArea; typedef GrMeshDrawOp INHERITED; }; |