diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-08-09 16:27:09 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-08-10 12:54:05 +0000 |
| commit | bfd18cdd5421b6fac063bd07a96a5b9b1afa6a88 (patch) | |
| tree | 122c5d36cc5e8aef3232ec822540262d64007ae6 /src/gpu/instanced/InstancedOp.cpp | |
| parent | 65048139bd26c8edbc6796f220e79b6c848151d7 (diff) | |
Move GrAppliedClip into GrPipeline
Change-Id: I522c2fd52bea9813baba7cdb3f11b63e7ab96b50
Reviewed-on: https://skia-review.googlesource.com/28861
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/gpu/instanced/InstancedOp.cpp')
| -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 f13a1dc47b..7d50e9654e 100644 --- a/src/gpu/instanced/InstancedOp.cpp +++ b/src/gpu/instanced/InstancedOp.cpp @@ -226,7 +226,6 @@ void InstancedOp::onExecute(GrOpFlushState* state) { state->gpu()->handleDirtyContext(); GrPipeline::InitArgs args; - args.fAppliedClip = state->drawOpArgs().fAppliedClip; args.fCaps = &state->caps(); args.fResourceProvider = state->resourceProvider(); args.fFlags = GrAATypeIsHW(fInfo.aaType()) ? GrPipeline::kHWAntialias_Flag : 0; @@ -238,7 +237,7 @@ void InstancedOp::onExecute(GrOpFlushState* state) { } args.fProxy = state->drawOpArgs().fProxy; args.fDstProxy = state->drawOpArgs().fDstProxy; - GrPipeline pipeline(args, std::move(fProcessors)); + GrPipeline pipeline(args, std::move(fProcessors), state->detachAppliedClip()); if (GrXferBarrierType barrierType = pipeline.xferBarrierType(*state->gpu()->caps())) { state->gpu()->xferBarrier(pipeline.renderTarget(), barrierType); |