[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51885] trunk/blender/intern/cycles/render /session.cpp: Cycles: multi-gpu rendering doesn' t know for sure which sample is being sampled,

[Sergey Sharybin]

Revision: 51885
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51885
Author:   nazgul
Date:     2012-11-05 08:04:41 +0000 (Mon, 05 Nov 2012)
Log Message:
-----------
Cycles: multi-gpu rendering doesn't know for sure which sample is being sampled,
        so only report tile number is being processed

Modified Paths:
--------------
    trunk/blender/intern/cycles/render/session.cpp

Modified: trunk/blender/intern/cycles/render/session.cpp
===================================================================
--- trunk/blender/intern/cycles/render/session.cpp	2012-11-05 08:04:37 UTC (rev 51884)
+++ trunk/blender/intern/cycles/render/session.cpp	2012-11-05 08:04:41 UTC (rev 51885)
@@ -711,10 +711,13 @@
 	string status, substatus;
 
 	if(!params.progressive) {
+		bool is_gpu = params.device.type == DEVICE_CUDA || params.device.type == DEVICE_OPENCL;
+		bool is_multidevice = params.device.multi_devices.size() > 1;
+		bool is_cpu = params.device.type == DEVICE_CPU;
+
 		substatus = string_printf("Path Tracing Tile %d/%d", tile, num_tiles);
 
-		if(params.device.type == DEVICE_CUDA || params.device.type == DEVICE_OPENCL ||
-			(params.device.type == DEVICE_CPU && num_tiles == 1)) {
+		if((is_gpu && !is_multidevice) || (is_cpu && num_tiles == 1)) {
 			/* when rendering on GPU multithreading happens within single tile, as in
 			 * tiles are handling sequentially and in this case we could display
 			 * currently rendering sample number