diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-06-14 19:08:01 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-14 23:32:05 +0000 |
| commit | a0485d94529905e76320b7aa941a0d94b5578ac2 (patch) | |
| tree | c851472453a20c78f2c3669ba9021ab0e9b02586 /src/gpu/GrSWMaskHelper.cpp | |
| parent | 699b8732bf7b1ea3fbcce0b77a60f96fc4f8446c (diff) | |
Revert "Converts remaining rect ops from GrLegacyMeshDrawOp to GrMeshDrawOp subclasses."
This reverts commit 1ec03f33cf493352174c748662d4a3cca29f78fd.
Revert "Fix logic reversal in NonAAFillRectOp test factory"
This reverts commit 89c1c2552ec5b9ad8949988f7c9532a298b55987.
Reason: Unexpected GM changes.
Bug: skia:
Change-Id: I9edf5f0e4a54b5cad86bd438a505aaaef38563de
Reviewed-on: https://skia-review.googlesource.com/19960
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/GrSWMaskHelper.cpp')
| -rw-r--r-- | src/gpu/GrSWMaskHelper.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/gpu/GrSWMaskHelper.cpp b/src/gpu/GrSWMaskHelper.cpp index fb66886098..141f35710e 100644 --- a/src/gpu/GrSWMaskHelper.cpp +++ b/src/gpu/GrSWMaskHelper.cpp @@ -6,6 +6,7 @@ */ #include "GrSWMaskHelper.h" + #include "GrCaps.h" #include "GrContext.h" #include "GrContextPriv.h" @@ -14,9 +15,11 @@ #include "GrShape.h" #include "GrSurfaceContext.h" #include "GrTextureProxy.h" -#include "SkDistanceFieldGen.h" #include "ops/GrDrawOp.h" -#include "ops/GrRectOpFactory.h" + +#include "SkDistanceFieldGen.h" + +#include "ops/GrNonAAFillRectOp.h" /* * Convert a boolean operation into a transfer mode code @@ -173,8 +176,7 @@ void GrSWMaskHelper::DrawToTargetWithShapeMask(sk_sp<GrTextureProxy> proxy, paint.addCoverageFragmentProcessor(GrSimpleTextureEffect::Make( resourceProvider, std::move(proxy), nullptr, maskMatrix, GrSamplerParams::kNone_FilterMode)); - renderTargetContext->addDrawOp(clip, - GrRectOpFactory::MakeNonAAFillWithLocalMatrix( - std::move(paint), SkMatrix::I(), invert, dstRect, - GrAAType::kNone, &userStencilSettings)); + renderTargetContext->addDrawOp( + clip, GrNonAAFillRectOp::Make(std::move(paint), SkMatrix::I(), dstRect, nullptr, + &invert, GrAAType::kNone, &userStencilSettings)); } |