Use construct/init pattern with GrPipeline to replace CreateAt.
Change-Id: Ic6c7432a9a298a143ce4f2431e94c89a0ea79793
Reviewed-on: https://skia-review.googlesource.com/8938
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
diff --git a/src/gpu/GrRenderTargetOpList.cpp b/src/gpu/GrRenderTargetOpList.cpp
index eb80cbc..4fc898c 100644
--- a/src/gpu/GrRenderTargetOpList.cpp
+++ b/src/gpu/GrRenderTargetOpList.cpp
@@ -289,8 +289,8 @@
GrProcessorSet::FragmentProcessorAnalysis analysis;
op->analyzeProcessors(&analysis, pipelineBuilder.processors(), appliedClip, *this->caps());
- GrPipeline::CreateArgs args;
- pipelineBuilder.initPipelineCreateArgs(&args);
+ GrPipeline::InitArgs args;
+ pipelineBuilder.getPipelineInitArgs(&args);
args.fAppliedClip = &appliedClip;
// This forces instantiation of the render target. Pipeline creation is moving to flush time
// by which point instantiation must have occurred anyway.
@@ -331,10 +331,7 @@
return;
}
}
-
- if (!op->installPipeline(args)) {
- return;
- }
+ op->initPipeline(args);
#ifdef ENABLE_MDB
SkASSERT(fSurface);