Index: src/gpu/GrBitmapTextContext.cpp |
diff --git a/src/gpu/GrBitmapTextContext.cpp b/src/gpu/GrBitmapTextContext.cpp |
index 6a624ae23e2fc030e401e8a213b66e60e96e3e39..7ee5585722963c9815663c9002b1e51df6d43cd3 100755 |
--- a/src/gpu/GrBitmapTextContext.cpp |
+++ b/src/gpu/GrBitmapTextContext.cpp |
@@ -561,19 +561,18 @@ void GrBitmapTextContext::flush() { |
if (kARGB_GrMaskFormat == fCurrMaskFormat) { |
uint32_t textureUniqueID = fCurrTexture->getUniqueID(); |
if (textureUniqueID != fEffectTextureUniqueID || |
- fCachedGeometryProcessor->getColor() != color) { |
+ fCachedGeometryProcessor->color() != color) { |
uint32_t flags = GrDefaultGeoProcFactory::kLocalCoord_GPType; |
fCachedGeometryProcessor.reset(GrDefaultGeoProcFactory::Create(color, flags)); |
fCachedTextureProcessor.reset(GrSimpleTextureEffect::Create(fCurrTexture, |
SkMatrix::I(), |
params)); |
} |
- drawState.setGeometryProcessor(fCachedGeometryProcessor.get()); |
drawState.addColorProcessor(fCachedTextureProcessor.get()); |
} else { |
uint32_t textureUniqueID = fCurrTexture->getUniqueID(); |
if (textureUniqueID != fEffectTextureUniqueID || |
- fCachedGeometryProcessor->getColor() != color) { |
+ fCachedGeometryProcessor->color() != color) { |
bool hasColor = kA8_GrMaskFormat == fCurrMaskFormat; |
fCachedGeometryProcessor.reset(GrBitmapTextGeoProc::Create(color, |
fCurrTexture, |
@@ -581,12 +580,12 @@ void GrBitmapTextContext::flush() { |
hasColor)); |
fEffectTextureUniqueID = textureUniqueID; |
} |
- drawState.setGeometryProcessor(fCachedGeometryProcessor.get()); |
} |
int nGlyphs = fCurrVertex / kVerticesPerGlyph; |
fDrawTarget->setIndexSourceToBuffer(fContext->getQuadIndexBuffer()); |
fDrawTarget->drawIndexedInstances(&drawState, |
+ fCachedGeometryProcessor.get(), |
kTriangles_GrPrimitiveType, |
nGlyphs, |
kVerticesPerGlyph, |