GrTessellator (AA): Performance tweaks and cleanup.
The SkArenaAlloc destructor was showing up as hot in profiling,
especially on Linux. The reason is that it was being used
incorrectly: the size estimate was being used as the chunk size. It
turns out that the best performance seems to be achieved with no
initial allocations and a fixed chunk size of 16K, as the CPU path
renderer does.
Also remove some unused code.
(This is a partial re-land of https://skia-review.googlesource.com/c/8560/)
TBR=bsalomon@google.com
Change-Id: I277eb1a6e5718a221974cd694c8a7e481e432ca6
Reviewed-on: https://skia-review.googlesource.com/8561
Reviewed-by: Stephen White <senorblanco@chromium.org>
Commit-Queue: Stephen White <senorblanco@chromium.org>
diff --git a/src/gpu/GrTessellator.cpp b/src/gpu/GrTessellator.cpp
index 22ce864..64c31f9 100644
--- a/src/gpu/GrTessellator.cpp
+++ b/src/gpu/GrTessellator.cpp
@@ -92,6 +92,8 @@
namespace {
+const int kArenaChunkSize = 16 * 1024;
+
struct Vertex;
struct Edge;
struct Poly;
@@ -1549,8 +1551,6 @@
Line outer(e->fTop, e->fBottom);
outer.fC += offset;
SkPoint innerPoint, outerPoint;
- SkVector normal;
- get_edge_normal(e, &normal);
if (prevInner.intersect(inner, &innerPoint) &&
prevOuter.intersect(outer, &outerPoint)) {
Vertex* innerVertex = alloc.make<Vertex>(innerPoint, 255);
@@ -1735,23 +1735,17 @@
antialias, alloc);
}
-void get_contour_count_and_size_estimate(const SkPath& path, SkScalar tolerance, int* contourCnt,
- int* sizeEstimate) {
- int maxPts = GrPathUtils::worstCasePointCount(path, contourCnt, tolerance);
+int get_contour_count(const SkPath& path, SkScalar tolerance) {
+ int contourCnt;
+ int maxPts = GrPathUtils::worstCasePointCount(path, &contourCnt, tolerance);
if (maxPts <= 0) {
- *contourCnt = 0;
- return;
+ return 0;
}
if (maxPts > ((int)SK_MaxU16 + 1)) {
SkDebugf("Path not rendered, too many verts (%d)\n", maxPts);
- *contourCnt = 0;
- return;
+ return 0;
}
- // For the initial size of the chunk allocator, estimate based on the point count:
- // one vertex per point for the initial passes, plus two for the vertices in the
- // resulting Polys, since the same point may end up in two Polys. Assume minimal
- // connectivity of one Edge per Vertex (will grow for intersections).
- *sizeEstimate = maxPts * (3 * sizeof(Vertex) + sizeof(Edge));
+ return contourCnt;
}
int count_points(Poly* polys, SkPath::FillType fillType) {
@@ -1773,14 +1767,12 @@
int PathToTriangles(const SkPath& path, SkScalar tolerance, const SkRect& clipBounds,
VertexAllocator* vertexAllocator, bool antialias, const GrColor& color,
bool canTweakAlphaForCoverage, bool* isLinear) {
- int contourCnt;
- int sizeEstimate;
- get_contour_count_and_size_estimate(path, tolerance, &contourCnt, &sizeEstimate);
+ int contourCnt = get_contour_count(path, tolerance);
if (contourCnt <= 0) {
*isLinear = true;
return 0;
}
- SkArenaAlloc alloc(sizeEstimate);
+ SkArenaAlloc alloc(kArenaChunkSize);
Poly* polys = path_to_polys(path, tolerance, clipBounds, contourCnt, alloc, antialias,
isLinear);
SkPath::FillType fillType = antialias ? SkPath::kWinding_FillType : path.getFillType();
@@ -1810,13 +1802,11 @@
int PathToVertices(const SkPath& path, SkScalar tolerance, const SkRect& clipBounds,
GrTessellator::WindingVertex** verts) {
- int contourCnt;
- int sizeEstimate;
- get_contour_count_and_size_estimate(path, tolerance, &contourCnt, &sizeEstimate);
+ int contourCnt = get_contour_count(path, tolerance);
if (contourCnt <= 0) {
return 0;
}
- SkArenaAlloc alloc(sizeEstimate);
+ SkArenaAlloc alloc(kArenaChunkSize);
bool isLinear;
Poly* polys = path_to_polys(path, tolerance, clipBounds, contourCnt, alloc, false, &isLinear);
SkPath::FillType fillType = path.getFillType();