Index: src/gpu/GrDistanceFieldTextContext.cpp |
diff --git a/src/gpu/GrDistanceFieldTextContext.cpp b/src/gpu/GrDistanceFieldTextContext.cpp |
index 66c97c7dc0dc8e5eed6aaa2ffe0a7758e584eaa2..fe2c9937a2dc1a5a07400d20de7812ff28cedce8 100755 |
--- a/src/gpu/GrDistanceFieldTextContext.cpp |
+++ b/src/gpu/GrDistanceFieldTextContext.cpp |
@@ -516,17 +516,17 @@ void GrDistanceFieldTextContext::setupCoverageEffect(const SkColor& filteredColo |
fDistanceAdjustTable[GrColorUnpackG(colorNoPreMul) >> kDistanceAdjustLumShift]; |
float blueCorrection = |
fDistanceAdjustTable[GrColorUnpackB(colorNoPreMul) >> kDistanceAdjustLumShift]; |
- GrDistanceFieldLCDTextureEffect::DistanceAdjust widthAdjust = |
- GrDistanceFieldLCDTextureEffect::DistanceAdjust::Make(redCorrection, |
- greenCorrection, |
- blueCorrection); |
- fCachedGeometryProcessor.reset(GrDistanceFieldLCDTextureEffect::Create(color, |
- fViewMatrix, |
- localMatrix, |
- fCurrTexture, |
- params, |
- widthAdjust, |
- flags)); |
+ GrDistanceFieldLCDTextGeoProc::DistanceAdjust widthAdjust = |
+ GrDistanceFieldLCDTextGeoProc::DistanceAdjust::Make(redCorrection, |
+ greenCorrection, |
+ blueCorrection); |
+ fCachedGeometryProcessor.reset(GrDistanceFieldLCDTextGeoProc::Create(color, |
+ fViewMatrix, |
+ localMatrix, |
+ fCurrTexture, |
+ params, |
+ widthAdjust, |
+ flags)); |
} else { |
flags |= kColorAttr_DistanceFieldEffectFlag; |
bool opaque = GrColorIsOpaque(color); |
@@ -534,7 +534,7 @@ void GrDistanceFieldTextContext::setupCoverageEffect(const SkColor& filteredColo |
U8CPU lum = SkColorSpaceLuminance::computeLuminance(fDeviceProperties.gamma(), |
filteredColor); |
float correction = fDistanceAdjustTable[lum >> kDistanceAdjustLumShift]; |
- fCachedGeometryProcessor.reset(GrDistanceFieldTextureEffect::Create(color, |
+ fCachedGeometryProcessor.reset(GrDistanceFieldA8TextGeoProc::Create(color, |
fViewMatrix, |
localMatrix, |
fCurrTexture, |
@@ -543,7 +543,7 @@ void GrDistanceFieldTextContext::setupCoverageEffect(const SkColor& filteredColo |
flags, |
opaque)); |
#else |
- fCachedGeometryProcessor.reset(GrDistanceFieldTextureEffect::Create(color, |
+ fCachedGeometryProcessor.reset(GrDistanceFieldA8TextGeoProc::Create(color, |
fViewMatrix, |
localMatrix, |
fCurrTexture, |