aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/instanced/InstancedOp.cpp
diff options
context:
space:
mode:
authorGravatar Brian Salomon <bsalomon@google.com>2017-07-31 12:37:02 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-07-31 16:59:53 +0000
commit972b2f6041e0b591d9556fc874c24562733c50ce (patch)
treedd97768e34c2d2eba61d8e87d3f66cab07c82e6e /src/gpu/instanced/InstancedOp.cpp
parentba937a43669f606ea32de9b88e119f0507870c15 (diff)
Initialize GrPipeline at construction.
Change-Id: I44bfa3553786ad197acdf807b15155e61d4e5952 Reviewed-on: https://skia-review.googlesource.com/28623 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com> Reviewed-by: Chris Dalton <csmartdalton@google.com>
Diffstat (limited to 'src/gpu/instanced/InstancedOp.cpp')
-rw-r--r--src/gpu/instanced/InstancedOp.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gpu/instanced/InstancedOp.cpp b/src/gpu/instanced/InstancedOp.cpp
index ab2b7583c8..229a144f07 100644
--- a/src/gpu/instanced/InstancedOp.cpp
+++ b/src/gpu/instanced/InstancedOp.cpp
@@ -225,7 +225,6 @@ void InstancedOp::onExecute(GrOpFlushState* state) {
state->gpu()->handleDirtyContext();
- GrPipeline pipeline;
GrPipeline::InitArgs args;
args.fAppliedClip = state->drawOpArgs().fAppliedClip;
args.fCaps = &state->caps();
@@ -240,7 +239,7 @@ void InstancedOp::onExecute(GrOpFlushState* state) {
}
args.fProxy = state->drawOpArgs().fProxy;
args.fDstProxy = state->drawOpArgs().fDstProxy;
- pipeline.init(args);
+ GrPipeline pipeline(args);
if (GrXferBarrierType barrierType = pipeline.xferBarrierType(*state->gpu()->caps())) {
state->gpu()->xferBarrier(pipeline.renderTarget(), barrierType);