diff options
| author |  joshualitt <joshualitt@chromium.org> | 2014-11-14 16:00:38 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-11-14 16:00:38 -0800 |
| commit | 5478d427c6e67c986a3390162c8fec77c466058a (patch) | |
| tree | 2dabf11f5510aedbb8d59dc607088af0e4b7ab36 /gm | |
| parent | 28562a01999d49abcbd60abbfba06f2ac8046f6d (diff) | |
Push creation of default GP to the caller
TBR=
BUG=skia:
Review URL: https://codereview.chromium.org/715903002
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/convexpolyeffect.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/gm/convexpolyeffect.cpp b/gm/convexpolyeffect.cpp index b4206d2708..9f4c48b4eb 100644 --- a/gm/convexpolyeffect.cpp +++ b/gm/convexpolyeffect.cpp @@ -13,6 +13,7 @@ #if SK_SUPPORT_GPU #include "GrContext.h" +#include "GrDefaultGeoProcFactory.h" #include "GrPathUtils.h" #include "GrTest.h" #include "SkColorPriv.h" @@ -132,23 +133,21 @@ protected: if (!fp) { continue; } + drawState->setGeometryProcessor(GrDefaultGeoProcFactory::Create(false))->unref(); drawState->addCoverageProcessor(fp); drawState->setIdentityViewMatrix(); drawState->setRenderTarget(rt); drawState->setColor(0xff000000); - // TODO hack GrDrawTarget::AutoReleaseGeometry geo(tt.target(), 4, 0); SkPoint* verts = reinterpret_cast<SkPoint*>(geo.vertices()); - //SkPoint verts[4]; 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()->setVertexSourceToArray(verts, 4); tt.target()->setIndexSourceToBuffer(context->getQuadIndexBuffer()); tt.target()->drawIndexed(kTriangleFan_GrPrimitiveType, 0, 0, 4, 6); @@ -190,21 +189,19 @@ protected: } GrDrawState* drawState = tt.target()->drawState(); + drawState->setGeometryProcessor(GrDefaultGeoProcFactory::Create(false))->unref(); drawState->addCoverageProcessor(fp); drawState->setIdentityViewMatrix(); drawState->setRenderTarget(rt); drawState->setColor(0xff000000); - // TODO hack GrDrawTarget::AutoReleaseGeometry geo(tt.target(), 4, 0); SkPoint* verts = reinterpret_cast<SkPoint*>(geo.vertices()); - //SkPoint verts[4]; SkRect bounds = rect; bounds.outset(5.f, 5.f); bounds.toQuad(verts); - //tt.target()->setVertexSourceToArray(verts, 4); tt.target()->setIndexSourceToBuffer(context->getQuadIndexBuffer()); tt.target()->drawIndexed(kTriangleFan_GrPrimitiveType, 0, 0, 4, 6); |