From 564711418d17bbd750a496d119cf0cfaefba2107 Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Mon, 21 May 2012 19:31:29 +0000 Subject: 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. --- source/blender/compositor/intern/COM_compositor.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source/blender/compositor/intern/COM_compositor.cpp') 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); -- cgit v1.2.3