[Bf-blender-cvs] [2c5b685] master: Revert "Fix T41222 Blender gives weird output when baking (4096*4096) resolution on GPU"

[Dalai Felinto]

Commit: 2c5b6859d91f086f3f7205f0cc15244882ca7ace
Author: Dalai Felinto
Date:   Wed Aug 6 13:10:56 2014 -0300
Branches: master
https://developer.blender.org/rB2c5b6859d91f086f3f7205f0cc15244882ca7ace

Revert "Fix T41222 Blender gives weird output when baking (4096*4096) resolution on GPU"

This reverts commit a48b372b04421b00644a0660bfdf42229b5ffceb.

Leaving only the part that fix device_multi.cpp

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

M	intern/cycles/device/device_cuda.cpp

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

diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index d76ffb1..6629069 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -25,7 +25,6 @@
 
 #include "cuew.h"
 #include "util_debug.h"
-#include "util_foreach.h"
 #include "util_map.h"
 #include "util_opengl.h"
 #include "util_path.h"
@@ -967,10 +966,7 @@ public:
 
 	int get_split_task_count(DeviceTask& task)
 	{
-		if (task.type == DeviceTask::SHADER)
-			return task.get_subtask_count(TaskScheduler::num_threads(), 1024 * 1024);
-		else
-			return 1;
+		return 1;
 	}
 
 	void task_add(DeviceTask& task)
@@ -983,15 +979,6 @@ public:
 			cuda_assert(cuCtxSynchronize());
 			cuda_pop_context();
 		}
-		else if(task.type == DeviceTask::SHADER) {
-			/* split task into smaller ones */
-			list<DeviceTask> tasks;
-
-			task.split(tasks, TaskScheduler::num_threads(), 1024 * 1024);
-
-			foreach(DeviceTask& task, tasks)
-				task_pool.push(new CUDADeviceTask(this, task));
-		}
 		else {
 			task_pool.push(new CUDADeviceTask(this, task));
 		}