diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-01-04 13:22:08 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-04 19:23:05 +0000 |
| commit | bfd5183b9e039b50fb33441d1f90130b8eced80a (patch) | |
| tree | 5b1aff9c95eb6cff4d5caee353f10265b7bdc4b9 /src/gpu/GrPipeline.cpp | |
| parent | 0bd783f951a004ccca175b166f2b30a0fd18a6f6 (diff) | |
Removes tracking of whether color is ignored by XP.
Removes the feedback to GrDrawOp via GrPipelineOptimizations.
Change-Id: I3cb17cad41779af292a92385fcd5ac23ae5a1ffd
Reviewed-on: https://skia-review.googlesource.com/6561
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/GrPipeline.cpp')
| -rw-r--r-- | src/gpu/GrPipeline.cpp | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/src/gpu/GrPipeline.cpp b/src/gpu/GrPipeline.cpp index 22818299cd..ea3f0f234f 100644 --- a/src/gpu/GrPipeline.cpp +++ b/src/gpu/GrPipeline.cpp @@ -111,9 +111,10 @@ GrPipeline* GrPipeline::CreateAt(void* memory, const CreateArgs& args, // information. int firstCoverageProcessorIdx = 0; - pipeline->adjustProgramFromOptimizations(builder, optFlags, args.fAnalysis.fColorPOI, - args.fAnalysis.fCoveragePOI, &firstColorProcessorIdx, - &firstCoverageProcessorIdx); + if ((optFlags & GrXferProcessor::kIgnoreColor_OptFlag) || + (optFlags & GrXferProcessor::kOverrideColor_OptFlag)) { + firstColorProcessorIdx = builder.numColorFragmentProcessors(); + } bool usesLocalCoords = false; @@ -139,9 +140,6 @@ GrPipeline* GrPipeline::CreateAt(void* memory, const CreateArgs& args, // Setup info we need to pass to GrPrimitiveProcessors that are used with this GrPipeline. optimizations->fFlags = 0; - if (!SkToBool(optFlags & GrXferProcessor::kIgnoreColor_OptFlag)) { - optimizations->fFlags |= GrPipelineOptimizations::kReadsColor_Flag; - } if (GrColor_ILLEGAL != overrideColor) { optimizations->fFlags |= GrPipelineOptimizations::kUseOverrideColor_Flag; optimizations->fOverrideColor = overrideColor; @@ -191,18 +189,6 @@ void GrPipeline::addDependenciesTo(GrRenderTarget* rt) const { } } -void GrPipeline::adjustProgramFromOptimizations(const GrPipelineBuilder& pipelineBuilder, - GrXferProcessor::OptFlags flags, - const GrProcOptInfo& colorPOI, - const GrProcOptInfo& coveragePOI, - int* firstColorProcessorIdx, - int* firstCoverageProcessorIdx) { - if ((flags & GrXferProcessor::kIgnoreColor_OptFlag) || - (flags & GrXferProcessor::kOverrideColor_OptFlag)) { - *firstColorProcessorIdx = pipelineBuilder.numColorFragmentProcessors(); - } -} - //////////////////////////////////////////////////////////////////////////////// bool GrPipeline::AreEqual(const GrPipeline& a, const GrPipeline& b) { |