diff options
| author | Jeroen Bakker <j.bakker@atmind.nl> | 2012-05-21 23:31:29 +0400 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2012-05-21 23:31:29 +0400 |
| commit | 564711418d17bbd750a496d119cf0cfaefba2107 (patch) | |
| tree | 0bb199466efe6dac22a213c086110c06731fc60d /source/blender/compositor/intern/COM_compositor.cpp | |
| parent | ff87bdecfeedcb16155448a9cb6fe793f2c452e2 (diff) | |
Fix for [#31418] Code review: OpenCL initialization
* Moved OpenCL initialization to first use
* cleaned up build files
* display some debug lines only when debugging is enabled.
Diffstat (limited to 'source/blender/compositor/intern/COM_compositor.cpp')
| -rw-r--r-- | source/blender/compositor/intern/COM_compositor.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/compositor/intern/COM_compositor.cpp b/source/blender/compositor/intern/COM_compositor.cpp index bd967190987..e27bff4401e 100644 --- a/source/blender/compositor/intern/COM_compositor.cpp +++ b/source/blender/compositor/intern/COM_compositor.cpp @@ -29,6 +29,7 @@ extern "C" { #include "COM_compositor.h" #include "COM_ExecutionSystem.h" #include "COM_WorkScheduler.h" +#include "OCL_opencl.h" static ThreadMutex *compositorMutex; void COM_execute(bNodeTree *editingtree, int rendering) @@ -36,6 +37,7 @@ void COM_execute(bNodeTree *editingtree, int rendering) if (compositorMutex == NULL) { /// TODO: move to blender startup phase compositorMutex = new ThreadMutex(); BLI_mutex_init(compositorMutex); + OCL_init(); WorkScheduler::initialize(); ///TODO: call workscheduler.deinitialize somewhere } BLI_mutex_lock(compositorMutex); |