commit c6bc58eded89b0c0a36b8e20e193c200f297a0da
author joshualitt <joshualitt@chromium.org> Wed Dec 10 13:48:57 2014 -0800
committer Commit bot <commit-bot@chromium.org> Wed Dec 10 13:48:57 2014 -0800
tree 3de559baf8eecee6f6576c9b6deee39fb8258775
parent 04b49c31789201fbef969f5598a286187920dd56

Remove GP from drawstate, revision of invariant output for GP

BUG=skia:

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

gm/convexpolyeffect.cpp

diff --git a/gm/convexpolyeffect.cpp b/gm/convexpolyeffect.cpp
index 365660d..03b9ad2 100644
--- a/gm/convexpolyeffect.cpp
+++ b/gm/convexpolyeffect.cpp
@@ -133,8 +133,8 @@
                 }
 
                 GrDrawState ds;
-                const GrGeometryProcessor* gp = GrDefaultGeoProcFactory::Create(0xff000000);
-                ds.setGeometryProcessor(gp)->unref();
+                SkAutoTUnref<const GrGeometryProcessor> gp(
+                        GrDefaultGeoProcFactory::Create(0xff000000));
                 ds.addCoverageProcessor(fp);
                 ds.setIdentityViewMatrix();
                 ds.setRenderTarget(rt);
@@ -150,7 +150,7 @@
                 bounds.toQuad(verts);
 
                 tt.target()->setIndexSourceToBuffer(context->getQuadIndexBuffer());
-                tt.target()->drawIndexed(&ds, kTriangleFan_GrPrimitiveType, 0, 0, 4, 6);
+                tt.target()->drawIndexed(&ds, gp, kTriangleFan_GrPrimitiveType, 0, 0, 4, 6);
 
                 x += SkScalarCeilToScalar(path->getBounds().width() + 10.f);
             }
@@ -190,8 +190,8 @@
                 }
 
                 GrDrawState ds;
-                const GrGeometryProcessor* gp = GrDefaultGeoProcFactory::Create(0xff000000);
-                ds.setGeometryProcessor(gp)->unref();
+                SkAutoTUnref<const GrGeometryProcessor> gp(
+                        GrDefaultGeoProcFactory::Create(0xff000000));
                 ds.addCoverageProcessor(fp);
                 ds.setIdentityViewMatrix();
                 ds.setRenderTarget(rt);
@@ -205,7 +205,7 @@
                 bounds.toQuad(verts);
 
                 tt.target()->setIndexSourceToBuffer(context->getQuadIndexBuffer());
-                tt.target()->drawIndexed(&ds, kTriangleFan_GrPrimitiveType, 0, 0, 4, 6);
+                tt.target()->drawIndexed(&ds, gp, kTriangleFan_GrPrimitiveType, 0, 0, 4, 6);
 
                 x += SkScalarCeilToScalar(rect.width() + 10.f);
             }