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 /tests | |
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 '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 528dd61562..7f9dff738b 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/GrNonAAFillRectOp.h" +#include "ops/GrRectOpFactory.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 = GrNonAAFillRectOp::Make(std::move(paint), SkMatrix::I(), - SkRect::MakeWH(rtc->width(), rtc->height()), nullptr, nullptr, - GrAAType::kNone); + auto op = GrRectOpFactory::MakeNonAAFill(std::move(paint), SkMatrix::I(), + SkRect::MakeWH(rtc->width(), rtc->height()), + GrAAType::kNone); rtc->addDrawOp(GrNoClip(), std::move(op)); } |