| Index: src/gpu/GrPathProcessor.cpp
|
| diff --git a/src/gpu/GrPathProcessor.cpp b/src/gpu/GrPathProcessor.cpp
|
| index 4660aa080fb393f3bbecc415344fb1b32e8f5487..5c07a8b156675a5e155bd877ea0c5241f7501875 100644
|
| --- a/src/gpu/GrPathProcessor.cpp
|
| +++ b/src/gpu/GrPathProcessor.cpp
|
| @@ -57,19 +57,12 @@
|
|
|
| const PathBatchTracker& mine = m.cast<PathBatchTracker>();
|
| const PathBatchTracker& theirs = t.cast<PathBatchTracker>();
|
| - if (mine.fColor != theirs.fColor) {
|
| - return false;
|
| - }
|
| -
|
| - if (mine.fUsesLocalCoords != theirs.fUsesLocalCoords) {
|
| - return false;
|
| - }
|
| -
|
| - if (mine.fUsesLocalCoords && !this->localMatrix().cheapEqualTo(other.localMatrix())) {
|
| - return false;
|
| - }
|
| -
|
| - return true;
|
| + return CanCombineLocalMatrices(*this, mine.fUsesLocalCoords,
|
| + that, theirs.fUsesLocalCoords) &&
|
| + CanCombineOutput(mine.fInputColorType, mine.fColor,
|
| + theirs.fInputColorType, theirs.fColor) &&
|
| + CanCombineOutput(mine.fInputCoverageType, 0xff,
|
| + theirs.fInputCoverageType, 0xff);
|
| }
|
|
|
| void GrPathProcessor::getGLProcessorKey(const GrBatchTracker& bt,
|
|
|