[Bf-blender-cvs] [b5b7275] cycles_kernel_split: Cycles kernel split: Remove unneeded changes in device multi

[Sergey Sharybin]

Commit: b5b72756b461ccfbb72168985c8ed3204d9f806c
Author: Sergey Sharybin
Date:   Thu May 7 17:09:37 2015 +0500
Branches: cycles_kernel_split
https://developer.blender.org/rBb5b72756b461ccfbb72168985c8ed3204d9f806c

Cycles kernel split: Remove unneeded changes in device multi

Setting multi device's split kernel flag is a bit misleading and actually
malformed. it might be in theory heterogeneous environment where it'll be
totally unclear how to treat this flag.

Since it's now only used for skipping samples report in the status line
and multi devices are ignored anyway it's safe to remove that bit of code.

TODO: Still have feeling we can get rid of this flag in device info and
just treat reported number of samples as scheduled number of samples.
This could also help in the cases like distributed rendering.

===================================================================

M	intern/cycles/device/device_multi.cpp

===================================================================

diff --git a/intern/cycles/device/device_multi.cpp b/intern/cycles/device/device_multi.cpp
index c40cd1f..3fb3b1f 100644
--- a/intern/cycles/device/device_multi.cpp
+++ b/intern/cycles/device/device_multi.cpp
@@ -50,19 +50,11 @@ public:
 	{
 		Device *device;
 
-		bool atleast_one_split_kernel_dev = false;
-
 		foreach(DeviceInfo& subinfo, info.multi_devices) {
 			device = Device::create(subinfo, stats, background);
-			atleast_one_split_kernel_dev |= device->info.use_split_kernel;
 			devices.push_back(SubDevice(device));
 		}
 
-		/* Set use_split_kernel of multi device to true, even
-		 * if one of the sub devices uses split kernel
-		 */
-		this->info.use_split_kernel = atleast_one_split_kernel_dev;
-
 #ifdef WITH_NETWORK
 		/* try to add network devices */
 		ServerDiscovery discovery(true);