diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2014-08-06 20:10:56 +0400 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2014-08-15 13:27:42 +0400 |
| commit | 2c5b6859d91f086f3f7205f0cc15244882ca7ace (patch) | |
| tree | 62d254bc52ca29862f12795defd702a04d5cb931 | |
| parent | 3296d98ec1a11dc9fb915f934af56262a8dfaf28 (diff) | |
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
| -rw-r--r-- | intern/cycles/device/device_cuda.cpp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp index d76ffb10786..6629069c6c6 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)); } |