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/yuvtorgbeffect.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/yuvtorgbeffect.cpp')
| -rw-r--r-- | gm/yuvtorgbeffect.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gm/yuvtorgbeffect.cpp b/gm/yuvtorgbeffect.cpp index fda0565559..87d76cb2ac 100644 --- a/gm/yuvtorgbeffect.cpp +++ b/gm/yuvtorgbeffect.cpp @@ -132,9 +132,9 @@ protected: grPaint.addColorFragmentProcessor(std::move(fp)); SkMatrix viewMatrix; viewMatrix.setTranslate(x, y); - std::unique_ptr<GrMeshDrawOp> op(GrRectOpFactory::MakeNonAAFill( + std::unique_ptr<GrLegacyMeshDrawOp> op(GrRectOpFactory::MakeNonAAFill( GrColor_WHITE, viewMatrix, renderRect, nullptr, nullptr)); - renderTargetContext->priv().testingOnly_addMeshDrawOp( + renderTargetContext->priv().testingOnly_addLegacyMeshDrawOp( std::move(grPaint), GrAAType::kNone, std::move(op)); } x += renderRect.width() + kTestPad; @@ -257,9 +257,9 @@ protected: SkMatrix viewMatrix; viewMatrix.setTranslate(x, y); grPaint.addColorFragmentProcessor(fp); - std::unique_ptr<GrMeshDrawOp> op(GrRectOpFactory::MakeNonAAFill( + std::unique_ptr<GrLegacyMeshDrawOp> op(GrRectOpFactory::MakeNonAAFill( GrColor_WHITE, viewMatrix, renderRect, nullptr, nullptr)); - renderTargetContext->priv().testingOnly_addMeshDrawOp( + renderTargetContext->priv().testingOnly_addLegacyMeshDrawOp( std::move(grPaint), GrAAType::kNone, std::move(op)); } } |