diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-04-03 10:38:00 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-03 15:13:48 +0000 |
| commit | d3ccb0a37f0e62c84fdcd6a77b7b15476b04db7a (patch) | |
| tree | a050c5624e60eee8193f4aa015269ad3bf14e329 /gm/rrects.cpp | |
| parent | dffe9827b18444d1426859d9035f9f0087201f44 (diff) | |
Move pipeline handling out of GrMeshDrawOp.
The monolithic GrPipeline is moved to a subclass GrLegacyDrawMeshOp.
The pipeline used to record a GrMesh draw in a GrMeshDrawOp must now be passed rather than implicitly using the op's pipeline.
Change-Id: I50d77e4dcc8d91a523fa7566ce43a9a291174706
Reviewed-on: https://skia-review.googlesource.com/11002
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'gm/rrects.cpp')
| -rw-r--r-- | gm/rrects.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gm/rrects.cpp b/gm/rrects.cpp index ac66d521cb..8219681b14 100644 --- a/gm/rrects.cpp +++ b/gm/rrects.cpp @@ -115,9 +115,9 @@ protected: SkRect bounds = rrect.getBounds(); bounds.outset(2.f, 2.f); - std::unique_ptr<GrMeshDrawOp> op(GrRectOpFactory::MakeNonAAFill( + std::unique_ptr<GrLegacyMeshDrawOp> op(GrRectOpFactory::MakeNonAAFill( 0xff000000, SkMatrix::I(), bounds, nullptr, nullptr)); - renderTargetContext->priv().testingOnly_addMeshDrawOp( + renderTargetContext->priv().testingOnly_addLegacyMeshDrawOp( std::move(grPaint), GrAAType::kNone, std::move(op)); } else { drew = false; |