From 1ec03f33cf493352174c748662d4a3cca29f78fd Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Wed, 14 Jun 2017 09:49:26 -0400 Subject: 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 Reviewed-by: Robert Phillips --- tests/ProcessorTest.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/ProcessorTest.cpp') 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 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)); } -- cgit v1.2.3