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/GrDefaultPathRenderer.cpp b/src/gpu/GrDefaultPathRenderer.cpp
index e0f36a3..feb6a99 100644
--- a/src/gpu/GrDefaultPathRenderer.cpp
+++ b/src/gpu/GrDefaultPathRenderer.cpp
@@ -154,7 +154,7 @@
#if STENCIL_OFF
return true;
#else
- if (kEvenOdd_PathFill == fill || kWinding_PathFill == fill) {
+ if (kEvenOdd_GrPathFill == fill || kWinding_GrPathFill == fill) {
return path.isConvex();
}
return false;
@@ -174,7 +174,7 @@
// when drawing lines we're appending line segments along
// the contour. When applying the other fill rules we're
// drawing triangle fans around fanCenterIdx.
- if (kHairLine_PathFill != fillType) {
+ if (kHairLine_GrPathFill != fillType) {
*((*indices)++) = fanCenterIdx;
}
*((*indices)++) = edgeV0Idx;
@@ -217,19 +217,19 @@
bool indexed = contourCnt > 1;
int maxIdxs = 0;
- if (kHairLine_PathFill == fill) {
+ if (kHairLine_GrPathFill == fill) {
if (indexed) {
maxIdxs = 2 * maxPts;
- *primType = kLines_PrimitiveType;
+ *primType = kLines_GrPrimitiveType;
} else {
- *primType = kLineStrip_PrimitiveType;
+ *primType = kLineStrip_GrPrimitiveType;
}
} else {
if (indexed) {
maxIdxs = 3 * maxPts;
- *primType = kTriangles_PrimitiveType;
+ *primType = kTriangles_GrPrimitiveType;
} else {
- *primType = kTriangleFan_PrimitiveType;
+ *primType = kTriangleFan_GrPrimitiveType;
}
}
@@ -371,7 +371,7 @@
bool reverse = false;
bool lastPassIsBounds;
- if (kHairLine_PathFill == fill) {
+ if (kHairLine_GrPathFill == fill) {
passCount = 1;
if (stencilOnly) {
passes[0] = &gDirectToStencil;
@@ -392,10 +392,10 @@
lastPassIsBounds = false;
} else {
switch (fill) {
- case kInverseEvenOdd_PathFill:
+ case kInverseEvenOdd_GrPathFill:
reverse = true;
// fallthrough
- case kEvenOdd_PathFill:
+ case kEvenOdd_GrPathFill:
passes[0] = &gEOStencilPass;
if (stencilOnly) {
passCount = 1;
@@ -412,10 +412,10 @@
drawFace[0] = drawFace[1] = GrDrawState::kBoth_DrawFace;
break;
- case kInverseWinding_PathFill:
+ case kInverseWinding_GrPathFill:
reverse = true;
// fallthrough
- case kWinding_PathFill:
+ case kWinding_GrPathFill:
if (fSeparateStencil) {
if (fStencilWrapOps) {
passes[0] = &gWindStencilSeparateWithWrap;
@@ -540,7 +540,7 @@
void GrDefaultPathRenderer::drawPathToStencil(const SkPath& path,
GrPathFill fill,
GrDrawTarget* target) {
- GrAssert(kInverseEvenOdd_PathFill != fill);
- GrAssert(kInverseWinding_PathFill != fill);
+ GrAssert(kInverseEvenOdd_GrPathFill != fill);
+ GrAssert(kInverseWinding_GrPathFill != fill);
this->internalDrawPath(path, fill, NULL, target, 0, true);
}