Pass bounds into draw calls in path renderers.

R=jvanverth@google.com, robertphillips@google.com

Review URL: https://codereview.chromium.org/14882011

git-svn-id: http://skia.googlecode.com/svn/trunk@9171 2bbb7eff-a529-9590-31e7-b0007b416f81

src/gpu/GrAAConvexPathRenderer.cpp

@@ -660,6 +660,9 @@ bool GrAAConvexPathRenderer::onDrawPath(const SkPath& origPath,
     SkSTArray<kPreallocDrawCnt, Draw, true> draws;
     create_vertices(segments, fanPt, &draws, verts, idxs);
 
+    SkRect devBounds;
+    GetPathDevBounds(origPath, drawState->getRenderTarget(), adcd.getOriginalMatrix(), &devBounds);
+
     int vOffset = 0;
     for (int i = 0; i < draws.count(); ++i) {
         const Draw& draw = draws[i];
@@ -667,7 +670,8 @@ bool GrAAConvexPathRenderer::onDrawPath(const SkPath& origPath,
                             vOffset,  // start vertex
                             0,        // start index
                             draw.fVertexCnt,
-                            draw.fIndexCnt);
+                            draw.fIndexCnt,
+                            &devBounds);
         vOffset += draw.fVertexCnt;
     }
 

src/gpu/GrAAHairLinePathRenderer.cpp

@@ -816,6 +816,9 @@ bool GrAAHairLinePathRenderer::onDrawPath(const SkPath& path,
     GrEffectRef* hairLineEffect = HairLineEdgeEffect::Create();
     GrEffectRef* hairQuadEffect = HairQuadEdgeEffect::Create();
 
+    SkRect devBounds;
+    GetPathDevBounds(path, drawState->getRenderTarget(), adcd.getOriginalMatrix(), &devBounds);
+
     target->setIndexSourceToBuffer(fLinesIndexBuffer);
     int lines = 0;
     int nBufLines = fLinesIndexBuffer->maxQuads();
@@ -826,7 +829,8 @@ bool GrAAHairLinePathRenderer::onDrawPath(const SkPath& path,
                             kVertsPerLineSeg*lines,    // startV
                             0,                         // startI
                             kVertsPerLineSeg*n,        // vCount
-                            kIdxsPerLineSeg*n);        // iCount
+                            kIdxsPerLineSeg*n,
+                            &devBounds);        // iCount
         lines += n;
     }
 
@@ -839,7 +843,8 @@ bool GrAAHairLinePathRenderer::onDrawPath(const SkPath& path,
                             4 * lineCnt + kVertsPerQuad*quads, // startV
                             0,                                 // startI
                             kVertsPerQuad*n,                   // vCount
-                            kIdxsPerQuad*n);                   // iCount
+                            kIdxsPerQuad*n,                    // iCount
+                            &devBounds);
         quads += n;
     }
     target->resetIndexSource();

src/gpu/GrDefaultPathRenderer.cpp

@@ -445,7 +445,9 @@ bool GrDefaultPathRenderer::internalDrawPath(const SkPath& path,
         }
     }
 
-    {
+    SkRect devBounds;
+    GetPathDevBounds(path, drawState->getRenderTarget(), viewM, &devBounds);
+
     for (int p = 0; p < passCount; ++p) {
         drawState->setDrawFace(drawFace[p]);
         if (NULL != passes[p]) {
@@ -460,10 +462,8 @@ bool GrDefaultPathRenderer::internalDrawPath(const SkPath& path,
             GrDrawState::AutoDeviceCoordDraw adcd;
             if (reverse) {
                 GrAssert(NULL != drawState->getRenderTarget());
-                // draw over the whole world.
+                // draw over the dev bounds (which will be the whole dst surface for inv fill).
-                bounds.setLTRB(0, 0,
+                bounds = devBounds;
-                               SkIntToScalar(drawState->getRenderTarget()->width()),
-                               SkIntToScalar(drawState->getRenderTarget()->height()));
                 SkMatrix vmi;
                 // mapRect through persp matrix may not be correct
                 if (!drawState->getViewMatrix().hasPerspective() &&
@@ -483,13 +483,12 @@ bool GrDefaultPathRenderer::internalDrawPath(const SkPath& path,
             }
             if (indexCnt) {
                 target->drawIndexed(primType, 0, 0,
-                                    vertexCnt, indexCnt);
+                                    vertexCnt, indexCnt, &devBounds);
             } else {
-                target->drawNonIndexed(primType, 0, vertexCnt);
+                target->drawNonIndexed(primType, 0, vertexCnt, &devBounds);
             }
         }
     }
-    }
     return true;
 }
 

src/gpu/GrPathRenderer.cpp

@@ -12,3 +12,15 @@ SK_DEFINE_INST_COUNT(GrPathRenderer)
 
 GrPathRenderer::GrPathRenderer() {
 }
+
+void GrPathRenderer::GetPathDevBounds(const SkPath& path,
+                                      int devW, int devH,
+                                      const SkMatrix& matrix,
+                                      SkRect* bounds) {
+    if (path.isInverseFillType()) {
+        *bounds = SkRect::MakeWH(SkIntToScalar(devW), SkIntToScalar(devH));
+        return;
+    }
+    *bounds = path.getBounds();
+    matrix.mapRect(bounds);
+}

src/gpu/GrPathRenderer.h

@@ -1,4 +1,4 @@
-
+  
 /*
  * Copyright 2011 Google Inc.
  *
@@ -173,6 +173,22 @@ protected:
         this->drawPath(path, stroke, target, false);
     }
 
+    // Helper for getting the device bounds of a path. Inverse filled paths will have bounds set
+    // by devSize. Non-inverse path bounds will not necessarily be clipped to devSize.
+    static void GetPathDevBounds(const SkPath& path,
+                                 int devW,
+                                 int devH,
+                                 const SkMatrix& matrix,
+                                 SkRect* bounds);
+
+    // Helper version that gets the dev width and height from a GrSurface.
+    static void GetPathDevBounds(const SkPath& path,
+                                 const GrSurface* device,
+                                 const SkMatrix& matrix,
+                                 SkRect* bounds) {
+        GetPathDevBounds(path, device->width(), device->height(), matrix, bounds);
+    }
+
 private:
 
     typedef GrRefCnt INHERITED;