Index: src/gpu/GrAtlasTextContext.cpp |
diff --git a/src/gpu/GrAtlasTextContext.cpp b/src/gpu/GrAtlasTextContext.cpp |
index 73526ed4d58428716bcfac578c67aa3403cc679c..868f8bbe8ebc580abd24dcdb591997758ecbb80b 100644 |
--- a/src/gpu/GrAtlasTextContext.cpp |
+++ b/src/gpu/GrAtlasTextContext.cpp |
@@ -1873,6 +1873,10 @@ private: |
int numGlyphs() const { return fBatch.fNumGlyphs; } |
bool onCombineIfPossible(GrBatch* t) override { |
+ if (!this->pipeline()->isEqual(*t->pipeline())) { |
+ return false; |
+ } |
+ |
BitmapTextBatch* that = t->cast<BitmapTextBatch>(); |
if (fUseDistanceFields != that->fUseDistanceFields) { |