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 /tests | |
| 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 'tests')
| -rw-r--r-- | tests/ProcessorTest.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/ProcessorTest.cpp b/tests/ProcessorTest.cpp index 7f9dff738b..528dd61562 100644 --- a/tests/ProcessorTest.cpp +++ b/tests/ProcessorTest.cpp @@ -19,7 +19,7 @@ #include "GrResourceProvider.h" #include "glsl/GrGLSLFragmentProcessor.h" #include "glsl/GrGLSLFragmentShaderBuilder.h" -#include "ops/GrRectOpFactory.h" +#include "ops/GrNonAAFillRectOp.h" #include "ops/GrTestMeshDrawOp.h" namespace { @@ -270,9 +270,9 @@ void test_draw_op(GrRenderTargetContext* rtc, sk_sp<GrFragmentProcessor> fp, paint.addColorFragmentProcessor(std::move(fp)); paint.setPorterDuffXPFactory(SkBlendMode::kSrc); - auto op = GrRectOpFactory::MakeNonAAFill(std::move(paint), SkMatrix::I(), - SkRect::MakeWH(rtc->width(), rtc->height()), - GrAAType::kNone); + auto op = GrNonAAFillRectOp::Make(std::move(paint), SkMatrix::I(), + SkRect::MakeWH(rtc->width(), rtc->height()), nullptr, nullptr, + GrAAType::kNone); rtc->addDrawOp(GrNoClip(), std::move(op)); } |