From ac70f84e7f4fc9ddd344753b92cdf4be540d32bf Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Mon, 8 May 2017 10:43:33 -0400 Subject: Move all non-AA fill rect ops off of GrLegacyMeshDrawOp. This adds perspective to GrNewNonAAFillRectOp, renames it to GrNonAAFillRectOp, and deletes the previous version of that namespace. Change-Id: I20f35bf019f9c9105e6ec83dda11328451138109 Reviewed-on: https://skia-review.googlesource.com/15634 Reviewed-by: Brian Osman Commit-Queue: Brian Salomon --- tests/ProcessorTest.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tests/ProcessorTest.cpp') diff --git a/tests/ProcessorTest.cpp b/tests/ProcessorTest.cpp index 29ea29f9a2..ee89ff3739 100644 --- a/tests/ProcessorTest.cpp +++ b/tests/ProcessorTest.cpp @@ -9,6 +9,7 @@ #include "Test.h" #if SK_SUPPORT_GPU +#include #include "GrClip.h" #include "GrContext.h" #include "GrGpuResource.h" @@ -20,7 +21,6 @@ #include "glsl/GrGLSLFragmentShaderBuilder.h" #include "ops/GrNonAAFillRectOp.h" #include "ops/GrTestMeshDrawOp.h" -#include namespace { class TestOp : public GrTestMeshDrawOp { @@ -266,11 +266,11 @@ void test_draw_op(GrRenderTargetContext* rtc, sk_sp fp, nullptr, SkMatrix::I()); paint.addColorFragmentProcessor(std::move(fp)); paint.setPorterDuffXPFactory(SkBlendMode::kSrc); - GrPipelineBuilder pb(std::move(paint), GrAAType::kNone); - auto op = - GrNonAAFillRectOp::Make(GrColor_WHITE, SkMatrix::I(), - SkRect::MakeWH(rtc->width(), rtc->height()), nullptr, nullptr); - rtc->addLegacyMeshDrawOp(std::move(pb), GrNoClip(), std::move(op)); + + 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)); } #include "SkCommandLineFlags.h" -- cgit v1.2.3