diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2017-10-23 01:04:20 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2017-10-23 01:04:20 +0300 |
| commit | 147f9585db495202833eeb91eefc872ed2bdc178 (patch) | |
| tree | 28ca153d24c852623c0e3a38843d4efa83aed41a /intern/cycles/device/device.h | |
| parent | bf26509855cf042375c44cbe729cd0e5262bb519 (diff) | |
| parent | 6dfe4cbc6b8717223c631e80af6c7552576966e1 (diff) | |
Merge branch 'master' into blender2.8
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 29803abd153..47332f52ace 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; @@ -359,7 +361,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(); |