diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-08-09 23:59:36 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-08-09 23:59:36 +0400 |
| commit | 7a760b4804ab4574e01d7f6d75fc52f93aa2a3b3 (patch) | |
| tree | ae5d20f881beb00420dd31bd79d9eba033b0ee48 /source/blender/compositor/intern/COM_WorkScheduler.cpp | |
| parent | 9f30c7147cdb726e503ff37ba585f5e35b090d8c (diff) | |
generate COM_OpenCLKernels.cl.h automatically at build time, this allows editing COM_OpenCLKernels.cl and rebuilding and means we dont have to have both files in svn.
updates made to cmake and scons.
Diffstat (limited to 'source/blender/compositor/intern/COM_WorkScheduler.cpp')
| -rw-r--r-- | source/blender/compositor/intern/COM_WorkScheduler.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/compositor/intern/COM_WorkScheduler.cpp b/source/blender/compositor/intern/COM_WorkScheduler.cpp index 849c4affd9c..8c42b05edca 100644 --- a/source/blender/compositor/intern/COM_WorkScheduler.cpp +++ b/source/blender/compositor/intern/COM_WorkScheduler.cpp @@ -288,7 +288,8 @@ void WorkScheduler::initialize() g_context = clCreateContext(NULL, numberOfDevices, cldevices, clContextError, NULL, &error); if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error)); } - g_program = clCreateProgramWithSource(g_context, 1, &clkernelstoh_COM_OpenCLKernels_cl, 0, &error); + const char *cl_str[2] = {clkernelstoh_COM_OpenCLKernels_cl, NULL}; + g_program = clCreateProgramWithSource(g_context, 1, cl_str, 0, &error); error = clBuildProgram(g_program, numberOfDevices, cldevices, 0, 0, 0); if (error != CL_SUCCESS) { cl_int error2; |