Revert of Remove GP from drawstate, revision of invariant output for GP

gm/convexpolyeffect.cpp

 
 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 // This test only works with the GPU backend.
 
@@ skipping 115 matching lines @@
                 m.setTranslate(x, y);
                 path->transform(m, &p);
 
                 GrPrimitiveEdgeType edgeType = (GrPrimitiveEdgeType) et;
                 SkAutoTUnref<GrFragmentProcessor> fp(GrConvexPolyEffect::Create(edgeType, p));
                 if (!fp) {
                     continue;
                 }
 
                 GrDrawState ds;
-                SkAutoTUnref<const GrGeometryProcessor> gp(
-                        GrDefaultGeoProcFactory::Create(0xff000000));
+                const GrGeometryProcessor* gp = GrDefaultGeoProcFactory::Create(0xff000000);
+                ds.setGeometryProcessor(gp)->unref();
                 ds.addCoverageProcessor(fp);
                 ds.setIdentityViewMatrix();
                 ds.setRenderTarget(rt);
 
                 GrDrawTarget::AutoReleaseGeometry geo(tt.target(), 4, gp->getVertexStride(), 0);
                 SkASSERT(gp->getVertexStride() == sizeof(SkPoint));
                 SkPoint* verts = reinterpret_cast<SkPoint*>(geo.vertices());
 
                 SkRect bounds = p.getBounds();
                 // Make sure any artifacts around the exterior of path are visible by using overly
                 // conservative bounding geometry.
                 bounds.outset(5.f, 5.f);
                 bounds.toQuad(verts);
 
                 tt.target()->setIndexSourceToBuffer(context->getQuadIndexBuffer());
-                tt.target()->drawIndexed(&ds, gp, kTriangleFan_GrPrimitiveType, 0, 0, 4, 6);
+                tt.target()->drawIndexed(&ds, kTriangleFan_GrPrimitiveType, 0, 0, 4, 6);
 
                 x += SkScalarCeilToScalar(path->getBounds().width() + 10.f);
             }
 
             // Draw AA and non AA paths using normal API for reference.
             canvas->save();
             canvas->translate(x, y);
             SkPaint paint;
             canvas->drawPath(*path, paint);
             canvas->translate(path->getBounds().width() + 10.f, 0);
@@ skipping 19 matching lines @@
                 }
                 SkRect rect = *iter.get();
                 rect.offset(x, y);
                 GrPrimitiveEdgeType edgeType = (GrPrimitiveEdgeType) et;
                 SkAutoTUnref<GrFragmentProcessor> fp(GrConvexPolyEffect::Create(edgeType, rect));
                 if (!fp) {
                     continue;
                 }
 
                 GrDrawState ds;
-                SkAutoTUnref<const GrGeometryProcessor> gp(
-                        GrDefaultGeoProcFactory::Create(0xff000000));
+                const GrGeometryProcessor* gp = GrDefaultGeoProcFactory::Create(0xff000000);
+                ds.setGeometryProcessor(gp)->unref();
                 ds.addCoverageProcessor(fp);
                 ds.setIdentityViewMatrix();
                 ds.setRenderTarget(rt);
 
                 GrDrawTarget::AutoReleaseGeometry geo(tt.target(), 4, gp->getVertexStride(), 0);
                 SkASSERT(gp->getVertexStride() == sizeof(SkPoint));
                 SkPoint* verts = reinterpret_cast<SkPoint*>(geo.vertices());
 
                 SkRect bounds = rect;
                 bounds.outset(5.f, 5.f);
                 bounds.toQuad(verts);
 
                 tt.target()->setIndexSourceToBuffer(context->getQuadIndexBuffer());
-                tt.target()->drawIndexed(&ds, gp, kTriangleFan_GrPrimitiveType, 0, 0, 4, 6);
+                tt.target()->drawIndexed(&ds, kTriangleFan_GrPrimitiveType, 0, 0, 4, 6);
 
                 x += SkScalarCeilToScalar(rect.width() + 10.f);
             }
 
             // Draw rect without and with AA using normal API for reference
             canvas->save();
             canvas->translate(x, y);
             SkPaint paint;
             canvas->drawRect(*iter.get(), paint);
             x += SkScalarCeilToScalar(iter.get()->width() + 10.f);
             paint.setAntiAlias(true);
             canvas->drawRect(*iter.get(), paint);
             canvas->restore();
 
             y += SkScalarCeilToScalar(iter.get()->height() + 20.f);
         }
     }
 
 private:
     SkTLList<SkPath> fPaths;
     SkTLList<SkRect> fRects;
 
     typedef GM INHERITED;
 };
 
 DEF_GM( return SkNEW(ConvexPolyEffect); )
 }
 
 #endif