diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-07-07 18:38:22 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-07-07 18:41:36 +0300 |
| commit | 1bb145e023ac579ab5cd19c2daa49de917d7a7ac (patch) | |
| tree | ad32c1af8035d32b38be62b420af49551275e9c5 /source/blender/compositor | |
| parent | 4beae09bae56e3f0116b745099a1226c82572bdd (diff) | |
Fix single threaded compositor define
Diffstat (limited to 'source/blender/compositor')
| -rw-r--r-- | source/blender/compositor/intern/COM_WorkScheduler.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/compositor/intern/COM_WorkScheduler.cpp b/source/blender/compositor/intern/COM_WorkScheduler.cpp index e5b9f58ee93..39147f3ab84 100644 --- a/source/blender/compositor/intern/COM_WorkScheduler.cpp +++ b/source/blender/compositor/intern/COM_WorkScheduler.cpp @@ -187,7 +187,7 @@ void WorkScheduler::schedule(ExecutionGroup *group, int chunkNumber) { WorkPackage *package = new WorkPackage(group, chunkNumber); #if COM_CURRENT_THREADING_MODEL == COM_TM_NOTHREAD - CPUDevice device; + CPUDevice device(0); device.execute(package); delete package; #elif COM_CURRENT_THREADING_MODEL == COM_TM_QUEUE @@ -277,6 +277,7 @@ bool WorkScheduler::hasGPUDevices() #endif } +#if COM_CURRENT_THREADING_MODEL == COM_TM_QUEUE static void CL_CALLBACK clContextError(const char *errinfo, const void * /*private_info*/, size_t /*cb*/, @@ -284,6 +285,7 @@ static void CL_CALLBACK clContextError(const char *errinfo, { printf("OPENCL error: %s\n", errinfo); } +#endif void WorkScheduler::initialize(bool use_opencl, int num_cpu_threads) { |