diff options
author | Brian Salomon <bsalomon@google.com> | 2017-03-29 14:25:04 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-29 19:05:06 +0000 |
commit | 1c6025cc9da4a4f3a8ad16dde2ae8dcf120ed270 (patch) | |
tree | f9d56e3c06726f2b1e69a6532a301b2dd1621533 /src/gpu/GrProcessorSet.cpp | |
parent | 978533c302bc53a26980c96f8a348ae7eb9e3862 (diff) |
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>
Diffstat (limited to 'src/gpu/GrProcessorSet.cpp')
-rw-r--r-- | src/gpu/GrProcessorSet.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gpu/GrProcessorSet.cpp b/src/gpu/GrProcessorSet.cpp index 0350ba5758..b47a026bd5 100644 --- a/src/gpu/GrProcessorSet.cpp +++ b/src/gpu/GrProcessorSet.cpp @@ -119,8 +119,7 @@ void GrProcessorSet::FragmentProcessorAnalysis::internalInit( GrPipelineAnalysisColor outputColor = colorInfo.outputColor(); if (outputColor.isConstant(&fKnownOutputColor)) { - fOutputColorType = static_cast<unsigned>(outputColor.isOpaque() ? ColorType::kOpaqueConstant - : ColorType::kConstant); + fOutputColorType = static_cast<unsigned>(ColorType::kConstant); } else if (outputColor.isOpaque()) { fOutputColorType = static_cast<unsigned>(ColorType::kOpaque); } else { |