From 0831f1b5f112f4e95532695dd701676f734cde54 Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Wed, 18 Jan 2017 11:08:41 -0500 Subject: [PATCH] Rename GrProcOptInfo::addProcessors to analyzeProcessors Change-Id: I49d5fa568d5b9835ee8a76fd8b2b450ece944728 Reviewed-on: https://skia-review.googlesource.com/7182 Commit-Queue: Brian Salomon Reviewed-by: Robert Phillips --- src/gpu/GrFragmentProcessor.cpp | 2 +- src/gpu/GrPaint.cpp | 5 +++-- src/gpu/GrProcOptInfo.cpp | 2 +- src/gpu/GrProcOptInfo.h | 2 +- src/gpu/GrProcessorSet.h | 4 ++-- src/gpu/GrRenderTargetOpList.cpp | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/gpu/GrFragmentProcessor.cpp b/src/gpu/GrFragmentProcessor.cpp index 977974d78d..eb6a35c4f8 100644 --- a/src/gpu/GrFragmentProcessor.cpp +++ b/src/gpu/GrFragmentProcessor.cpp @@ -341,7 +341,7 @@ sk_sp GrFragmentProcessor::RunInSeries(sk_spnumColorFragmentProcessors()); + colorProcInfo.analyzeProcessors( + sk_sp_address_as_pointer_address(fColorFragmentProcessors.begin()), + this->numColorFragmentProcessors()); GrXPFactory::InvariantBlendedColor blendedColor; if (fXPFactory) { diff --git a/src/gpu/GrProcOptInfo.cpp b/src/gpu/GrProcOptInfo.cpp index 1493206fb4..f18482338c 100644 --- a/src/gpu/GrProcOptInfo.cpp +++ b/src/gpu/GrProcOptInfo.cpp @@ -9,7 +9,7 @@ #include "GrGeometryProcessor.h" #include "ops/GrDrawOp.h" -void GrProcOptInfo::addProcessors(const GrFragmentProcessor* const* processors, int cnt) { +void GrProcOptInfo::analyzeProcessors(const GrFragmentProcessor* const* processors, int cnt) { for (int i = 0; i < cnt; ++i) { const GrFragmentProcessor* processor = processors[i]; fInOut.resetWillUseInputColor(); diff --git a/src/gpu/GrProcOptInfo.h b/src/gpu/GrProcOptInfo.h index 8149f2c1c6..6b040045e0 100644 --- a/src/gpu/GrProcOptInfo.h +++ b/src/gpu/GrProcOptInfo.h @@ -43,7 +43,7 @@ public: * Runs through a series of processors and updates calculated values. This can be called * repeatedly for cases when the sequence of processors is not in a contiguous array. */ - void addProcessors(const GrFragmentProcessor* const* processors, int cnt); + void analyzeProcessors(const GrFragmentProcessor* const* processors, int cnt); bool isSolidWhite() const { return fInOut.isSolidWhite(); } bool isOpaque() const { return fInOut.isOpaque(); } diff --git a/src/gpu/GrProcessorSet.h b/src/gpu/GrProcessorSet.h index 684fb26a84..de9c0a643a 100644 --- a/src/gpu/GrProcessorSet.h +++ b/src/gpu/GrProcessorSet.h @@ -45,9 +45,9 @@ public: void analyzeFragmentProcessors(GrPipelineAnalysis* analysis) const { const GrFragmentProcessor* const* fps = fFragmentProcessors.get(); - analysis->fColorPOI.addProcessors(fps, fColorFragmentProcessorCnt); + analysis->fColorPOI.analyzeProcessors(fps, fColorFragmentProcessorCnt); fps += fColorFragmentProcessorCnt; - analysis->fCoveragePOI.addProcessors(fps, this->numCoverageFragmentProcessors()); + analysis->fCoveragePOI.analyzeProcessors(fps, this->numCoverageFragmentProcessors()); } private: diff --git a/src/gpu/GrRenderTargetOpList.cpp b/src/gpu/GrRenderTargetOpList.cpp index 0a34019310..144b399b2c 100644 --- a/src/gpu/GrRenderTargetOpList.cpp +++ b/src/gpu/GrRenderTargetOpList.cpp @@ -313,7 +313,7 @@ void GrRenderTargetOpList::addDrawOp(const GrPipelineBuilder& pipelineBuilder, } pipelineBuilder.analyzeFragmentProcessors(&args.fAnalysis); if (const GrFragmentProcessor* clipFP = appliedClip.clipCoverageFragmentProcessor()) { - args.fAnalysis.fCoveragePOI.addProcessors(&clipFP, 1); + args.fAnalysis.fCoveragePOI.analyzeProcessors(&clipFP, 1); } if (!renderTargetContext->accessRenderTarget()) {