Remove some validation and asserts from tessellating path renderer.

src/gpu/GrTessellatingPathRenderer.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrTessellatingPathRenderer.h"
 
 #include "GrBatch.h"
@@ skipping 337 matching lines @@
                 fHead = newV;
             }
             return done;
         }
 
         void* emit(void* data) {
             Vertex* first = fHead;
             Vertex* v = first->fNext;
             while (v != fTail) {
                 SkASSERT(v && v->fPrev && v->fNext);
-#ifdef SK_DEBUG
-                validate();
-#endif
                 Vertex* prev = v->fPrev;
                 Vertex* curr = v;
                 Vertex* next = v->fNext;
                 double ax = static_cast<double>(curr->fPoint.fX) - prev->fPoint.fX;
                 double ay = static_cast<double>(curr->fPoint.fY) - prev->fPoint.fY;
                 double bx = static_cast<double>(next->fPoint.fX) - curr->fPoint.fX;
                 double by = static_cast<double>(next->fPoint.fY) - curr->fPoint.fY;
                 if (ax * by - ay * bx >= 0.0) {
                     data = emit_triangle(prev, curr, next, data);
                     v->fPrev->fNext = v->fNext;
                     v->fNext->fPrev = v->fPrev;
                     if (v->fPrev == first) {
                         v = v->fNext;
                     } else {
                         v = v->fPrev;
                     }
                 } else {
                     v = v->fNext;
-                    SkASSERT(v != fTail);
                 }
             }
             return data;
         }
-
-#ifdef SK_DEBUG
-        void validate() {
-            int winding = sweep_lt(fHead->fPoint, fTail->fPoint) ? 1 : -1;
-            Vertex* top = winding < 0 ? fTail : fHead;
-            Vertex* bottom = winding < 0 ? fHead : fTail;
-            Edge e(top, bottom, winding);
-            for (Vertex* v = fHead->fNext; v != fTail; v = v->fNext) {
-                if (fSide == kRight_Side) {
-                    SkASSERT(!e.isRightOf(v));
-                } else if (fSide == Poly::kLeft_Side) {
-                    SkASSERT(!e.isLeftOf(v));
-                }
-            }
-        }
-#endif
     };
     Poly* addVertex(Vertex* v, Side side, SkChunkAlloc& alloc) {
         LOG("addVertex() to %d at %g (%g, %g), %s side\n", fID, v->fID, v->fPoint.fX, v->fPoint.fY,
                side == kLeft_Side ? "left" : side == kRight_Side ? "right" : "neither");
         Poly* partner = fPartner;
         Poly* poly = this;
         if (partner) {
             fPartner = partner->fPartner = NULL;
         }
         if (!fActive) {
             fActive = ALLOC_NEW(MonotonePoly, (), alloc);
         }
         if (fActive->addVertex(v, side, alloc)) {
-#ifdef SK_DEBUG
-            fActive->validate();
-#endif
             if (fTail) {
                 fActive->fPrev = fTail;
                 fTail->fNext = fActive;
                 fTail = fActive;
             } else {
                 fHead = fTail = fActive;
             }
             if (partner) {
                 partner->addVertex(v, side, alloc);
                 poly = partner;
@@ skipping 44 matching lines @@
 }
 
 Poly* new_poly(Poly** head, Vertex* v, int winding, SkChunkAlloc& alloc) {
     Poly* poly = ALLOC_NEW(Poly, (winding), alloc);
     poly->addVertex(v, Poly::kNeither_Side, alloc);
     poly->fNext = *head;
     *head = poly;
     return poly;
 }
 
-#ifdef SK_DEBUG
-void validate_edges(Edge* head) {
-    for (Edge* e = head; e != NULL; e = e->fRight) {
-        SkASSERT(e->fTop != e->fBottom);
-        if (e->fLeft) {
-            SkASSERT(e->fLeft->fRight == e);
-            if (sweep_gt(e->fTop->fPoint, e->fLeft->fTop->fPoint)) {
-                SkASSERT(e->fLeft->isLeftOf(e->fTop));
-            }
-            if (sweep_lt(e->fBottom->fPoint, e->fLeft->fBottom->fPoint)) {
-                SkASSERT(e->fLeft->isLeftOf(e->fBottom));
-            }
-        } else {
-            SkASSERT(e == head);
-        }
-        if (e->fRight) {
-            SkASSERT(e->fRight->fLeft == e);
-            if (sweep_gt(e->fTop->fPoint, e->fRight->fTop->fPoint)) {
-                SkASSERT(e->fRight->isRightOf(e->fTop));
-            }
-            if (sweep_lt(e->fBottom->fPoint, e->fRight->fBottom->fPoint)) {
-                SkASSERT(e->fRight->isRightOf(e->fBottom));
-            }
-        }
-    }
-}
-
-void validate_connectivity(Vertex* v) {
-    for (Edge* e = v->fFirstEdgeAbove; e != NULL; e = e->fNextEdgeAbove) {
-        SkASSERT(e->fBottom == v);
-        if (e->fPrevEdgeAbove) {
-            SkASSERT(e->fPrevEdgeAbove->fNextEdgeAbove == e);
-            SkASSERT(e->fPrevEdgeAbove->isLeftOf(e->fTop));
-        } else {
-            SkASSERT(e == v->fFirstEdgeAbove);
-        }
-        if (e->fNextEdgeAbove) {
-            SkASSERT(e->fNextEdgeAbove->fPrevEdgeAbove == e);
-            SkASSERT(e->fNextEdgeAbove->isRightOf(e->fTop));
-        } else {
-            SkASSERT(e == v->fLastEdgeAbove);
-        }
-    }
-    for (Edge* e = v->fFirstEdgeBelow; e != NULL; e = e->fNextEdgeBelow) {
-        SkASSERT(e->fTop == v);
-        if (e->fPrevEdgeBelow) {
-            SkASSERT(e->fPrevEdgeBelow->fNextEdgeBelow == e);
-            SkASSERT(e->fPrevEdgeBelow->isLeftOf(e->fBottom));
-        } else {
-            SkASSERT(e == v->fFirstEdgeBelow);
-        }
-        if (e->fNextEdgeBelow) {
-            SkASSERT(e->fNextEdgeBelow->fPrevEdgeBelow == e);
-            SkASSERT(e->fNextEdgeBelow->isRightOf(e->fBottom));
-        } else {
-            SkASSERT(e == v->fLastEdgeBelow);
-        }
-    }
-}
-#endif
-
 Vertex* append_point_to_contour(const SkPoint& p, Vertex* prev, Vertex** head,
                                 SkChunkAlloc& alloc) {
     Vertex* v = ALLOC_NEW(Vertex, (p), alloc);
 #if LOGGING_ENABLED
     static float gID = 0.0f;
     v->fID = gID++;
 #endif
     if (prev) {
         prev->fNext = v;
         v->fPrev = prev;
@@ skipping 225 matching lines @@
         Edge* left;
         Edge* right;
         find_enclosing_edges(edge, *activeEdges, &left, &right);
         insert_edge(edge, left, activeEdges);
     }
 }
 
 void insert_edge_above(Edge* edge, Vertex* v) {
     if (edge->fTop->fPoint == edge->fBottom->fPoint ||
         sweep_gt(edge->fTop->fPoint, edge->fBottom->fPoint)) {
-        SkASSERT(false);
         return;
     }
     LOG("insert edge (%g -> %g) above vertex %g\n", edge->fTop->fID, edge->fBottom->fID, v->fID);
     Edge* prev = NULL;
     Edge* next;
     for (next = v->fFirstEdgeAbove; next; next = next->fNextEdgeAbove) {
         if (next->isRightOf(edge->fTop)) {
             break;
         }
         prev = next;
     }
     insert<Edge, &Edge::fPrevEdgeAbove, &Edge::fNextEdgeAbove>(
         edge, prev, next, &v->fFirstEdgeAbove, &v->fLastEdgeAbove);
 }
 
 void insert_edge_below(Edge* edge, Vertex* v) {
     if (edge->fTop->fPoint == edge->fBottom->fPoint ||
         sweep_gt(edge->fTop->fPoint, edge->fBottom->fPoint)) {
-        SkASSERT(false);
         return;
     }
     LOG("insert edge (%g -> %g) below vertex %g\n", edge->fTop->fID, edge->fBottom->fID, v->fID);
     Edge* prev = NULL;
     Edge* next;
     for (next = v->fFirstEdgeBelow; next; next = next->fNextEdgeBelow) {
         if (next->isRightOf(edge->fBottom)) {
             break;
         }
         prev = next;
@@ skipping 217 matching lines @@
                 v->fID = (nextV->fID + prevV->fID) * 0.5f;
 #endif
                 v->fPrev = prevV;
                 v->fNext = nextV;
                 prevV->fNext = v;
                 nextV->fPrev = v;
             }
             split_edge(edge, v, activeEdges, alloc);
             split_edge(other, v, activeEdges, alloc);
         }
-#ifdef SK_DEBUG
-        validate_connectivity(v);
-#endif
         return v;
     }
     return NULL;
 }
 
 void sanitize_contours(Vertex** contours, int contourCnt) {
     for (int i = 0; i < contourCnt; ++i) {
         SkASSERT(contours[i]);
         for (Vertex* v = contours[i];;) {
             if (coincident(v->fPrev->fPoint, v->fPoint)) {
@@ skipping 130 matching lines @@
 void simplify(Vertex* vertices, SkChunkAlloc& alloc) {
     LOG("simplifying complex polygons\n");
     Edge* activeEdges = NULL;
     for (Vertex* v = vertices; v != NULL; v = v->fNext) {
         if (!v->fFirstEdgeAbove && !v->fFirstEdgeBelow) {
             continue;
         }
 #if LOGGING_ENABLED
         LOG("\nvertex %g: (%g,%g)\n", v->fID, v->fPoint.fX, v->fPoint.fY);
 #endif
-#ifdef SK_DEBUG
-        validate_connectivity(v);
-#endif
         Edge* leftEnclosingEdge = NULL;
         Edge* rightEnclosingEdge = NULL;
         bool restartChecks;
         do {
             restartChecks = false;
             find_enclosing_edges(v, activeEdges, &leftEnclosingEdge, &rightEnclosingEdge);
             if (v->fFirstEdgeBelow) {
                 for (Edge* edge = v->fFirstEdgeBelow; edge != NULL; edge = edge->fNextEdgeBelow) {
                     if (check_for_intersection(edge, leftEnclosingEdge, &activeEdges, alloc)) {
                         restartChecks = true;
                         break;
                     }
                     if (check_for_intersection(edge, rightEnclosingEdge, &activeEdges, alloc)) {
                         restartChecks = true;
                         break;
                     }
                 }
             } else {
                 if (Vertex* pv = check_for_intersection(leftEnclosingEdge, rightEnclosingEdge,
                                                         &activeEdges, alloc)) {
                     if (sweep_lt(pv->fPoint, v->fPoint)) {
                         v = pv;
                     }
                     restartChecks = true;
                 }
 
             }
         } while (restartChecks);
-        SkASSERT(!leftEnclosingEdge || leftEnclosingEdge->isLeftOf(v));
-        SkASSERT(!rightEnclosingEdge || rightEnclosingEdge->isRightOf(v));
-#ifdef SK_DEBUG
-        validate_edges(activeEdges);
-#endif
         for (Edge* e = v->fFirstEdgeAbove; e; e = e->fNextEdgeAbove) {
             remove_edge(e, &activeEdges);
         }
         Edge* leftEdge = leftEnclosingEdge;
         for (Edge* e = v->fFirstEdgeBelow; e; e = e->fNextEdgeBelow) {
             insert_edge(e, leftEdge, &activeEdges);
             leftEdge = e;
         }
         v->fProcessed = true;
     }
 }
 
 // Stage 5: Tessellate the simplified mesh into monotone polygons.
 
 Poly* tessellate(Vertex* vertices, SkChunkAlloc& alloc) {
     LOG("tessellating simple polygons\n");
     Edge* activeEdges = NULL;
     Poly* polys = NULL;
     for (Vertex* v = vertices; v != NULL; v = v->fNext) {
         if (!v->fFirstEdgeAbove && !v->fFirstEdgeBelow) {
             continue;
         }
 #if LOGGING_ENABLED
         LOG("\nvertex %g: (%g,%g)\n", v->fID, v->fPoint.fX, v->fPoint.fY);
 #endif
-#ifdef SK_DEBUG
-        validate_connectivity(v);
-#endif
         Edge* leftEnclosingEdge = NULL;
         Edge* rightEnclosingEdge = NULL;
         find_enclosing_edges(v, activeEdges, &leftEnclosingEdge, &rightEnclosingEdge);
-        SkASSERT(!leftEnclosingEdge || leftEnclosingEdge->isLeftOf(v));
-        SkASSERT(!rightEnclosingEdge || rightEnclosingEdge->isRightOf(v));
-#ifdef SK_DEBUG
-        validate_edges(activeEdges);
-#endif
         Poly* leftPoly = NULL;
         Poly* rightPoly = NULL;
         if (v->fFirstEdgeAbove) {
             leftPoly = v->fFirstEdgeAbove->fLeftPoly;
             rightPoly = v->fLastEdgeAbove->fRightPoly;
         } else {
             leftPoly = leftEnclosingEdge ? leftEnclosingEdge->fRightPoly : NULL;
             rightPoly = rightEnclosingEdge ? rightEnclosingEdge->fLeftPoly : NULL;
         }
 #if LOGGING_ENABLED
@@ skipping 71 matching lines @@
                 int winding = leftEdge->fLeftPoly ? leftEdge->fLeftPoly->fWinding : 0;
                 winding += leftEdge->fWinding;
                 if (winding != 0) {
                     Poly* poly = new_poly(&polys, v, winding, alloc);
                     leftEdge->fRightPoly = rightEdge->fLeftPoly = poly;
                 }
                 leftEdge = rightEdge;
             }
             v->fLastEdgeBelow->fRightPoly = rightPoly;
         }
-#ifdef SK_DEBUG
-        validate_edges(activeEdges);
-#endif
 #if LOGGING_ENABLED
         LOG("\nactive edges:\n");
         for (Edge* e = activeEdges; e != NULL; e = e->fRight) {
             LOG("%g -> %g, lpoly %d, rpoly %d\n", e->fTop->fID, e->fBottom->fID,
                 e->fLeftPoly ? e->fLeftPoly->fID : -1, e->fRightPoly ? e->fRightPoly->fID : -1);
         }
 #endif
     }
     return polys;
 }
@@ skipping 128 matching lines @@
         SkChunkAlloc alloc(maxPts * (3 * sizeof(Vertex) + sizeof(Edge)));
         path_to_contours(fPath, tol, fClipBounds, contours.get(), alloc);
         Poly* polys;
         polys = contours_to_polys(contours.get(), contourCnt, alloc);
         int count = 0;
         for (Poly* poly = polys; poly; poly = poly->fNext) {
             if (apply_fill_type(fillType, poly->fWinding) && poly->fCount >= 3) {
                 count += (poly->fCount - 2) * (WIREFRAME ? 6 : 3);
             }
         }
+        if (0 == count) {
+            return;
+        }
 
         size_t stride = gp->getVertexStride();
         const GrVertexBuffer* vertexBuffer;
         int firstVertex;
         void* vertices = batchTarget->vertexPool()->makeSpace(stride,
                                                               count,
                                                               &vertexBuffer,
                                                               &firstVertex);
 
         if (!vertices) {
@@ skipping 65 matching lines @@
     SkMatrix vmi;
     if (!viewM.invert(&vmi)) {
         return false;
     }
     vmi.mapRect(&clipBounds);
     SkAutoTUnref<GrBatch> batch(TessellatingPathBatch::Create(color, path, viewM, clipBounds));
     target->drawBatch(pipelineBuilder, batch);
 
     return true;
 }