diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-09-01 17:37:21 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-09-01 17:38:22 +0400 |
| commit | f0653c3d3f1b24b45e6f1c5ac659bf130b58af3f (patch) | |
| tree | 82721843c274829a1441ad7291809545955db90c /intern/cycles/device/device_intern.h | |
| parent | a8d2a6faf3beaf8363bd71c65c59e0ed1a1e7b5c (diff) | |
| parent | 575cbf0172508eb9d846f1c62027a9c0f4fddd34 (diff) | |
Merge branch 'master' into soc-2014-viewport_context
Also fix scons issues with SDL. There is still a linking problem
somewhere but i expect this is an issue in master as well.
Conflicts:
intern/cycles/SConscript
intern/ghost/CMakeLists.txt
intern/ghost/intern/GHOST_WindowX11.cpp
source/blender/nodes/CMakeLists.txt
Diffstat (limited to 'intern/cycles/device/device_intern.h')
| -rw-r--r-- | intern/cycles/device/device_intern.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/device/device_intern.h b/intern/cycles/device/device_intern.h index 7eb66c25a81..80f1e2441a5 100644 --- a/intern/cycles/device/device_intern.h +++ b/intern/cycles/device/device_intern.h @@ -22,7 +22,9 @@ CCL_NAMESPACE_BEGIN class Device; Device *device_cpu_create(DeviceInfo& info, Stats &stats, bool background); +bool device_opencl_init(void); Device *device_opencl_create(DeviceInfo& info, Stats &stats, bool background); +bool device_cuda_init(void); Device *device_cuda_create(DeviceInfo& info, Stats &stats, bool background); Device *device_network_create(DeviceInfo& info, Stats &stats, const char *address); Device *device_multi_create(DeviceInfo& info, Stats &stats, bool background); |