diff options
Diffstat (limited to 'source/blender/compositor')
| -rw-r--r-- | source/blender/compositor/intern/COM_OpenCLDevice.h | 6 | ||||
| -rw-r--r-- | source/blender/compositor/intern/COM_WorkScheduler.cpp | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/compositor/intern/COM_OpenCLDevice.h b/source/blender/compositor/intern/COM_OpenCLDevice.h index a513954ee0d..ad40b4851fb 100644 --- a/source/blender/compositor/intern/COM_OpenCLDevice.h +++ b/source/blender/compositor/intern/COM_OpenCLDevice.h @@ -95,9 +95,9 @@ public: void execute(WorkPackage *work); /** - * @brief determine an image format - * @param memorybuffer - */ + * @brief determine an image format + * @param memorybuffer + */ static const cl_image_format *determineImageFormat(MemoryBuffer *memoryBuffer); cl_context getContext() { return this->m_context; } 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) { |