Index: src/core/SkRasterPipeline.cpp |
diff --git a/src/core/SkRasterPipeline.cpp b/src/core/SkRasterPipeline.cpp |
index 6a8f10975a70b92ff964644b995dd92d1f8480af..899142886c0f564240187ce67d790dd08a72d35f 100644 |
--- a/src/core/SkRasterPipeline.cpp |
+++ b/src/core/SkRasterPipeline.cpp |
@@ -9,57 +9,35 @@ |
SkRasterPipeline::SkRasterPipeline() {} |
-void SkRasterPipeline::append(SkRasterPipeline::Fn body, const void* body_ctx, |
- SkRasterPipeline::Fn tail, const void* tail_ctx) { |
- // We can't add more stages after being rewired to run(). |
- SkASSERT(!fReadyToRun); |
- |
- // For now, just stash the stage's function in its own fNext slot. |
- // We'll rewire our stages before running the pipeline so fNext makes sense. |
- fBody.push_back({ body, const_cast<void*>(body_ctx) }); |
- fTail.push_back({ tail, const_cast<void*>(tail_ctx) }); |
+void SkRasterPipeline::append(SkRasterPipeline::Fn body_fn, const void* body_ctx, |
+ SkRasterPipeline::Fn tail_fn, const void* tail_ctx) { |
+ // Each stage holds its own context and the next function to call. |
+ // So the pipeline itself has to hold onto the first function that starts the pipeline. |
+ (fBody.empty() ? fBodyStart : fBody.back().fNext) = body_fn; |
+ (fTail.empty() ? fTailStart : fTail.back().fNext) = tail_fn; |
+ |
+ // Each last stage starts with its next function set to JustReturn as a safety net. |
+ // It'll be overwritten by the next call to append(). |
+ fBody.push_back({ &JustReturn, const_cast<void*>(body_ctx) }); |
+ fTail.push_back({ &JustReturn, const_cast<void*>(tail_ctx) }); |
} |
void SkRasterPipeline::run(size_t n) { |
- if (fBody.empty() || fTail.empty()) { |
- return; |
- } |
- |
- if (!fReadyToRun) { |
- auto rewire = [](Stages* stages) { |
- SkASSERT(!stages->empty()); |
- |
- // Rotate the fNext pointers so they point to the next function to |
- // call, not function we're currently calling as set by append(). |
- auto start = stages->front().fNext; |
- for (int i = 0; i < stages->count() - 1; i++) { |
- (*stages)[i].fNext = (*stages)[i+1].fNext; |
- } |
- stages->back().fNext = start; // This is a pretty handy place to stash this. |
- }; |
- rewire(&fBody); |
- rewire(&fTail); |
- fReadyToRun = true; |
- } |
- |
// It's fastest to start uninitialized if the compilers all let us. If not, next fastest is 0. |
Sk4f v; |
- auto start_body = fBody.back().fNext, // See rewire(). |
- start_tail = fTail.back().fNext; |
- |
- auto body = fBody.begin(), |
- tail = fTail.begin(); |
- |
size_t x = 0; |
while (n >= 4) { |
- start_body(body, x, v,v,v,v, v,v,v,v); |
+ fBodyStart(fBody.begin(), x, v,v,v,v, v,v,v,v); |
x += 4; |
n -= 4; |
} |
while (n > 0) { |
- start_tail(tail, x, v,v,v,v, v,v,v,v); |
+ fTailStart(fTail.begin(), x, v,v,v,v, v,v,v,v); |
x += 1; |
n -= 1; |
} |
} |
+ |
+void SK_VECTORCALL SkRasterPipeline::JustReturn(Stage*, size_t, Sk4f,Sk4f,Sk4f,Sk4f, |
+ Sk4f,Sk4f,Sk4f,Sk4f) {} |