Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2282)

Unified Diff: src/gpu/GrDistanceFieldTextContext.cpp

Issue 1075543002: Rename the distance field geoprocs to something more reasonable. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Fix line wrap Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/GrAADistanceFieldPathRenderer.cpp ('k') | src/gpu/effects/GrDistanceFieldTextureEffect.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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,
« no previous file with comments | « src/gpu/GrAADistanceFieldPathRenderer.cpp ('k') | src/gpu/effects/GrDistanceFieldTextureEffect.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698