aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkRasterPipeline.cpp
diff options
context:
space:
mode:
authorGravatar Mike Klein <mtklein@chromium.org>2017-03-08 18:54:25 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-03-08 18:54:42 +0000
commit2fcd17087e4e299a734f4f41fe94cd039adc2b64 (patch)
tree3e0ebb5c24e5b87040755b3437765c3d9148febd /src/core/SkRasterPipeline.cpp
parentc624d9d212c4168fc6c202a8535ddff8a3bfb16a (diff)
Revert "Turn on SkJumper all the time."
This reverts commit 135555101cbde68656f028c41506113374a4026f. Reason for revert: forgot g3, seems to break Chrome NaCl builders? https://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20Win/builds/15969/steps/compile/logs/stdio Original change's description: > Turn on SkJumper all the time. > > If the previous CL sticks, it's now easy to turn on SkJumper everywhere: > I was mostly holding back because of build system complexity. > > This has the main effect of turning on SkJumper in Chromium. > It's already been on on our local test bots and on Android framework. > > Change-Id: I7fbfc6aaaa7dace9c3f2cb509583c69b10997dbf > Reviewed-on: https://skia-review.googlesource.com/9380 > Reviewed-by: Mike Klein <mtklein@chromium.org> > Commit-Queue: Mike Klein <mtklein@chromium.org> > TBR=mtklein@chromium.org,herb@google.com,reviews@skia.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: I69747e9e75b2a8e3d78f6c150c9b6d6453e00632 Reviewed-on: https://skia-review.googlesource.com/9444 Reviewed-by: Mike Klein <mtklein@chromium.org> Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'src/core/SkRasterPipeline.cpp')
-rw-r--r--src/core/SkRasterPipeline.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/SkRasterPipeline.cpp b/src/core/SkRasterPipeline.cpp
index 3e3fe3bd85..42f0212f1a 100644
--- a/src/core/SkRasterPipeline.cpp
+++ b/src/core/SkRasterPipeline.cpp
@@ -22,9 +22,11 @@ void SkRasterPipeline::extend(const SkRasterPipeline& src) {
void SkRasterPipeline::run(size_t x, size_t n) const {
if (!fStages.empty()) {
+ #if defined(SK_JUMPER)
if (this->run_with_jumper(x, n)) {
return;
}
+ #endif
SkOpts::run_pipeline(x,n, fStages.data(), SkToInt(fStages.size()));
}
}