aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Mike Klein <mtklein@chromium.org>2017-06-02 09:25:53 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-06-02 13:47:44 +0000
commit370c2b304a35297d36fcee91e3b6ac516091434d (patch)
tree738cd8f5da4fbc3a52600b419741cd85fd782e86
parent88bd8edcff23dc9cf31b664cba7ba73b235318b0 (diff)
minor refactor to SkRasterPipeline::BuildPipeline
I don't see any reason to have it be static... Change-Id: I0fdc9c0629e2194c469f7c9c696d1bb55ffbc98a Reviewed-on: https://skia-review.googlesource.com/18455 Reviewed-by: Mike Klein <mtklein@chromium.org> Commit-Queue: Mike Klein <mtklein@chromium.org>
-rw-r--r--src/core/SkRasterPipeline.h2
-rw-r--r--src/jumper/SkJumper.cpp8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/core/SkRasterPipeline.h b/src/core/SkRasterPipeline.h
index 39a2f1f8e6..353039171f 100644
--- a/src/core/SkRasterPipeline.h
+++ b/src/core/SkRasterPipeline.h
@@ -155,7 +155,7 @@ private:
void* ctx;
};
- static void BuildPipeline(const StageList*, const SkJumper_Engine&, void**);
+ void build_pipeline(const SkJumper_Engine&, void**) const;
void unchecked_append(StockStage, void*);
SkArenaAlloc* fAlloc;
diff --git a/src/jumper/SkJumper.cpp b/src/jumper/SkJumper.cpp
index b94694680e..c5840d3522 100644
--- a/src/jumper/SkJumper.cpp
+++ b/src/jumper/SkJumper.cpp
@@ -170,8 +170,8 @@ static SkJumper_Engine choose_engine() {
return kPortable;
}
-void SkRasterPipeline::BuildPipeline(const StageList* st,
- const SkJumper_Engine& engine, void** ip) {
+void SkRasterPipeline::build_pipeline(const SkJumper_Engine& engine, void** ip) const {
+ const StageList* st = fStages;
// We're building the pipeline backwards, so we start with the final stage just_return.
*--ip = (void*)engine.just_return;
@@ -193,7 +193,7 @@ void SkRasterPipeline::run(size_t x, size_t y, size_t n) const {
// Best to not use fAlloc here... we can't bound how often run() will be called.
SkAutoSTMalloc<64, void*> program(fSlotsNeeded);
- BuildPipeline(fStages, gEngine, program.get() + fSlotsNeeded);
+ this->build_pipeline(gEngine, program.get() + fSlotsNeeded);
gEngine.start_pipeline(x,y,x+n, program.get(), &kConstants);
}
@@ -204,7 +204,7 @@ std::function<void(size_t, size_t, size_t)> SkRasterPipeline::compile() const {
gChooseEngineOnce([]{ gEngine = choose_engine(); });
void** program = fAlloc->makeArray<void*>(fSlotsNeeded);
- BuildPipeline(fStages, gEngine, program + fSlotsNeeded);
+ this->build_pipeline(gEngine, program + fSlotsNeeded);
return [=](size_t x, size_t y, size_t n) {
gEngine.start_pipeline(x,y,x+n, program, &kConstants);