aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Brian Salomon <bsalomon@google.com>2017-01-18 11:08:41 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-01-18 17:19:58 +0000
commit0831f1b5f112f4e95532695dd701676f734cde54 (patch)
treeb9dac7f15dbef2cda578f7715ba417dfcb3861b4 /src
parent92ce5946855aa8d55bb4a0dd0a47d58746d67d0a (diff)
Rename GrProcOptInfo::addProcessors to analyzeProcessors
Change-Id: I49d5fa568d5b9835ee8a76fd8b2b450ece944728 Reviewed-on: https://skia-review.googlesource.com/7182 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src')
-rw-r--r--src/gpu/GrFragmentProcessor.cpp2
-rw-r--r--src/gpu/GrPaint.cpp5
-rw-r--r--src/gpu/GrProcOptInfo.cpp2
-rw-r--r--src/gpu/GrProcOptInfo.h2
-rw-r--r--src/gpu/GrProcessorSet.h4
-rw-r--r--src/gpu/GrRenderTargetOpList.cpp2
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> GrFragmentProcessor::RunInSeries(sk_sp<GrFragmentProc
// Run the through the series, do the invariant output processing, and look for eliminations.
GrProcOptInfo info(0x0, kNone_GrColorComponentFlags);
- info.addProcessors(sk_sp_address_as_pointer_address(series), cnt);
+ info.analyzeProcessors(sk_sp_address_as_pointer_address(series), cnt);
if (kRGBA_GrColorComponentFlags == info.validFlags()) {
// TODO: We need to preserve 4f and color spaces during invariant processing. This color
// has definitely lost precision, and could easily be in the wrong gamut (or have been
diff --git a/src/gpu/GrPaint.cpp b/src/gpu/GrPaint.cpp
index 7143b46b31..5bcd28a69e 100644
--- a/src/gpu/GrPaint.cpp
+++ b/src/gpu/GrPaint.cpp
@@ -46,8 +46,9 @@ void GrPaint::addCoverageTextureProcessor(GrTexture* texture,
bool GrPaint::internalIsConstantBlendedColor(GrColor paintColor, GrColor* color) const {
GrProcOptInfo colorProcInfo(paintColor, kRGBA_GrColorComponentFlags);
- colorProcInfo.addProcessors(sk_sp_address_as_pointer_address(fColorFragmentProcessors.begin()),
- this->numColorFragmentProcessors());
+ 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()) {