diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-10-21 19:58:59 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-10-21 21:13:44 +0300 |
| commit | dc9eb8234fe4c9c561a3bfb9a8e3a3cefe77d5e3 (patch) | |
| tree | b5d93ce6d13577a8d922b2675dbc7b55b1557f01 /intern/cycles/device/device.h | |
| parent | efd70ab78f0c0d9288508fd28988c969a0cbd31a (diff) | |
Cycles: combined CPU + GPU rendering support.
CPU rendering will be restricted to a BVH2, which is not ideal for raytracing
performance but can be shared with the GPU. Decoupled volume shading will be
disabled to match GPU volume sampling.
The number of CPU rendering threads is reduced to leave one core dedicated to
each GPU. Viewport rendering will also only use GPU rendering still. So along
with the BVH2 usage, perfect scaling should not be expected.
Go to User Preferences > System to enable the CPU to render alongside the GPU.
Differential Revision: https://developer.blender.org/D2873
Diffstat (limited to 'intern/cycles/device/device.h')
| -rw-r--r-- | intern/cycles/device/device.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h index 5cd9cf46769..f400eeb3e6b 100644 --- a/intern/cycles/device/device.h +++ b/intern/cycles/device/device.h @@ -58,6 +58,7 @@ public: bool has_volume_decoupled; bool has_qbvh; bool use_split_kernel; /* Denotes if the device is going to run cycles using split-kernel */ + int cpu_threads; vector<DeviceInfo> multi_devices; DeviceInfo() @@ -65,6 +66,7 @@ public: type = DEVICE_CPU; id = "CPU"; num = 0; + cpu_threads = 0; display_device = false; advanced_shading = true; has_bindless_textures = false; @@ -345,7 +347,9 @@ public: static vector<DeviceType>& available_types(); static vector<DeviceInfo>& available_devices(); static string device_capabilities(); - static DeviceInfo get_multi_device(vector<DeviceInfo> subdevices); + static DeviceInfo get_multi_device(const vector<DeviceInfo>& subdevices, + int threads, + bool background); /* Tag devices lists for update. */ static void tag_update(); |