diff options
author | Mike Klein <mtklein@google.com> | 2017-04-17 18:04:41 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-17 18:04:46 +0000 |
commit | e186cfd15f2df43415ae024185bdcf5baa955ec9 (patch) | |
tree | a595d33b0925711ac5189ecaceb9eb7e015d5e54 /src/gpu/GrRenderTargetContext.cpp | |
parent | 215989330c1895a8bd4c00ba767dae6cc79b17ba (diff) |
Revert "Split cleanup changes out of bigger CL"
This reverts commit cd11c809f206af0da3ce1779dee3c91193baa7b0.
Reason for revert: assert(rtp->getLastOpList())
Original change's description:
> Split cleanup changes out of bigger CL
>
> This are split out of: https://skia-review.googlesource.com/c/11581/ (Split up opLists)
>
> TBR=bsalomon@google.com
>
> Change-Id: I1239e806a30a93d3c17ad933f118b98a5077dd3a
> Reviewed-on: https://skia-review.googlesource.com/13585
> Commit-Queue: Robert Phillips <robertphillips@google.com>
> Reviewed-by: Greg Daniel <egdaniel@google.com>
>
TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: Ia3ef7322fe830a6a4dc29226ce931d35d181c6e0
Reviewed-on: https://skia-review.googlesource.com/13641
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Diffstat (limited to 'src/gpu/GrRenderTargetContext.cpp')
-rw-r--r-- | src/gpu/GrRenderTargetContext.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/gpu/GrRenderTargetContext.cpp b/src/gpu/GrRenderTargetContext.cpp index 34812ddfbe..8ad9a4e633 100644 --- a/src/gpu/GrRenderTargetContext.cpp +++ b/src/gpu/GrRenderTargetContext.cpp @@ -1675,10 +1675,7 @@ uint32_t GrRenderTargetContext::addLegacyMeshDrawOp(GrPipelineBuilder&& pipeline } } op->initPipeline(args, analysis, overrideColor); - - // Add the pipeline dependencies on textures, etc before recording this op. - op->addDependenciesTo(fRenderTargetProxy.get()); - + // TODO: We need to add pipeline dependencies on textures, etc before recording this op. op->setClippedBounds(bounds); return this->getOpList()->addOp(std::move(op), this); } |