Search and replace change. Some Gr enum value names didn't have a "Gr" in their suffix.
Verbal LGTM from TomH
git-svn-id: http://skia.googlecode.com/svn/trunk@4198 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/GrDefaultTextContext.cpp b/src/gpu/GrDefaultTextContext.cpp
index 8bc4c68..d3d4e52 100644
--- a/src/gpu/GrDefaultTextContext.cpp
+++ b/src/gpu/GrDefaultTextContext.cpp
@@ -37,14 +37,14 @@
drawState->setTexture(kGlyphMaskStage, fCurrTexture);
if (!GrPixelConfigIsAlphaOnly(fCurrTexture->config())) {
- if (kOne_BlendCoeff != fGrPaint.fSrcBlendCoeff ||
- kISA_BlendCoeff != fGrPaint.fDstBlendCoeff ||
+ if (kOne_GrBlendCoeff != fGrPaint.fSrcBlendCoeff ||
+ kISA_GrBlendCoeff != fGrPaint.fDstBlendCoeff ||
fGrPaint.hasTexture()) {
GrPrintf("LCD Text will not draw correctly.\n");
}
// setup blend so that we get mask * paintColor + (1-mask)*dstColor
drawState->setBlendConstant(fGrPaint.fColor);
- drawState->setBlendFunc(kConstC_BlendCoeff, kISC_BlendCoeff);
+ drawState->setBlendFunc(kConstC_GrBlendCoeff, kISC_GrBlendCoeff);
// don't modulate by the paint's color in the frag since we're
// already doing it via the blend const.
drawState->setColor(0xffffffff);
@@ -56,7 +56,7 @@
fDrawTarget->setIndexSourceToBuffer(fContext->getQuadIndexBuffer());
int nGlyphs = fCurrVertex / 4;
- fDrawTarget->drawIndexedInstances(kTriangles_PrimitiveType,
+ fDrawTarget->drawIndexedInstances(kTriangles_GrPrimitiveType,
nGlyphs,
4, 6);
fVertices = NULL;
@@ -232,7 +232,7 @@
GrPoint translate;
translate.set(GrFixedToScalar(vx - GrIntToFixed(glyph->fBounds.fLeft)),
GrFixedToScalar(vy - GrIntToFixed(glyph->fBounds.fTop)));
- fContext->drawPath(fGrPaint, *glyph->fPath, kWinding_PathFill,
+ fContext->drawPath(fGrPaint, *glyph->fPath, kWinding_GrPathFill,
&translate);
return;
}