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/instanced | |
| 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/instanced')
| -rw-r--r-- | src/gpu/instanced/InstancedOp.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gpu/instanced/InstancedOp.cpp b/src/gpu/instanced/InstancedOp.cpp index f0f1cc0d2d..83a10da410 100644 --- a/src/gpu/instanced/InstancedOp.cpp +++ b/src/gpu/instanced/InstancedOp.cpp @@ -229,7 +229,6 @@ void InstancedOp::onExecute(GrOpFlushState* state) { GrPipeline::InitArgs args; args.fAppliedClip = state->drawOpArgs().fAppliedClip; args.fCaps = &state->caps(); - args.fResourceProvider = state->resourceProvider(); args.fProcessors = &fProcessors; args.fFlags = GrAATypeIsHW(fInfo.aaType()) ? GrPipeline::kHWAntialias_Flag : 0; if (fAllowsSRGBInputs) { @@ -239,7 +238,7 @@ void InstancedOp::onExecute(GrOpFlushState* state) { args.fFlags |= GrPipeline::kDisableOutputConversionToSRGB_Flag; } args.fRenderTarget = state->drawOpArgs().fRenderTarget; - args.fDstProxy = state->drawOpArgs().fDstProxy; + args.fDstTexture = state->drawOpArgs().fDstTexture; pipeline.init(args); if (GrXferBarrierType barrierType = pipeline.xferBarrierType(*state->gpu()->caps())) { |