diff options
author | Robert Phillips <robertphillips@google.com> | 2017-09-14 08:27:37 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-09-14 13:02:31 +0000 |
commit | 5f567c78dddd08f65c9969e032ec81d0b5799876 (patch) | |
tree | 285ff6427509c288adf319fffc700b3715a78441 | |
parent | 177569b1fe8b4d1c3aed6322a7e531513c2f9928 (diff) |
Finish restoring GrOpList DAG
Change-Id: I2a674ce7442a444a78a53144279e88ba744eaf48
Reviewed-on: https://skia-review.googlesource.com/46462
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
-rw-r--r-- | src/gpu/GrOpList.cpp | 2 | ||||
-rw-r--r-- | src/gpu/ccpr/GrCoverageCountingPathRenderer.h | 7 | ||||
-rw-r--r-- | tests/ProcessorTest.cpp | 8 |
3 files changed, 13 insertions, 4 deletions
diff --git a/src/gpu/GrOpList.cpp b/src/gpu/GrOpList.cpp index 17b0f10ebf..4bc22e4ed9 100644 --- a/src/gpu/GrOpList.cpp +++ b/src/gpu/GrOpList.cpp @@ -39,8 +39,8 @@ GrOpList::GrOpList(GrResourceProvider* resourceProvider, // here so that the GrSurfaces are created in an order that preserves the GrSurface // re-use assumptions. fTarget.get()->instantiate(resourceProvider); - fTarget.markPendingIO(); #endif + fTarget.markPendingIO(); } GrOpList::~GrOpList() { diff --git a/src/gpu/ccpr/GrCoverageCountingPathRenderer.h b/src/gpu/ccpr/GrCoverageCountingPathRenderer.h index d7617281a2..8cbad488f6 100644 --- a/src/gpu/ccpr/GrCoverageCountingPathRenderer.h +++ b/src/gpu/ccpr/GrCoverageCountingPathRenderer.h @@ -55,8 +55,13 @@ public: DrawPathsOp(GrCoverageCountingPathRenderer*, const DrawPathArgs&, GrColor); - // GrDrawOp overrides. const char* name() const override { return "GrCoverageCountingPathRenderer::DrawPathsOp"; } + + void visitProxies(VisitProxyFunc func) const override { + fProcessors.visitProxies(func); + } + + // GrDrawOp overrides. FixedFunctionFlags fixedFunctionFlags() const override { return FixedFunctionFlags::kNone; } RequiresDstTexture finalize(const GrCaps&, const GrAppliedClip*) override; void wasRecorded(GrRenderTargetOpList*) override; diff --git a/tests/ProcessorTest.cpp b/tests/ProcessorTest.cpp index 161192e487..f115bbb0ac 100644 --- a/tests/ProcessorTest.cpp +++ b/tests/ProcessorTest.cpp @@ -25,12 +25,16 @@ namespace { class TestOp : public GrMeshDrawOp { public: DEFINE_OP_CLASS_ID - const char* name() const override { return "TestOp"; } - static std::unique_ptr<GrDrawOp> Make(std::unique_ptr<GrFragmentProcessor> fp) { return std::unique_ptr<GrDrawOp>(new TestOp(std::move(fp))); } + const char* name() const override { return "TestOp"; } + + void visitProxies(VisitProxyFunc func) const override { + fProcessors.visitProxies(func); + } + FixedFunctionFlags fixedFunctionFlags() const override { return FixedFunctionFlags::kNone; } RequiresDstTexture finalize(const GrCaps& caps, const GrAppliedClip* clip) override { |