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 <brianosman@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
diff --git a/tests/ProcessorTest.cpp b/tests/ProcessorTest.cpp
index 29ea29f..ee89ff3 100644
--- a/tests/ProcessorTest.cpp
+++ b/tests/ProcessorTest.cpp
@@ -9,6 +9,7 @@
#include "Test.h"
#if SK_SUPPORT_GPU
+#include <random>
#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 <random>
namespace {
class TestOp : public GrTestMeshDrawOp {
@@ -266,11 +266,11 @@
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"