Revert 2830 and 2831.
git-svn-id: http://skia.googlecode.com/svn/trunk@2832 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/GrTesselatedPathRenderer.cpp b/src/gpu/GrTesselatedPathRenderer.cpp
index 5834dfd..b6612d1 100644
--- a/src/gpu/GrTesselatedPathRenderer.cpp
+++ b/src/gpu/GrTesselatedPathRenderer.cpp
@@ -471,7 +471,7 @@
if (count <= maxEdges) {
// All edges fit; upload all edges and draw all verts as a fan
fTarget->setVertexSourceToArray(layout, base, count);
- fTarget->drawState()->setEdgeAAData(&edges[0], count);
+ fTarget->setEdgeAAData(&edges[0], count);
fTarget->drawNonIndexed(kTriangleFan_PrimitiveType, 0, count);
} else {
// Upload "maxEdges" edges and verts at a time, and draw as
@@ -481,11 +481,11 @@
base[i] = base[0];
int size = GR_CT_MIN(count - i, maxEdges);
fTarget->setVertexSourceToArray(layout, &base[i], size);
- fTarget->drawState()->setEdgeAAData(&edges[i], size);
+ fTarget->setEdgeAAData(&edges[i], size);
fTarget->drawNonIndexed(kTriangleFan_PrimitiveType, 0, size);
}
}
- fTarget->drawState()->setEdgeAAData(NULL, 0);
+ fTarget->setEdgeAAData(NULL, 0);
} else {
fTarget->setVertexSourceToArray(layout, base, count);
fTarget->drawNonIndexed(kTriangleFan_PrimitiveType, 0, count);
@@ -534,7 +534,7 @@
}
// Draw the resulting polys and upload their edge data.
- fTarget->drawState()->enableState(GrDrawState::kEdgeAAConcave_StateBit);
+ fTarget->enableState(GrDrawTarget::kEdgeAAConcave_StateBit);
const GrPointArray& vertices = ptess.vertices();
const GrIndexArray& indices = ptess.indices();
const GrDrawState::Edge* edges = ptess.edges();
@@ -567,13 +567,12 @@
tri_edges[t++] = edge4;
tri_edges[t++] = edge5;
}
- fTarget->drawState()->setEdgeAAData(&tri_edges[0], t);
+ fTarget->setEdgeAAData(&tri_edges[0], t);
fTarget->setVertexSourceToArray(layout, &tri_verts[0], 3);
fTarget->drawNonIndexed(kTriangles_PrimitiveType, 0, 3);
}
- fTarget->drawState()->setEdgeAAData(NULL, 0);
- fTarget->drawState()->disableState(
- GrDrawState::kEdgeAAConcave_StateBit);
+ fTarget->setEdgeAAData(NULL, 0);
+ fTarget->disableState(GrDrawTarget::kEdgeAAConcave_StateBit);
return;
}