commit d9d30f7b577711a200395f7b62acc0d82a19f9c3
author joshualitt <joshualitt@chromium.org> Tue Dec 08 10:47:55 2015 -0800
committer Commit bot <commit-bot@chromium.org> Tue Dec 08 10:47:56 2015 -0800
tree 7b42d235539a831e182b903051195bfdc4bbd10a
parent b0bd1516bff3f5afcbfd615e805867531657811b

Allow LCD text to batch across colorchanges.  This will always use
color vertices, even when we can't batch across color changes

BUG=skia:

Review URL: https://codereview.chromium.org/1502253003

src/gpu/GrAtlasTextContext.cpp

diff --git a/src/gpu/GrAtlasTextContext.cpp b/src/gpu/GrAtlasTextContext.cpp
index 5023857..fbbcdb6 100644
--- a/src/gpu/GrAtlasTextContext.cpp
+++ b/src/gpu/GrAtlasTextContext.cpp
@@ -1014,7 +1014,8 @@
     r.fRight = r.fLeft + SkIntToScalar(width);
     r.fBottom = r.fTop + SkIntToScalar(height);
     subRun->setMaskFormat(format);
-    blob->appendGlyph(&run, subRun, r, color, vertexStride, kA8_GrMaskFormat == format, glyph);
+    blob->appendGlyph(&run, subRun, r, color, vertexStride,
+                      kARGB_GrMaskFormat != format, glyph);
 }
 
 bool GrAtlasTextContext::dfAppendGlyph(GrAtlasTextBlob* blob, int runIndex,
@@ -1070,11 +1071,9 @@
     SkASSERT(glyph->fMaskFormat == kA8_GrMaskFormat);
     subRun->setMaskFormat(kA8_GrMaskFormat);
 
-    size_t vertexStride = GrAtlasTextBatch::GetVertexStrideDf(kA8_GrMaskFormat,
-                                                              subRun->hasUseLCDText());
+    size_t vertexStride = GrAtlasTextBatch::GetVertexStride(kA8_GrMaskFormat);
 
-    bool useColorVerts = !subRun->hasUseLCDText();
-    blob->appendGlyph(&run, subRun, glyphRect, color, vertexStride, useColorVerts, glyph);
+    blob->appendGlyph(&run, subRun, glyphRect, color, vertexStride, true, glyph);
     return true;
 }