diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-06-23 12:37:20 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-26 16:52:31 +0000 |
| commit | d261e1075a93677442fdf7fe72aba7e583863664 (patch) | |
| tree | ad4edd277af8d2b3f4d5a0a90f36723066a98752 /src/gpu/GrPipeline.cpp | |
| parent | 8744405448b9402e1368aebd321c4f555543301a (diff) | |
Re-enable opList dependency tracking
Change-Id: I0fa1bbaed565a0d7de8d4475ed1d2baf200b285f
Reviewed-on: https://skia-review.googlesource.com/20700
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/gpu/GrPipeline.cpp')
| -rw-r--r-- | src/gpu/GrPipeline.cpp | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/src/gpu/GrPipeline.cpp b/src/gpu/GrPipeline.cpp index 134466b24a..e54369e5ef 100644 --- a/src/gpu/GrPipeline.cpp +++ b/src/gpu/GrPipeline.cpp @@ -85,31 +85,18 @@ void GrPipeline::init(const InitArgs& args) { } } -// MDB TODO: re-enable when TextureSamplers store texture proxies -#if 0 -static void add_dependencies_for_processor(const GrFragmentProcessor* proc, - GrRenderTargetProxy* rtp) { - GrFragmentProcessor::TextureAccessIter iter(proc); - while (const GrResourceIOProcessor::TextureSampler* sampler = iter.next()) { - SkASSERT(rtp->getLastOpList()); - rtp->getLastOpList()->addDependency(sampler->proxy()); - } -} -#endif - -void GrPipeline::addDependenciesTo(GrRenderTargetProxy* rtp) const { - // MDB TODO: re-enable when TextureSamplers store texture proxies -#if 0 +void GrPipeline::addDependenciesTo(GrOpList* opList, const GrCaps& caps) const { for (int i = 0; i < fFragmentProcessors.count(); ++i) { - add_dependencies_for_processor(fFragmentProcessors[i].get(), rtp); + GrFragmentProcessor::TextureAccessIter iter(fFragmentProcessors[i].get()); + while (const GrResourceIOProcessor::TextureSampler* sampler = iter.next()) { + opList->addDependency(sampler->proxy(), caps); + } } -#endif if (fDstTextureProxy) { - //SkASSERT(rtp->getLastOpList()); - // MDB TODO: re-enable when TextureSamplers store texture proxies - //rtp->getLastOpList()->addDependency(fDstTexture.get()); + opList->addDependency(fDstTextureProxy.get(), caps); } + } GrXferBarrierType GrPipeline::xferBarrierType(const GrCaps& caps) const { |