Revert "Fix T41222 Blender gives weird output when baking (4096*4096) resolution...
authorDalai Felinto <dfelinto@gmail.com>
Wed, 6 Aug 2014 16:10:56 +0000 (13:10 -0300)
committerDalai Felinto <dfelinto@gmail.com>
Fri, 15 Aug 2014 09:27:42 +0000 (11:27 +0200)
This reverts commit a48b372b04421b00644a0660bfdf42229b5ffceb.

Leaving only the part that fix device_multi.cpp

intern/cycles/device/device_cuda.cpp

index d76ffb1078671596609517060b6e420c784f4e70..6629069c6c675989c2731ae618224897cdd4c784 100644 (file)
@@ -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));
                }