diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-04-03 10:38:00 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-03 15:13:48 +0000 |
| commit | d3ccb0a37f0e62c84fdcd6a77b7b15476b04db7a (patch) | |
| tree | a050c5624e60eee8193f4aa015269ad3bf14e329 /tests/ProcessorTest.cpp | |
| parent | dffe9827b18444d1426859d9035f9f0087201f44 (diff) | |
Move pipeline handling out of GrMeshDrawOp.
The monolithic GrPipeline is moved to a subclass GrLegacyDrawMeshOp.
The pipeline used to record a GrMesh draw in a GrMeshDrawOp must now be passed rather than implicitly using the op's pipeline.
Change-Id: I50d77e4dcc8d91a523fa7566ce43a9a291174706
Reviewed-on: https://skia-review.googlesource.com/11002
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'tests/ProcessorTest.cpp')
| -rw-r--r-- | tests/ProcessorTest.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/ProcessorTest.cpp b/tests/ProcessorTest.cpp index 140ff15cfd..241c0fa4e3 100644 --- a/tests/ProcessorTest.cpp +++ b/tests/ProcessorTest.cpp @@ -28,8 +28,8 @@ public: DEFINE_OP_CLASS_ID const char* name() const override { return "TestOp"; } - static std::unique_ptr<GrMeshDrawOp> Make() { - return std::unique_ptr<GrMeshDrawOp>(new TestOp); + static std::unique_ptr<GrLegacyMeshDrawOp> Make() { + return std::unique_ptr<GrLegacyMeshDrawOp>(new TestOp); } private: @@ -170,7 +170,7 @@ DEF_GPUTEST_FOR_ALL_CONTEXTS(ProcessorRefTest, reporter, ctxInfo) { images.emplace_back(texture3, GrIOType::kWrite_GrIOType); images.emplace_back(texture4, GrIOType::kRW_GrIOType); } - std::unique_ptr<GrMeshDrawOp> op(TestOp::Make()); + std::unique_ptr<GrLegacyMeshDrawOp> op(TestOp::Make()); GrPaint paint; auto fp = TestFP::Make(context, std::move(proxies), std::move(buffers), std::move(images)); @@ -178,7 +178,7 @@ DEF_GPUTEST_FOR_ALL_CONTEXTS(ProcessorRefTest, reporter, ctxInfo) { fp = TestFP::Make(std::move(fp)); } paint.addColorFragmentProcessor(std::move(fp)); - renderTargetContext->priv().testingOnly_addMeshDrawOp( + renderTargetContext->priv().testingOnly_addLegacyMeshDrawOp( std::move(paint), GrAAType::kNone, std::move(op)); } int refCnt, readCnt, writeCnt; @@ -270,7 +270,7 @@ void test_draw_op(GrRenderTargetContext* rtc, sk_sp<GrFragmentProcessor> fp, auto op = GrNonAAFillRectOp::Make(GrColor_WHITE, SkMatrix::I(), SkRect::MakeWH(rtc->width(), rtc->height()), nullptr, nullptr); - rtc->addMeshDrawOp(pb, GrNoClip(), std::move(op)); + rtc->addLegacyMeshDrawOp(pb, GrNoClip(), std::move(op)); } #include "SkCommandLineFlags.h" |