[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50995] trunk/blender/intern/cycles/render /light.cpp: Fix/workaround #31987: sample as lamp for environment textures not working

[Brecht Van Lommel]

Revision: 50995
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50995
Author:   blendix
Date:     2012-10-01 18:31:32 +0000 (Mon, 01 Oct 2012)
Log Message:
-----------
Fix/workaround #31987: sample as lamp for environment textures not working
with multi GPU when resolution > 128.

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

Modified: trunk/blender/intern/cycles/render/light.cpp
===================================================================
--- trunk/blender/intern/cycles/render/light.cpp	2012-10-01 17:40:02 UTC (rev 50994)
+++ trunk/blender/intern/cycles/render/light.cpp	2012-10-01 18:31:32 UTC (rev 50995)
@@ -67,13 +67,19 @@
 	main_task.shader_x = 0;
 	main_task.shader_w = width*height;
 
+	/* disabled splitting for now, there's an issue with multi-GPU mem_copy_from */
+#if 0
 	list<DeviceTask> split_tasks;
-	main_task.split_max_size(split_tasks, 128*128);
+	main_task.split_max_size(split_tasks, 128*128); 
 
 	foreach(DeviceTask& task, split_tasks) {
 		device->task_add(task);
 		device->task_wait();
 	}
+#else
+	device->task_add(main_task);
+	device->task_wait();
+#endif
 
 	device->mem_copy_from(d_output, 0, 1, d_output.size(), sizeof(float4));
 	device->mem_free(d_input);