diff options
| author |  joshualitt <joshualitt@chromium.org> | 2015-08-03 11:35:28 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-08-03 11:35:29 -0700 |
| commit | df0c55785033c191d2d509c22662861588e4acd8 (patch) | |
| tree | 511d1c06cedea6809bfd59eea879fe74a6bf85bf /gm/convexpolyeffect.cpp | |
| parent | f23190078b7139d63a639a8acfc21ddce183fd0a (diff) | |
Use new API everywhere for GrDefaultGeoProcFactory
BUG=skia:
Committed: https://skia.googlesource.com/skia/+/801823b3d825d96baadeb9077c5ed1a8ada05cf2
Review URL: https://codereview.chromium.org/1261083003
Diffstat (limited to 'gm/convexpolyeffect.cpp')
| -rw-r--r-- | gm/convexpolyeffect.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gm/convexpolyeffect.cpp b/gm/convexpolyeffect.cpp index 9891f87215..1599e7a65d 100644 --- a/gm/convexpolyeffect.cpp +++ b/gm/convexpolyeffect.cpp @@ -147,6 +147,7 @@ protected: } void onDraw(SkCanvas* canvas) override { + using namespace GrDefaultGeoProcFactory; GrRenderTarget* rt = canvas->internal_private_accessTopLayerRenderTarget(); if (NULL == rt) { this->drawGpuOnlyMessage(canvas); @@ -157,10 +158,11 @@ protected: return; } - static const GrColor color = 0xff000000; + Color color(0xff000000); + Coverage coverage(Coverage::kSolid_Type); + LocalCoords localCoords(LocalCoords::kUnused_Type); SkAutoTUnref<const GrGeometryProcessor> gp( - GrDefaultGeoProcFactory::Create(GrDefaultGeoProcFactory::kPosition_GPType, color, - false, false)); + GrDefaultGeoProcFactory::Create(color, coverage, localCoords, SkMatrix::I())); SkScalar y = 0; for (SkTLList<SkPath>::Iter iter(fPaths, SkTLList<SkPath>::Iter::kHead_IterStart); @@ -191,7 +193,7 @@ protected: pipelineBuilder.setRenderTarget(rt); ConvexPolyTestBatch::Geometry geometry; - geometry.fColor = color; + geometry.fColor = color.fColor; geometry.fBounds = p.getBounds(); SkAutoTUnref<GrBatch> batch(ConvexPolyTestBatch::Create(gp, geometry)); @@ -240,7 +242,7 @@ protected: pipelineBuilder.setRenderTarget(rt); ConvexPolyTestBatch::Geometry geometry; - geometry.fColor = color; + geometry.fColor = color.fColor; geometry.fBounds = rect; SkAutoTUnref<GrBatch> batch(ConvexPolyTestBatch::Create(gp, geometry)); |