Remove historical assert in AAConvexPathRenderer

src/gpu/GrAAConvexPathRenderer.cpp

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrAAConvexPathRenderer.h"
 
@@ skipping 676 matching lines @@
     return (target->caps()->shaderDerivativeSupport() && antiAlias &&
             stroke.isFillStyle() && !path.isInverseFillType() && path.isConvex());
 }
 
 class AAConvexPathBatch : public GrBatch {
 public:
     struct Geometry {
         GrColor fColor;
         SkMatrix fViewMatrix;
         SkPath fPath;
-        SkDEBUGCODE(SkRect fDevBounds;)
     };
 
     static GrBatch* Create(const Geometry& geometry) {
         return SkNEW_ARGS(AAConvexPathBatch, (geometry));
     }
 
     const char* name() const SK_OVERRIDE { return "AAConvexBatch"; }
 
     void getInvariantOutputColor(GrInitInvariantOutput* out) const SK_OVERRIDE {
         // When this is called on a batch, there is only one geometry bundle
@@ skipping 15 matching lines @@
         fBatch.fColorIgnored = init.fColorIgnored;
         fBatch.fColor = fGeoData[0].fColor;
         fBatch.fUsesLocalCoords = init.fUsesLocalCoords;
         fBatch.fCoverageIgnored = init.fCoverageIgnored;
     }
 
     void generateGeometry(GrBatchTarget* batchTarget, const GrPipeline* pipeline) SK_OVERRIDE {
         int instanceCount = fGeoData.count();
 
         SkMatrix invert;
-        if (!this->viewMatrix().invert(&invert)) {
+        if (this->usesLocalCoords() && !this->viewMatrix().invert(&invert)) {
             SkDebugf("Could not invert viewmatrix\n");
             return;
         }
 
         // Setup GrGeometryProcessor
         SkAutoTUnref<GrGeometryProcessor> quadProcessor(QuadEdgeEffect::Create(this->color(),
                                                                                invert));
 
         batchTarget->initDraw(quadProcessor, pipeline);
 
@@ skipping 47 matching lines @@
             void *indices = batchTarget->indexPool()->makeSpace(indexCount,
                                                                 &indexBuffer,
                                                                 &firstIndex);
 
             QuadVertex* verts = reinterpret_cast<QuadVertex*>(vertices);
             uint16_t* idxs = reinterpret_cast<uint16_t*>(indices);
 
             SkSTArray<kPreallocDrawCnt, Draw, true> draws;
             create_vertices(segments, fanPt, &draws, verts, idxs);
 
-#ifdef SK_DEBUG
-            // Check devBounds
-            SkRect actualBounds;
-            actualBounds.set(verts[0].fPos, verts[1].fPos);
-            for (int i = 2; i < vertexCount; ++i) {
-                actualBounds.growToInclude(verts[i].fPos.fX, verts[i].fPos.fY);
-            }
-            SkASSERT(args.fDevBounds.contains(actualBounds));
-#endif
-
             GrDrawTarget::DrawInfo info;
             info.setVertexBuffer(vertexBuffer);
             info.setIndexBuffer(indexBuffer);
             info.setPrimitiveType(kTriangles_GrPrimitiveType);
             info.setStartIndex(firstIndex);
 
             int vOffset = 0;
             for (int i = 0; i < draws.count(); ++i) {
                 const Draw& draw = draws[i];
                 info.setStartVertex(vOffset + firstVertex);
@@ skipping 58 matching lines @@
     // We outset our vertices one pixel and add one more pixel for precision.
     // TODO create tighter bounds when we start reordering.
     SkRect devRect = path.getBounds();
     vm.mapRect(&devRect);
     devRect.outset(2, 2);
 
     AAConvexPathBatch::Geometry geometry;
     geometry.fColor = color;
     geometry.fViewMatrix = vm;
     geometry.fPath = path;
-    SkDEBUGCODE(geometry.fDevBounds = devRect;)
 
     SkAutoTUnref<GrBatch> batch(AAConvexPathBatch::Create(geometry));
     target->drawBatch(pipelineBuilder, batch, &devRect);
 
     return true;
 
 }