diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-06-14 09:49:26 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-14 20:26:51 +0000 |
| commit | 1ec03f33cf493352174c748662d4a3cca29f78fd (patch) | |
| tree | 352c8f7fe900ea4c71846f3bc45a7f5a26d6469e /gm/rrects.cpp | |
| parent | d99148623b1daecc54eca1e2df607a49f86c6fae (diff) | |
Converts remaining rect ops from GrLegacyMeshDrawOp to GrMeshDrawOp subclasses.
Consolidates op factory functions to a rewritten GrRectOpFactory.
Removes GrRenderTargetContext::drawNonAAFilledRect() in favor of creating and adding ops directly by the callers.
Change-Id: I57e5fc739bf4e92b4a4710c739e6d22cce82a479
Reviewed-on: https://skia-review.googlesource.com/17711
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 | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/gm/rrects.cpp b/gm/rrects.cpp index 23f576b5e9..3124895a49 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/GrNonAAFillRectOp.h" +#include "ops/GrRectOpFactory.h" #endif #include "SkRRect.h" @@ -117,12 +117,9 @@ protected: bounds.outset(2.f, 2.f); renderTargetContext->priv().testingOnly_addDrawOp( - GrNonAAFillRectOp::Make(std::move(grPaint), - SkMatrix::I(), - bounds, - nullptr, - nullptr, - GrAAType::kNone)); + GrRectOpFactory::MakeNonAAFill(std::move(grPaint), + SkMatrix::I(), bounds, + GrAAType::kNone)); } else { drew = false; } |