diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-07-14 12:00:13 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-14 16:22:04 +0000 |
| commit | 82ddc94aff0c8400a35f8006ee448574347c0c28 (patch) | |
| tree | e608a3eefb5874cac7689e55d74f2be3708af18b /src | |
| parent | b4b8a46448d819ed09dec1509335210526fe1292 (diff) | |
Make ProcessorRefTests op be a non-legacy GrMeshDrawOp
Change-Id: I80f8a7bad1fb8d499a3fec879ddd29ebbefe1eb6
Reviewed-on: https://skia-review.googlesource.com/23324
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gpu/GrProcessorAnalysis.h | 4 | ||||
| -rw-r--r-- | src/gpu/GrProcessorSet.cpp | 10 | ||||
| -rw-r--r-- | src/gpu/GrProcessorSet.h | 1 |
3 files changed, 13 insertions, 2 deletions
diff --git a/src/gpu/GrProcessorAnalysis.h b/src/gpu/GrProcessorAnalysis.h index f5e4065ac2..a635e65e6c 100644 --- a/src/gpu/GrProcessorAnalysis.h +++ b/src/gpu/GrProcessorAnalysis.h @@ -21,8 +21,8 @@ public: kYes, }; - GrProcessorAnalysisColor(Opaque opaque = Opaque::kNo) - : fFlags(opaque == Opaque::kYes ? kIsOpaque_Flag : 0) {} + constexpr GrProcessorAnalysisColor(Opaque opaque = Opaque::kNo) + : fFlags(opaque == Opaque::kYes ? kIsOpaque_Flag : 0), fColor(0) {} GrProcessorAnalysisColor(GrColor color) { this->setToConstant(color); } diff --git a/src/gpu/GrProcessorSet.cpp b/src/gpu/GrProcessorSet.cpp index 152b97db53..c476f64fd6 100644 --- a/src/gpu/GrProcessorSet.cpp +++ b/src/gpu/GrProcessorSet.cpp @@ -43,6 +43,16 @@ GrProcessorSet::GrProcessorSet(SkBlendMode mode) , fFragmentProcessorOffset(0) , fFlags(0) {} +GrProcessorSet::GrProcessorSet(sk_sp<GrFragmentProcessor> colorFP) + : fFragmentProcessors(1) + , fXP((const GrXPFactory*)nullptr) + , fColorFragmentProcessorCnt(1) + , fFragmentProcessorOffset(0) + , fFlags(0) { + SkASSERT(colorFP); + fFragmentProcessors[0] = colorFP.release(); +} + GrProcessorSet::~GrProcessorSet() { for (int i = fFragmentProcessorOffset; i < fFragmentProcessors.count(); ++i) { if (this->isFinalized()) { diff --git a/src/gpu/GrProcessorSet.h b/src/gpu/GrProcessorSet.h index a12a2ce43f..666e1c332b 100644 --- a/src/gpu/GrProcessorSet.h +++ b/src/gpu/GrProcessorSet.h @@ -25,6 +25,7 @@ private: public: GrProcessorSet(GrPaint&& paint); GrProcessorSet(SkBlendMode mode); + GrProcessorSet(sk_sp<GrFragmentProcessor> colorFP); ~GrProcessorSet(); |