Index: src/gpu/GrAARectRenderer.cpp |
diff --git a/src/gpu/GrAARectRenderer.cpp b/src/gpu/GrAARectRenderer.cpp |
index f59b61125bf229dd4ae6f29eb1e437904ab1b645..93b276ad43ca36e5048ddac9d711a4a81d989fcb 100644 |
--- a/src/gpu/GrAARectRenderer.cpp |
+++ b/src/gpu/GrAARectRenderer.cpp |
@@ -175,6 +175,10 @@ private: |
bool coverageIgnored() const { return fBatch.fCoverageIgnored; } |
bool onCombineIfPossible(GrBatch* t) override { |
+ if (!this->pipeline()->isEqual(*t->pipeline())) { |
+ return false; |
+ } |
+ |
AAFillRectBatch* that = t->cast<AAFillRectBatch>(); |
SkASSERT(this->usesLocalCoords() == that->usesLocalCoords()); |
@@ -617,6 +621,10 @@ private: |
bool coverageIgnored() const { return fBatch.fCoverageIgnored; } |
bool onCombineIfPossible(GrBatch* t) override { |
+ if (!this->pipeline()->isEqual(*t->pipeline())) { |
+ return false; |
+ } |
+ |
AAStrokeRectBatch* that = t->cast<AAStrokeRectBatch>(); |
// TODO batch across miterstroke changes |