diff options
author | Brian Salomon <bsalomon@google.com> | 2017-04-08 02:53:30 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-08 02:53:38 +0000 |
commit | 5dac9b3b5bf7e9c06c207cb92e257535c7d9ec95 (patch) | |
tree | 78054390590c5388b9a12525d1fee763ba3f105c /src/gpu/GrPipeline.h | |
parent | 0ae0e23696f2ef08503040f8c02765eb58b26ddf (diff) |
Revert "Create GrXferProcessor while doing GrProcessorSet analysis."
This reverts commit 0ae0e23696f2ef08503040f8c02765eb58b26ddf.
Reason for revert: static assert failure on ios build
Original change's description:
> Create GrXferProcessor while doing GrProcessorSet analysis.
>
>
> Bug: skia:
> Change-Id: I62a628f9c0536ffb05c8f9d0c9ded5657f93b48e
> Reviewed-on: https://skia-review.googlesource.com/11482
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Commit-Queue: Brian Salomon <bsalomon@google.com>
>
TBR=egdaniel@google.com,bsalomon@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: Ifd57367b0326dd2b53c622705a868e246645d589
Reviewed-on: https://skia-review.googlesource.com/12104
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/GrPipeline.h')
-rw-r--r-- | src/gpu/GrPipeline.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gpu/GrPipeline.h b/src/gpu/GrPipeline.h index a2a332fc36..02a14af889 100644 --- a/src/gpu/GrPipeline.h +++ b/src/gpu/GrPipeline.h @@ -56,7 +56,9 @@ public: struct InitArgs { uint32_t fFlags = 0; GrDrawFace fDrawFace = GrDrawFace::kBoth; - const GrProcessorSet* fProcessors = nullptr; // Must be finalized + const GrProcessorSet* fProcessors = nullptr; + GrProcessorAnalysisColor fXPInputColor; + GrProcessorAnalysisCoverage fXPInputCoverage = GrProcessorAnalysisCoverage::kNone; const GrUserStencilSettings* fUserStencil = &GrUserStencilSettings::kUnused; const GrAppliedClip* fAppliedClip = nullptr; GrRenderTarget* fRenderTarget = nullptr; |