diff options
author | Brian Salomon <bsalomon@google.com> | 2017-05-08 10:43:33 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-10 14:48:47 +0000 |
commit | ac70f84e7f4fc9ddd344753b92cdf4be540d32bf (patch) | |
tree | 4b813dd3d6fae01afe6727a6897faf4c31fb240c /gm/rrects.cpp | |
parent | 0418a888d31689f5358b6b90fd09287aeba368db (diff) |
Move all non-AA fill rect ops off of GrLegacyMeshDrawOp.
This adds perspective to GrNewNonAAFillRectOp, renames it to GrNonAAFillRectOp, and deletes the previous version of that namespace.
Change-Id: I20f35bf019f9c9105e6ec83dda11328451138109
Reviewed-on: https://skia-review.googlesource.com/15634
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'gm/rrects.cpp')
-rw-r--r-- | gm/rrects.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/gm/rrects.cpp b/gm/rrects.cpp index 8219681b14..23f576b5e9 100644 --- a/gm/rrects.cpp +++ b/gm/rrects.cpp @@ -12,7 +12,7 @@ #include "GrRenderTargetContextPriv.h" #include "effects/GrRRectEffect.h" #include "ops/GrDrawOp.h" -#include "ops/GrRectOpFactory.h" +#include "ops/GrNonAAFillRectOp.h" #endif #include "SkRRect.h" @@ -111,14 +111,18 @@ protected: GrPaint grPaint; grPaint.setXPFactory(GrPorterDuffXPFactory::Get(SkBlendMode::kSrc)); grPaint.addCoverageFragmentProcessor(std::move(fp)); + grPaint.setColor4f(GrColor4f(0, 0, 0, 1.f)); SkRect bounds = rrect.getBounds(); bounds.outset(2.f, 2.f); - std::unique_ptr<GrLegacyMeshDrawOp> op(GrRectOpFactory::MakeNonAAFill( - 0xff000000, SkMatrix::I(), bounds, nullptr, nullptr)); - renderTargetContext->priv().testingOnly_addLegacyMeshDrawOp( - std::move(grPaint), GrAAType::kNone, std::move(op)); + renderTargetContext->priv().testingOnly_addDrawOp( + GrNonAAFillRectOp::Make(std::move(grPaint), + SkMatrix::I(), + bounds, + nullptr, + nullptr, + GrAAType::kNone)); } else { drew = false; } |