commit 1c6025cc9da4a4f3a8ad16dde2ae8dcf120ed270
author Brian Salomon <bsalomon@google.com> Wed Mar 29 14:25:04 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Mar 29 19:05:06 2017 +0000
tree f9d56e3c06726f2b1e69a6532a301b2dd1621533
parent 978533c302bc53a26980c96f8a348ae7eb9e3862

Make analysis optional to GrPipeline::init().

GrXPFactory::createXferProcessor now takes GrPipelineAnalysisColor and GrPipelineAnalysisCoverage rather than GrProcessorSet::FragmentProcessorAnalysis.

This will make it so ops do not have to retain the analysis or rerun it to create pipelines at flush time.

Change-Id: Ib28ba65de425b20c2647329275f209aec168c3df
Reviewed-on: https://skia-review.googlesource.com/10474
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>

src/gpu/instanced/InstancedRendering.cpp

diff --git a/src/gpu/instanced/InstancedRendering.cpp b/src/gpu/instanced/InstancedRendering.cpp
index d75af35..2550f9d 100644
--- a/src/gpu/instanced/InstancedRendering.cpp
+++ b/src/gpu/instanced/InstancedRendering.cpp
@@ -466,6 +466,7 @@
 
     state->gpu()->handleDirtyContext();
 
+    // TODO: Don't reanalyze the processors.
     GrProcessorSet::FragmentProcessorAnalysis analysis;
     GrPipelineAnalysisCoverage coverageInput;
     if (GrAAType::kCoverage == fInfo.aaType() ||
@@ -485,7 +486,8 @@
 
     GrPipeline pipeline;
     GrPipeline::InitArgs args;
-    args.fAnalysis = &analysis;
+    args.fInputColor = analysis.outputColor();
+    args.fInputCoverage = analysis.outputCoverage();
     args.fAppliedClip = clip;
     args.fCaps = &state->caps();
     args.fProcessors = &fProcessors;