diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-05-15 14:56:51 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-17 12:17:03 +0000 |
| commit | 87f7f1c3ce519115141b40f1d8faede437c8f357 (patch) | |
| tree | e35d12c8ae40e0192e8af889ca848d3c5f60eed9 /src/gpu/instanced | |
| parent | 1314918f903f0a1b40c2695f2b27737e9a8b443a (diff) | |
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>
Diffstat (limited to 'src/gpu/instanced')
| -rw-r--r-- | src/gpu/instanced/InstancedOp.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gpu/instanced/InstancedOp.cpp b/src/gpu/instanced/InstancedOp.cpp index 83a10da410..f0f1cc0d2d 100644 --- a/src/gpu/instanced/InstancedOp.cpp +++ b/src/gpu/instanced/InstancedOp.cpp @@ -229,6 +229,7 @@ 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) { @@ -238,7 +239,7 @@ void InstancedOp::onExecute(GrOpFlushState* state) { args.fFlags |= GrPipeline::kDisableOutputConversionToSRGB_Flag; } args.fRenderTarget = state->drawOpArgs().fRenderTarget; - args.fDstTexture = state->drawOpArgs().fDstTexture; + args.fDstProxy = state->drawOpArgs().fDstProxy; pipeline.init(args); if (GrXferBarrierType barrierType = pipeline.xferBarrierType(*state->gpu()->caps())) { |