| OLD | NEW |
| 1 #include "DMTaskRunner.h" | 1 #include "DMTaskRunner.h" |
| 2 #include "DMTask.h" | 2 #include "DMTask.h" |
| 3 | 3 |
| 4 namespace DM { | 4 namespace DM { |
| 5 | 5 |
| 6 | 6 TaskRunner::TaskRunner(int cputhreads, int gpuThreads) |
| 7 TaskRunner::TaskRunner(int cputhreads) | |
| 8 : fMain(cputhreads) | 7 : fMain(cputhreads) |
| 9 , fGpu(1) { | 8 , fGpu(gpuThreads) |
| 10 // Enqueue a task on the GPU thread to create a GrContextFactory. | 9 {} |
| 11 struct Create : public SkRunnable { | |
| 12 Create(GrContextFactory** ptr) : fPtr(ptr) {} | |
| 13 void run() SK_OVERRIDE { | |
| 14 *fPtr = SkNEW(GrContextFactory); | |
| 15 delete this; | |
| 16 } | |
| 17 GrContextFactory** fPtr; | |
| 18 }; | |
| 19 fGpu.add(SkNEW_ARGS(Create, (&fGrContextFactory))); | |
| 20 } | |
| 21 | 10 |
| 22 void TaskRunner::add(Task* task) { | 11 void TaskRunner::add(Task* task) { |
| 23 if (task->usesGpu()) { | 12 if (task->usesGpu()) { |
| 24 fGpu.add(task); | 13 fGpu.add(task); |
| 25 } else { | 14 } else { |
| 26 fMain.add(task); | 15 fMain.add(task); |
| 27 } | 16 } |
| 28 } | 17 } |
| 29 | 18 |
| 30 void TaskRunner::wait() { | 19 void TaskRunner::wait() { |
| 31 // Enqueue a task on the GPU thread to destroy the GrContextFactory. | |
| 32 struct Delete : public SkRunnable { | |
| 33 Delete(GrContextFactory* ptr) : fPtr(ptr) {} | |
| 34 void run() SK_OVERRIDE { | |
| 35 delete fPtr; | |
| 36 delete this; | |
| 37 } | |
| 38 GrContextFactory* fPtr; | |
| 39 }; | |
| 40 fGpu.add(SkNEW_ARGS(Delete, (fGrContextFactory))); | |
| 41 | |
| 42 // These wait calls block until the threadpool is done. We don't allow | 20 // These wait calls block until the threadpool is done. We don't allow |
| 43 // children to spawn new GPU tasks so we can wait for that first knowing | 21 // children to spawn new GPU tasks so we can wait for that first knowing |
| 44 // we'll never try to add to it later. Same can't be said of fMain: fGpu | 22 // we'll never try to add to it later. Same can't be said of fMain: fGpu |
| 45 // and fMain can both add tasks to fMain, so we have to wait for that last. | 23 // and fMain can both add tasks to fMain, so we have to wait for that last. |
| 46 fGpu.wait(); | 24 fGpu.wait(); |
| 47 fMain.wait(); | 25 fMain.wait(); |
| 48 } | 26 } |
| 49 | 27 |
| 50 } // namespace DM | 28 } // namespace DM |
| OLD | NEW |