Commit: 1bb145e023ac579ab5cd19c2daa49de917d7a7ac
Author: Campbell Barton
Date: Fri Jul 8 01:38:22 2016 +1000
Branches: master
https://developer.blender.org/rB1bb145e023ac579ab5cd19c2daa49de917d7a7ac
Fix single threaded compositor define
===================================================================
M source/blender/compositor/intern/COM_WorkScheduler.cpp
===================================================================
diff --git a/source/blender/compositor/intern/COM_WorkScheduler.cpp
b/source/blender/compositor/intern/COM_WorkScheduler.cpp
index e5b9f58..39147f3 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)
{
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
