diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-06-15 09:59:23 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-15 16:49:40 +0000 |
| commit | baaf439eb5d08097d794f13800e5bf7ce8885f95 (patch) | |
| tree | 16c3edc2f01918e62fd58c7034d8885932452b67 /gm/yuvtorgbeffect.cpp | |
| parent | 1a0882e7ee9c7929f0079d3b335efb9a664f605b (diff) | |
Revert "Revert "Converts remaining rect ops from GrLegacyMeshDrawOp to GrMeshDrawOp subclasses.""
This reverts commit a0485d94529905e76320b7aa941a0d94b5578ac2.
Bug: skia:
Change-Id: If50b2d1af285a6c3c943373bb7258b56e1af28d6
Reviewed-on: https://skia-review.googlesource.com/19961
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'gm/yuvtorgbeffect.cpp')
| -rw-r--r-- | gm/yuvtorgbeffect.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/gm/yuvtorgbeffect.cpp b/gm/yuvtorgbeffect.cpp index eb2e422286..c6effed793 100644 --- a/gm/yuvtorgbeffect.cpp +++ b/gm/yuvtorgbeffect.cpp @@ -19,7 +19,7 @@ #include "SkGradientShader.h" #include "effects/GrYUVEffect.h" #include "ops/GrDrawOp.h" -#include "ops/GrNonAAFillRectOp.h" +#include "ops/GrRectOpFactory.h" #define YSIZE 8 #define USIZE 4 @@ -133,8 +133,8 @@ protected: SkMatrix viewMatrix; viewMatrix.setTranslate(x, y); renderTargetContext->priv().testingOnly_addDrawOp( - GrNonAAFillRectOp::Make(std::move(grPaint), viewMatrix, renderRect, - nullptr, nullptr, GrAAType::kNone)); + GrRectOpFactory::MakeNonAAFill(std::move(grPaint), viewMatrix, + renderRect, GrAAType::kNone)); } x += renderRect.width() + kTestPad; } @@ -256,9 +256,8 @@ protected: SkMatrix viewMatrix; viewMatrix.setTranslate(x, y); grPaint.addColorFragmentProcessor(fp); - renderTargetContext->priv().testingOnly_addDrawOp( - GrNonAAFillRectOp::Make(std::move(grPaint), viewMatrix, renderRect, nullptr, - nullptr, GrAAType::kNone)); + renderTargetContext->priv().testingOnly_addDrawOp(GrRectOpFactory::MakeNonAAFill( + std::move(grPaint), viewMatrix, renderRect, GrAAType::kNone)); } } } |