diff options
author | Robert Phillips <robertphillips@google.com> | 2017-05-17 13:00:14 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-17 13:00:27 +0000 |
commit | c375704a20a811b9b8d294533f166bed44b7618d (patch) | |
tree | 3cb4421a3ba854b3daca374dc5b58ab981fbed6c /src/gpu/GrPipeline.cpp | |
parent | a6f68d38606effe69d5d2027a6330543dc7bd408 (diff) |
Revert "Convert DstTexture to DstProxy"
This reverts commit 87f7f1c3ce519115141b40f1d8faede437c8f357.
Reason for revert: grumble, grumble
Original change's description:
> Convert DstTexture to DstProxy
>
> The last GrTexture-based TextureSampler::reset call must be removed before the TextureSamplers can become purely GrTextureProxy-backed
>
> Split out of: https://skia-review.googlesource.com/c/10484/ (Omnibus: Push instantiation of GrTextures later (post TextureSampler))
>
> Change-Id: Ic1435177d8b5d9bd3fc38b4903c9baae8205cfb0
> Reviewed-on: https://skia-review.googlesource.com/16908
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Commit-Queue: Robert Phillips <robertphillips@google.com>
>
TBR=egdaniel@google.com,robertphillips@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I9af52bb222bd2d8cc696250a9efb62afb80edba1
Reviewed-on: https://skia-review.googlesource.com/17203
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/gpu/GrPipeline.cpp')
-rw-r--r-- | src/gpu/GrPipeline.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/gpu/GrPipeline.cpp b/src/gpu/GrPipeline.cpp index 73ae9c659a..7c0338c77c 100644 --- a/src/gpu/GrPipeline.cpp +++ b/src/gpu/GrPipeline.cpp @@ -44,13 +44,9 @@ void GrPipeline::init(const InitArgs& args) { fXferProcessor = args.fProcessors->refXferProcessor(); - if (args.fDstProxy.proxy()) { - if (!args.fDstProxy.proxy()->instantiate(args.fResourceProvider)) { - this->markAsBad(); - } - - fDstTextureProxy.reset(args.fDstProxy.proxy()); - fDstTextureOffset = args.fDstProxy.offset(); + if (args.fDstTexture.texture()) { + fDstTexture.reset(args.fDstTexture.texture()); + fDstTextureOffset = args.fDstTexture.offset(); } // Copy GrFragmentProcessors from GrPipelineBuilder to Pipeline, possibly removing some of the @@ -95,7 +91,7 @@ static void add_dependencies_for_processor(const GrFragmentProcessor* proc, GrFragmentProcessor::TextureAccessIter iter(proc); while (const GrResourceIOProcessor::TextureSampler* sampler = iter.next()) { SkASSERT(rtp->getLastOpList()); - rtp->getLastOpList()->addDependency(sampler->proxy()); + rtp->getLastOpList()->addDependency(sampler->texture()); } } #endif @@ -108,8 +104,8 @@ void GrPipeline::addDependenciesTo(GrRenderTargetProxy* rtp) const { } #endif - if (fDstTextureProxy) { - SkASSERT(rtp->getLastOpList()); + if (fDstTexture) { + //SkASSERT(rtp->getLastOpList()); // MDB TODO: re-enable when TextureSamplers store texture proxies //rtp->getLastOpList()->addDependency(fDstTexture.get()); } |